teiid SVN: r4144 - in trunk: client/src/main/java/org/teiid/jdbc and 18 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-05-25 11:11:25 -0400 (Fri, 25 May 2012)
New Revision: 4144
Modified:
trunk/client/src/main/java/org/teiid/client/security/LogonException.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java
trunk/client/src/test/java/org/teiid/client/TestRequestMessage.java
trunk/client/src/test/java/org/teiid/net/socket/TestSocketServerConnection.java
trunk/common-core/src/main/java/org/teiid/core/TeiidException.java
trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java
trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java
trunk/common-core/src/test/java/org/teiid/core/crypto/TestEncryptDecrypt.java
trunk/common-core/src/test/java/org/teiid/core/types/basic/TestTransforms.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorWorkItem.java
trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestCallableStatement.java
trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatement.java
trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactionServer.java
trunk/engine/src/test/java/org/teiid/query/metadata/TestTransformationMetadata.java
trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules/TestRuleAccessPatternValidation.java
trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java
trunk/engine/src/test/java/org/teiid/query/processor/eval/TestCriteriaEvaluator.java
trunk/engine/src/test/java/org/teiid/query/processor/eval/TestExpressionEvaluator.java
trunk/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java
trunk/engine/src/test/java/org/teiid/query/processor/relational/TestProjectNode.java
trunk/engine/src/test/java/org/teiid/query/processor/xml/TestXMLProcessor.java
trunk/engine/src/test/java/org/teiid/query/resolver/TestFunctionResolving.java
trunk/engine/src/test/java/org/teiid/query/resolver/TestProcedureResolving.java
trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java
trunk/engine/src/test/java/org/teiid/query/resolver/TestXMLResolver.java
trunk/engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java
trunk/runtime/src/test/java/org/teiid/transport/TestSocketRemoting.java
Log:
TEIID-2022 simplifying the code/message presentation
Modified: trunk/client/src/main/java/org/teiid/client/security/LogonException.java
===================================================================
--- trunk/client/src/main/java/org/teiid/client/security/LogonException.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/client/src/main/java/org/teiid/client/security/LogonException.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -43,14 +43,6 @@
public LogonException( ) {
super( );
}
- /**
- * Construct an instance with the message specified.
- *
- * @param message A message describing the exception
- */
- public LogonException( String message ) {
- super( message );
- }
/**
* Construct an instance with the message and error code specified.
@@ -66,14 +58,5 @@
super(event, t, message );
}
- /**
- * Construct an instance from a message and an exception to chain to this one.
- *
- * @param code A code denoting the exception
- * @param e An exception to nest within this one
- */
- public LogonException( Throwable e, String message ) {
- super( e, message );
- }
}
Modified: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -33,8 +33,8 @@
import org.teiid.client.security.InvalidSessionException;
import org.teiid.client.security.LogonException;
import org.teiid.client.util.ExceptionUtil;
-import org.teiid.core.TeiidProcessingException;
import org.teiid.core.TeiidException;
+import org.teiid.core.TeiidProcessingException;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.net.CommunicationException;
import org.teiid.net.ConnectionException;
@@ -161,7 +161,6 @@
* @param exception
* @return
*/
- @SuppressWarnings("deprecation")
private static Throwable findRootException(Throwable exception) {
if (exception instanceof TeiidRuntimeException) {
while (exception.getCause() != exception
@@ -170,13 +169,13 @@
}
if (exception instanceof TeiidRuntimeException) {
TeiidRuntimeException runtimeException = (TeiidRuntimeException) exception;
- while (runtimeException.getChild() != exception
- && runtimeException.getChild() != null) {
- if (runtimeException.getChild() instanceof TeiidRuntimeException) {
+ while (runtimeException.getCause() != exception
+ && runtimeException.getCause() != null) {
+ if (runtimeException.getCause() instanceof TeiidRuntimeException) {
runtimeException = (TeiidRuntimeException) runtimeException
- .getChild();
+ .getCause();
} else {
- exception = runtimeException.getChild();
+ exception = runtimeException.getCause();
break;
}
}
Modified: trunk/client/src/test/java/org/teiid/client/TestRequestMessage.java
===================================================================
--- trunk/client/src/test/java/org/teiid/client/TestRequestMessage.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/client/src/test/java/org/teiid/client/TestRequestMessage.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -25,15 +25,14 @@
import java.util.ArrayList;
import java.util.List;
-import org.teiid.client.RequestMessage;
+import junit.framework.TestCase;
+
import org.teiid.client.RequestMessage.ShowPlan;
import org.teiid.client.RequestMessage.StatementType;
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.util.UnitTestUtil;
-import junit.framework.TestCase;
-
public class TestRequestMessage extends TestCase {
/**
@@ -48,7 +47,7 @@
RequestMessage message = new RequestMessage();
message.setStatementType(StatementType.CALLABLE);
message.setFetchSize(100);
- List params = new ArrayList();
+ List<Integer> params = new ArrayList<Integer>();
params.add(new Integer(100));
params.add(new Integer(200));
params.add(new Integer(300));
@@ -100,7 +99,7 @@
rm.setTxnAutoWrapMode("foo"); //$NON-NLS-1$
fail("exception expected"); //$NON-NLS-1$
} catch (TeiidProcessingException e) {
- assertEquals("Error Code:TEIID20000 Message:TEIID20000 'FOO' is an invalid transaction autowrap mode.", e.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID20000 'FOO' is an invalid transaction autowrap mode.", e.getMessage()); //$NON-NLS-1$
}
}
Modified: trunk/client/src/test/java/org/teiid/net/socket/TestSocketServerConnection.java
===================================================================
--- trunk/client/src/test/java/org/teiid/net/socket/TestSocketServerConnection.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/client/src/test/java/org/teiid/net/socket/TestSocketServerConnection.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -148,7 +148,7 @@
new SocketServerConnection(instanceFactory, false, discovery, p);
fail("exception expected"); //$NON-NLS-1$
} catch (CommunicationException e) {
- assertEquals("Error Code:TEIID20021 Message:TEIID20021 No valid host available. Attempted connections to: [host1:1, host2:2]", e.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID20021 No valid host available. Attempted connections to: [host1:1, host2:2]", e.getMessage()); //$NON-NLS-1$
}
}
Modified: trunk/common-core/src/main/java/org/teiid/core/TeiidException.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/TeiidException.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/common-core/src/main/java/org/teiid/core/TeiidException.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -99,10 +99,11 @@
}
public String getMessage() {
- if (code == null || code.length() == 0) {
- return super.getMessage();
+ String message = super.getMessage();
+ if (code == null || code.length() == 0 || message.startsWith(code)) {
+ return message;
}
- return "Error Code:"+code+" Message:"+super.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$
+ return code+" "+message; //$NON-NLS-1$
}
/**
@@ -157,17 +158,6 @@
}
/**
- * Get the exception which is linked to this exception.
- *
- * @return The linked exception
- * @see #getCause()
- * @deprecated
- */
- public Throwable getChild() {
- return super.getCause();
- }
-
- /**
* Returns a string representation of this class.
*
* @return String representation of instance
Modified: trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -137,16 +137,6 @@
//############################################################################################################################
/**
- * Get the exception which is linked to this exception.
- *
- * @return The linked exception
- * @deprecated use {@link #getCause()} instead
- */
- public Throwable getChild() {
- return this.getCause();
- }
-
- /**
* Get the error code.
*
* @return The error code
Modified: trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java
===================================================================
--- trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -22,9 +22,9 @@
package org.teiid.core;
-import org.teiid.core.TeiidException;
+import static org.junit.Assert.*;
-import junit.framework.TestCase;
+import org.junit.Test;
/**
* Tests the children Iterator of the MetaMatrixException. Primarily it does
@@ -35,17 +35,9 @@
* {@link org.teiid.core.TeiidException#getChild getChild}
* method recursively.
*/
-public class TestMetaMatrixException extends TestCase {
+public class TestMetaMatrixException {
- // ################################## FRAMEWORK ################################
-
- public TestMetaMatrixException(String name) {
- super(name);
- }
-
- // ################################## ACTUAL TESTS ################################
-
- public void testFailMetaMatrixExceptionWithNullMessage() {
+ @Test public void testFailMetaMatrixExceptionWithNullMessage() {
Throwable e = null;
try {
new TeiidException((String)null); // should throw NPE
@@ -56,19 +48,15 @@
assertNotNull(e);
}
- @SuppressWarnings("deprecation")
- public void testMetaMatrixExceptionWithNullThrowable() {
+ @Test public void testMetaMatrixExceptionWithNullThrowable() {
final TeiidException err = new TeiidException((Throwable)null);
- assertNull(err.getChild());
assertNull(err.getCode());
assertNull(err.getMessage());
}
- @SuppressWarnings("deprecation")
- public void testMetaMatrixExceptionWithMessage() {
+ @Test public void testMetaMatrixExceptionWithMessage() {
final TeiidException err = new TeiidException("Test"); //$NON-NLS-1$
- assertNull(err.getChild());
assertNull(err.getCode());
assertEquals("Test", err.getMessage()); //$NON-NLS-1$
@@ -77,31 +65,26 @@
Code,
propertyValuePhrase,
}
- @SuppressWarnings("deprecation")
- public void testMetaMatrixExceptionWithCodeAndMessage() {
+ @Test public void testMetaMatrixExceptionWithCodeAndMessage() {
final TeiidException err = new TeiidException(Event.Code, "Test"); //$NON-NLS-1$
- assertNull(err.getChild());
assertEquals("Code", err.getCode()); //$NON-NLS-1$
- assertEquals("Error Code:Code Message:Test", err.getMessage()); //$NON-NLS-1$
-
+ assertEquals("Code Test", err.getMessage()); //$NON-NLS-1$
}
- @SuppressWarnings("deprecation")
- public void testMetaMatrixExceptionWithExceptionAndMessage() {
+
+ @Test public void testMetaMatrixExceptionWithExceptionAndMessage() {
final TeiidException child = new TeiidException(Event.propertyValuePhrase, "Child"); //$NON-NLS-1$
final TeiidException err = new TeiidException(child, "Test"); //$NON-NLS-1$
- assertSame(child, err.getChild());
assertEquals("propertyValuePhrase", err.getCode()); //$NON-NLS-1$
- assertEquals("Error Code:propertyValuePhrase Message:Test", err.getMessage()); //$NON-NLS-1$
+ assertEquals("propertyValuePhrase Test", err.getMessage()); //$NON-NLS-1$
}
- @SuppressWarnings("deprecation")
- public void testMetaMatrixExceptionWithExceptionAndCodeAndMessage() {
+
+ @Test public void testMetaMatrixExceptionWithExceptionAndCodeAndMessage() {
final TeiidException child = new TeiidException(Event.propertyValuePhrase, "Child"); //$NON-NLS-1$
final TeiidException err = new TeiidException(Event.Code,child, "Test"); //$NON-NLS-1$
- assertSame(child, err.getChild());
assertEquals("Code", err.getCode()); //$NON-NLS-1$
- assertEquals("Error Code:Code Message:Test", err.getMessage()); //$NON-NLS-1$
+ assertEquals("Code Test", err.getMessage()); //$NON-NLS-1$
}
}
Modified: trunk/common-core/src/test/java/org/teiid/core/crypto/TestEncryptDecrypt.java
===================================================================
--- trunk/common-core/src/test/java/org/teiid/core/crypto/TestEncryptDecrypt.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/common-core/src/test/java/org/teiid/core/crypto/TestEncryptDecrypt.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -34,10 +34,6 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import org.teiid.core.crypto.BasicCryptor;
-import org.teiid.core.crypto.CryptoException;
-import org.teiid.core.crypto.Cryptor;
-import org.teiid.core.crypto.SymmetricCryptor;
/**
@@ -162,7 +158,7 @@
cryptor.encrypt( "" ); //$NON-NLS-1$
fail("expected exception"); //$NON-NLS-1$
} catch ( CryptoException e ) {
- assertEquals("Error Code:TEIID10015 Message:TEIID10015 Attempt to encrypt zero-length cleartext.", e.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID10015 Attempt to encrypt zero-length cleartext.", e.getMessage()); //$NON-NLS-1$
}
}
@@ -176,7 +172,7 @@
cryptor.encrypt( (String)null );
fail("expected exception"); //$NON-NLS-1$
} catch ( CryptoException e ) {
- assertEquals("Error Code:TEIID10014 Message:TEIID10014 Attempt to encrypt null cleartext.", e.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID10014 Attempt to encrypt null cleartext.", e.getMessage()); //$NON-NLS-1$
}
}
Modified: trunk/common-core/src/test/java/org/teiid/core/types/basic/TestTransforms.java
===================================================================
--- trunk/common-core/src/test/java/org/teiid/core/types/basic/TestTransforms.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/common-core/src/test/java/org/teiid/core/types/basic/TestTransforms.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -203,7 +203,7 @@
transform.transform("1"); //$NON-NLS-1$
fail("expected exception"); //$NON-NLS-1$
} catch (TransformationException e) {
- assertEquals("Error Code:TEIID10076 Message:TEIID10076 Invalid conversion from type class java.lang.Object with value '1' to type class java.sql.Time", e.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID10076 Invalid conversion from type class java.lang.Object with value '1' to type class java.sql.Time", e.getMessage()); //$NON-NLS-1$
}
}
@@ -233,7 +233,7 @@
}
@Test public void testStringToTimestampFails() throws Exception {
- helpTransformException("2005-12-01 11:88:60", Timestamp.class, "Error Code:TEIID10060 Message:TEIID10060 The string representation '2005-12-01 11:88:60' of a Timestamp value is not valid."); //$NON-NLS-1$ //$NON-NLS-2$
+ helpTransformException("2005-12-01 11:88:60", Timestamp.class, "TEIID10060 The string representation '2005-12-01 11:88:60' of a Timestamp value is not valid."); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testStringToLongWithWS() throws Exception {
@@ -245,11 +245,11 @@
}
@Test public void testRangeCheck() throws Exception {
- helpTransformException(300, DataTypeManager.DefaultDataClasses.BYTE, "Error Code:TEIID10058 Message:TEIID10058 The Integer value '300' is outside the of range for Byte"); //$NON-NLS-1$
+ helpTransformException(300, DataTypeManager.DefaultDataClasses.BYTE, "TEIID10058 The Integer value '300' is outside the of range for Byte"); //$NON-NLS-1$
}
@Test public void testRangeCheck1() throws Exception {
- helpTransformException(new Double("1E11"), DataTypeManager.DefaultDataClasses.INTEGER, "Error Code:TEIID10058 Message:TEIID10058 The Double value '100,000,000,000' is outside the of range for Integer"); //$NON-NLS-1$ //$NON-NLS-2$
+ helpTransformException(new Double("1E11"), DataTypeManager.DefaultDataClasses.INTEGER, "TEIID10058 The Double value '100,000,000,000' is outside the of range for Integer"); //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorWorkItem.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorWorkItem.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorWorkItem.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -102,7 +102,7 @@
fail("Expected exception from resultset mismatch"); //$NON-NLS-1$
} catch (TranslatorException err) {
assertEquals(
- "Error Code:TEIID30479 Message:TEIID30479 Could not process stored procedure results for EXEC spTest8(1). Expected 2 result set columns, but was 1. Please update your models to allow for stored procedure results batching.", err.getMessage()); //$NON-NLS-1$
+ "TEIID30479 Could not process stored procedure results for EXEC spTest8(1). Expected 2 result set columns, but was 1. Please update your models to allow for stored procedure results batching.", err.getMessage()); //$NON-NLS-1$
}
}
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestCallableStatement.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestCallableStatement.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestCallableStatement.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -44,7 +44,7 @@
TestPreparedStatement.helpTestProcessing(sql, Collections.EMPTY_LIST, null, new HardcodedDataManager(), RealMetadataFactory.exampleBQTCached(), true, RealMetadataFactory.exampleBQTVDB());
fail();
} catch (QueryResolverException e) {
- assertEquals("Error Code:TEIID30089 Message:TEIID30089 Required parameter 'pm4.spTest9.inkey' has no value was set or is an invalid parameter.", e.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30089 Required parameter 'pm4.spTest9.inkey' has no value was set or is an invalid parameter.", e.getMessage()); //$NON-NLS-1$
}
}
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatement.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatement.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatement.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -307,7 +307,7 @@
helpGetProcessorPlan(preparedSql, values, prepCache, SESSION_ID);
fail();
}catch(QueryResolverException qe){
- assertEquals("Error Code:TEIID30558 Message:Error converting parameter number 1 with value \"x\" to expected type integer.", qe.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30558 Error converting parameter number 1 with value \"x\" to expected type integer.", qe.getMessage()); //$NON-NLS-1$
}
assertEquals(0, prepCache.getCacheHitCount());
@@ -319,7 +319,7 @@
helpGetProcessorPlan(preparedSql, values, prepCache, SESSION_ID);
fail();
}catch(QueryResolverException qe){
- assertEquals("Error Code:TEIID30556 Message:The number of bound values '2' does not match the number of parameters '1' in the prepared statement.", qe.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30556 The number of bound values '2' does not match the number of parameters '1' in the prepared statement.", qe.getMessage()); //$NON-NLS-1$
}
assertEquals(1, prepCache.getCacheHitCount());
@@ -332,7 +332,7 @@
helpGetProcessorPlan(preparedSql, values, prepCache);
fail();
}catch(QueryResolverException qe){
- assertEquals("Error Code:TEIID30556 Message:The number of bound values '2' does not match the number of parameters '1' in the prepared statement.", qe.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30556 The number of bound values '2' does not match the number of parameters '1' in the prepared statement.", qe.getMessage()); //$NON-NLS-1$
}
}
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactionServer.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactionServer.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactionServer.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -76,7 +76,7 @@
server.start(THREAD1, XID1, XAResource.TMNOFLAGS, 100, false);
fail("exception expected"); //$NON-NLS-1$
} catch (XATransactionException ex) {
- assertEquals("Error Code:TEIID30523 Message:TEIID30523 Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$
+ assertEquals("TEIID30523 Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$
ex.getMessage());
}
}
@@ -91,7 +91,7 @@
server.begin(THREAD1);
fail("exception expected"); //$NON-NLS-1$
} catch (XATransactionException ex) {
- assertEquals("Error Code:TEIID30526 Message:javax.transaction.InvalidTransactionException: Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$
+ assertEquals("TEIID30526 javax.transaction.InvalidTransactionException: Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$
ex.getMessage());
}
}
@@ -106,7 +106,7 @@
server.start(THREAD2, XID1, XAResource.TMNOFLAGS, 100,false);
fail("exception expected"); //$NON-NLS-1$
} catch (XATransactionException ex) {
- assertEquals("Error Code:TEIID30522 Message:TEIID30522 Global transaction Teiid-Xid global:1 branch:null format:0 already exists.", ex.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30522 Global transaction Teiid-Xid global:1 branch:null format:0 already exists.", ex.getMessage()); //$NON-NLS-1$
}
}
@@ -120,7 +120,7 @@
server.start(THREAD1, XID2, XAResource.TMNOFLAGS, 100,false);
fail("exception expected"); //$NON-NLS-1$
} catch (XATransactionException ex) {
- assertEquals("Error Code:TEIID30523 Message:TEIID30523 Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$
+ assertEquals("TEIID30523 Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$
ex.getMessage());
}
}
@@ -135,7 +135,7 @@
server.begin(THREAD1);
fail("exception expected"); //$NON-NLS-1$
} catch (XATransactionException ex) {
- assertEquals("Error Code:TEIID30526 Message:javax.transaction.InvalidTransactionException: Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$
+ assertEquals("TEIID30526 javax.transaction.InvalidTransactionException: Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$
ex.getMessage());
}
}
@@ -152,7 +152,7 @@
server.start(THREAD1, XID2, XAResource.TMJOIN, 100,false);
fail("exception expected"); //$NON-NLS-1$
} catch (XATransactionException ex) {
- assertEquals("Error Code:TEIID30517 Message:TEIID30517 Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$
+ assertEquals("TEIID30517 Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$
ex.getMessage());
}
}
@@ -166,7 +166,7 @@
try {
server.commit(THREAD1);
} catch (XATransactionException e) {
- assertEquals("Error Code:TEIID30526 Message:javax.transaction.InvalidTransactionException: No transaction found for client abc1.", e.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30526 javax.transaction.InvalidTransactionException: No transaction found for client abc1.", e.getMessage()); //$NON-NLS-1$
}
}
@@ -186,7 +186,7 @@
try {
server.rollback(THREAD1);
} catch (XATransactionException e) {
- assertEquals("Error Code:TEIID30526 Message:javax.transaction.InvalidTransactionException: No transaction found for client abc1.", e.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30526 javax.transaction.InvalidTransactionException: No transaction found for client abc1.", e.getMessage()); //$NON-NLS-1$
}
}
@@ -197,7 +197,7 @@
server.start(THREAD1, XID1, XAResource.TMJOIN, 100,false);
fail("exception expected"); //$NON-NLS-1$
} catch (XATransactionException ex) {
- assertEquals("Error Code:TEIID30525 Message:TEIID30525 Concurrent enlistment in global transaction Teiid-Xid global:1 branch:null format:0 is not supported.", //$NON-NLS-1$
+ assertEquals("TEIID30525 Concurrent enlistment in global transaction Teiid-Xid global:1 branch:null format:0 is not supported.", //$NON-NLS-1$
ex.getMessage());
}
}
@@ -210,7 +210,7 @@
server.end(THREAD1, XID1, XAResource.TMSUSPEND,false);
fail("exception expected"); //$NON-NLS-1$
} catch (XATransactionException ex) {
- assertEquals("Error Code:TEIID30524 Message:TEIID30524 Client is not currently enlisted in transaction Teiid-Xid global:1 branch:null format:0.", ex.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30524 Client is not currently enlisted in transaction Teiid-Xid global:1 branch:null format:0.", ex.getMessage()); //$NON-NLS-1$
}
}
@@ -224,7 +224,7 @@
server.start(THREAD2, XID1, XAResource.TMRESUME, 100,false);
fail("exception expected"); //$NON-NLS-1$
} catch (XATransactionException ex) {
- assertEquals("Error Code:TEIID30518 Message:TEIID30518 Cannot resume, transaction Teiid-Xid global:1 branch:null format:0 was not suspended by client abc2.", ex.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30518 Cannot resume, transaction Teiid-Xid global:1 branch:null format:0 was not suspended by client abc2.", ex.getMessage()); //$NON-NLS-1$
}
}
@@ -233,7 +233,7 @@
server.start(THREAD1, XID1, Integer.MAX_VALUE, 100,false);
fail("exception expected"); //$NON-NLS-1$
} catch (XATransactionException ex) {
- assertEquals("Error Code:TEIID30519 Message:TEIID30519 Unknown START flags", ex.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30519 Unknown START flags", ex.getMessage()); //$NON-NLS-1$
}
}
@@ -242,7 +242,7 @@
server.end(THREAD1, XID1, XAResource.TMSUCCESS,false);
fail("exception expected"); //$NON-NLS-1$
} catch (XATransactionException ex) {
- assertEquals("Error Code:TEIID30521 Message:TEIID30521 No global transaction found for Teiid-Xid global:1 branch:null format:0.", ex.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30521 No global transaction found for Teiid-Xid global:1 branch:null format:0.", ex.getMessage()); //$NON-NLS-1$
}
}
@@ -254,7 +254,7 @@
server.prepare(THREAD1, XID1,false);
fail("exception expected"); //$NON-NLS-1$
} catch (XATransactionException ex) {
- assertEquals("Error Code:TEIID30505 Message:TEIID30505 Suspended work still exists on transaction Teiid-Xid global:1 branch:null format:0.", ex.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30505 Suspended work still exists on transaction Teiid-Xid global:1 branch:null format:0.", ex.getMessage()); //$NON-NLS-1$
}
}
Modified: trunk/engine/src/test/java/org/teiid/query/metadata/TestTransformationMetadata.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/metadata/TestTransformationMetadata.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/query/metadata/TestTransformationMetadata.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -22,8 +22,7 @@
package org.teiid.query.metadata;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import java.util.Arrays;
import java.util.Collection;
@@ -55,7 +54,7 @@
tm.getStoredProcedureInfoForProcedure("y"); //$NON-NLS-1$
fail("expected exception"); //$NON-NLS-1$
} catch (QueryMetadataException e) {
- assertEquals("Error Code:TEIID30358 Message:TEIID30358 Procedure 'y' is ambiguous, use the fully qualified name instead", e.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30358 Procedure 'y' is ambiguous, use the fully qualified name instead", e.getMessage()); //$NON-NLS-1$
}
}
Modified: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules/TestRuleAccessPatternValidation.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules/TestRuleAccessPatternValidation.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules/TestRuleAccessPatternValidation.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -147,7 +147,7 @@
} catch (QueryPlannerException err) {
//This SHOULD happen.
final String msg = err.getMessage();
- final String expected = "Error Code:TEIID30278 Message:TEIID30278 Group has an access pattern which has not been met: group(s) [pm4.g1]; access pattern(s) [Access Pattern: Unsatisfied [pm4.g1.e1] History [[pm4.g1.e1]]]"; //$NON-NLS-1$
+ final String expected = "TEIID30278 Group has an access pattern which has not been met: group(s) [pm4.g1]; access pattern(s) [Access Pattern: Unsatisfied [pm4.g1.e1] History [[pm4.g1.e1]]]"; //$NON-NLS-1$
assertEquals("Did not fail with expected QueryPlannerException", expected, msg); //$NON-NLS-1$
}
}
@@ -167,7 +167,7 @@
} catch (QueryPlannerException err) {
//This SHOULD happen.
final String msg = err.getMessage();
- final String expected = "Error Code:TEIID30278 Message:TEIID30278 Group has an access pattern which has not been met: group(s) [pm4.g1]; access pattern(s) [Access Pattern: Unsatisfied [pm4.g1.e1] History [[pm4.g1.e1]]]"; //$NON-NLS-1$
+ final String expected = "TEIID30278 Group has an access pattern which has not been met: group(s) [pm4.g1]; access pattern(s) [Access Pattern: Unsatisfied [pm4.g1.e1] History [[pm4.g1.e1]]]"; //$NON-NLS-1$
assertEquals("Did not fail with expected QueryPlannerException", expected, msg); //$NON-NLS-1$
}
}
Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -604,7 +604,7 @@
TestProcessor.doProcess(plan, dataManager, expected, TestProcessor.createCommandContext());
fail("QueryPlannerException was expected."); //$NON-NLS-1$
} catch (QueryValidatorException e) {
- assertEquals("Error Code:TEIID30164 Message:TEIID30164 The procedure parameter pm1.vsp26.param2 is not nullable, but is set to null.",e.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30164 The procedure parameter pm1.vsp26.param2 is not nullable, but is set to null.",e.getMessage()); //$NON-NLS-1$
}
}
Modified: trunk/engine/src/test/java/org/teiid/query/processor/eval/TestCriteriaEvaluator.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/eval/TestCriteriaEvaluator.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/query/processor/eval/TestCriteriaEvaluator.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -318,7 +318,7 @@
try {
helpTestMatch("abc", "a", 'a', true); //$NON-NLS-1$ //$NON-NLS-2$
} catch (ExpressionEvaluationException cee) {
- assertEquals("Error Code:TEIID30449 Message:TEIID30449 Invalid escape sequence \"a\" with escape character \"a\"", cee.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30449 Invalid escape sequence \"a\" with escape character \"a\"", cee.getMessage()); //$NON-NLS-1$
}
}
@@ -327,7 +327,7 @@
try {
helpTestMatch("abc", "ab", 'a', true); //$NON-NLS-1$ //$NON-NLS-2$
} catch (ExpressionEvaluationException cee) {
- assertEquals("Error Code:TEIID30449 Message:TEIID30449 Invalid escape sequence \"ab\" with escape character \"a\"", cee.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30449 Invalid escape sequence \"ab\" with escape character \"a\"", cee.getMessage()); //$NON-NLS-1$
}
}
Modified: trunk/engine/src/test/java/org/teiid/query/processor/eval/TestExpressionEvaluator.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/eval/TestExpressionEvaluator.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/query/processor/eval/TestExpressionEvaluator.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -51,7 +51,15 @@
import org.teiid.query.sql.lang.Query;
import org.teiid.query.sql.lang.QueryCommand;
import org.teiid.query.sql.lang.SubqueryContainer;
-import org.teiid.query.sql.symbol.*;
+import org.teiid.query.sql.symbol.CaseExpression;
+import org.teiid.query.sql.symbol.Constant;
+import org.teiid.query.sql.symbol.ElementSymbol;
+import org.teiid.query.sql.symbol.Expression;
+import org.teiid.query.sql.symbol.Function;
+import org.teiid.query.sql.symbol.ScalarSubquery;
+import org.teiid.query.sql.symbol.SearchedCaseExpression;
+import org.teiid.query.sql.symbol.TestCaseExpression;
+import org.teiid.query.sql.symbol.TestSearchedCaseExpression;
import org.teiid.query.sql.util.ValueIterator;
import org.teiid.query.unittest.RealMetadataFactory;
import org.teiid.query.util.CommandContext;
@@ -176,7 +184,7 @@
fail("Exception expected"); //$NON-NLS-1$
} catch (TeiidComponentException e){
//this should be a componentexception, since it is unexpected
- assertEquals(e.getMessage(), "Error Code:TEIID30346 Message:TEIID30346 Unable to evaluate e2: No value was available"); //$NON-NLS-1$
+ assertEquals(e.getMessage(), "TEIID30346 Unable to evaluate e2: No value was available"); //$NON-NLS-1$
}
}
@@ -296,7 +304,7 @@
helpTestWithValueIterator(expr, values, null);
fail("Expected ExpressionEvaluationException but got none"); //$NON-NLS-1$
} catch (ExpressionEvaluationException e) {
- assertEquals("Error Code:TEIID30328 Message:TEIID30328 Unable to evaluate (SELECT x FROM y): Error Code:TEIID30345 Message:TEIID30345 The command of this scalar subquery returned more than one value: SELECT x FROM y", e.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30328 Unable to evaluate (SELECT x FROM y): TEIID30345 The command of this scalar subquery returned more than one value: SELECT x FROM y", e.getMessage()); //$NON-NLS-1$
}
}
Modified: trunk/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -991,7 +991,7 @@
helpTestProcessFailure(plan,
dataMgr,
- "Error Code:TEIID30168 Message:TEIID30168 Couldn't execute the dynamic SQL command \"EXECUTE IMMEDIATE 'EXEC pm1.sq2(''First'')' AS e1 string, e2 integer\" with the SQL statement \"'EXEC pm1.sq2(''First'')'\" due to: Error Code:TEIID30347 Message:TEIID30347 There is a recursive invocation of group 'pm1.sq2'. Please correct the SQL.", metadata); //$NON-NLS-1$
+ "TEIID30168 Couldn't execute the dynamic SQL command \"EXECUTE IMMEDIATE 'EXEC pm1.sq2(''First'')' AS e1 string, e2 integer\" with the SQL statement \"'EXEC pm1.sq2(''First'')'\" due to: TEIID30347 There is a recursive invocation of group 'pm1.sq2'. Please correct the SQL.", metadata); //$NON-NLS-1$
}
@Test public void testDynamicCommandIncorrectProjectSymbolCount() throws Exception {
@@ -1012,7 +1012,7 @@
ProcessorPlan plan = getProcedurePlan(userUpdateStr, metadata);
- helpTestProcessFailure(plan, dataMgr, "Error Code:TEIID30168 Message:TEIID30168 Couldn't execute the dynamic SQL command \"EXECUTE IMMEDIATE 'EXEC pm1.sq1(''First'')' AS e1 string, e2 integer\" with the SQL statement \"'EXEC pm1.sq1(''First'')'\" due to: The dynamic sql string contains an incorrect number of elements.", metadata); //$NON-NLS-1$
+ helpTestProcessFailure(plan, dataMgr, "TEIID30168 Couldn't execute the dynamic SQL command \"EXECUTE IMMEDIATE 'EXEC pm1.sq1(''First'')' AS e1 string, e2 integer\" with the SQL statement \"'EXEC pm1.sq1(''First'')'\" due to: The dynamic sql string contains an incorrect number of elements.", metadata); //$NON-NLS-1$
}
@Test public void testDynamicCommandPositional() throws Exception {
@@ -1045,7 +1045,7 @@
ProcessorPlan plan = getProcedurePlan(userUpdateStr, metadata);
- helpTestProcessFailure(plan, dataMgr, "Error Code:TEIID30168 Message:TEIID30168 Couldn't execute the dynamic SQL command \"EXECUTE IMMEDIATE 'select e1 from pm1.g1'\" with the SQL statement \"'select e1 from pm1.g1'\" due to: The datatype 'string' for element 'e1' in the dynamic SQL cannot be implicitly converted to 'integer'.", metadata); //$NON-NLS-1$
+ helpTestProcessFailure(plan, dataMgr, "TEIID30168 Couldn't execute the dynamic SQL command \"EXECUTE IMMEDIATE 'select e1 from pm1.g1'\" with the SQL statement \"'select e1 from pm1.g1'\" due to: The datatype 'string' for element 'e1' in the dynamic SQL cannot be implicitly converted to 'integer'.", metadata); //$NON-NLS-1$
}
@Test public void testDynamicCommandWithTwoDynamicStatements() throws Exception {
@@ -1322,7 +1322,7 @@
ProcessorPlan plan = getProcedurePlan(userUpdateStr, metadata);
- helpTestProcessFailure(plan, dataMgr, "Error Code:TEIID30229 Message:TEIID30229 Temporary table \"T1\" already exists.", metadata); //$NON-NLS-1$
+ helpTestProcessFailure(plan, dataMgr, "TEIID30229 Temporary table \"T1\" already exists.", metadata); //$NON-NLS-1$
}
/**
Modified: trunk/engine/src/test/java/org/teiid/query/processor/relational/TestProjectNode.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/relational/TestProjectNode.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/query/processor/relational/TestProjectNode.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -247,7 +247,7 @@
Arrays.asList(new Object[] { "1" }), //$NON-NLS-1$
Arrays.asList(new Object[] { "2x" }) }; //$NON-NLS-1$
- String expectedMessage = "ERROR CODE:TEIID30328 MESSAGE:TEIID30328 Unable to evaluate convert(e1, integer): ERROR CODE:TEIID30384 MESSAGE:TEIID30384 Error while evaluating function convert"; //$NON-NLS-1$
+ String expectedMessage = "TEIID30328 Unable to evaluate convert(e1, integer): TEIID30384 Error while evaluating function convert"; //$NON-NLS-1$
helpTestProjectFails(projectElements, data, elements, expectedMessage);
}
Modified: trunk/engine/src/test/java/org/teiid/query/processor/xml/TestXMLProcessor.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/xml/TestXMLProcessor.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/query/processor/xml/TestXMLProcessor.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -3325,7 +3325,7 @@
"", metadata, dataMgr); //$NON-NLS-1$
fail("Should have failed with QueryPlannerException but didn't"); //$NON-NLS-1$
} catch (QueryPlannerException e) {
- String expectedMsg = "Error Code:TEIID30288 Message:TEIID30288 The XML document element [element] name='Suppliers' minOccurs=1 maxOccurs=1 is not mapped to data and cannot be used in the ORDER BY clause: ORDER BY Suppliers"; //$NON-NLS-1$
+ String expectedMsg = "TEIID30288 The XML document element [element] name='Suppliers' minOccurs=1 maxOccurs=1 is not mapped to data and cannot be used in the ORDER BY clause: ORDER BY Suppliers"; //$NON-NLS-1$
assertEquals(expectedMsg, e.getMessage());
}
}
Modified: trunk/engine/src/test/java/org/teiid/query/resolver/TestFunctionResolving.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/resolver/TestFunctionResolving.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/query/resolver/TestFunctionResolving.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -23,6 +23,7 @@
package org.teiid.query.resolver;
import static org.junit.Assert.*;
+
import org.junit.Test;
import org.teiid.api.exception.query.QueryParserException;
import org.teiid.api.exception.query.QueryResolverException;
@@ -48,7 +49,7 @@
ResolverVisitor.resolveLanguageObject(function, RealMetadataFactory.example1Cached());
fail("excpetion expected"); //$NON-NLS-1$
} catch (QueryResolverException err) {
- assertEquals("Error Code:TEIID30071 Message:TEIID30071 The conversion from char to date is not allowed.", err.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30071 The conversion from char to date is not allowed.", err.getMessage()); //$NON-NLS-1$
}
}
@@ -80,7 +81,7 @@
ResolverVisitor.resolveLanguageObject(function, RealMetadataFactory.example1Cached());
fail("excpetion expected"); //$NON-NLS-1$
} catch (QueryResolverException err) {
- assertEquals("Error Code:TEIID30069 Message:TEIID30069 The function 'LCASE(?)' has more than one possible signature.", err.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30069 The function 'LCASE(?)' has more than one possible signature.", err.getMessage()); //$NON-NLS-1$
}
}
Modified: trunk/engine/src/test/java/org/teiid/query/resolver/TestProcedureResolving.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/resolver/TestProcedureResolving.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/query/resolver/TestProcedureResolving.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -738,7 +738,7 @@
String userQuery = "UPDATE vm1.g3 SET x='x' where e3= 1"; //$NON-NLS-1$
helpFailUpdateProcedure(procedure, userQuery,
- Table.TriggerEvent.UPDATE, "Error Code:TEIID30126 Message:TEIID30126 Column variables do not reference columns on group \"pm1.g1\": [Unable to resolve 'var1': Element \"var1\" is not defined by any relevant group.]"); //$NON-NLS-1$
+ Table.TriggerEvent.UPDATE, "TEIID30126 Column variables do not reference columns on group \"pm1.g1\": [Unable to resolve 'var1': Element \"var1\" is not defined by any relevant group.]"); //$NON-NLS-1$
}
// variables cannot be used among insert elements
@@ -753,7 +753,7 @@
String userQuery = "UPDATE vm1.g3 SET x='x' where e3= 1"; //$NON-NLS-1$
helpFailUpdateProcedure(procedure, userQuery,
- Table.TriggerEvent.UPDATE, "Error Code:TEIID30126 Message:TEIID30126 Column variables do not reference columns on group \"pm1.g1\": [Unable to resolve 'INPUTS.x': Symbol INPUTS.x is specified with an unknown group context]"); //$NON-NLS-1$
+ Table.TriggerEvent.UPDATE, "TEIID30126 Column variables do not reference columns on group \"pm1.g1\": [Unable to resolve 'INPUTS.x': Symbol INPUTS.x is specified with an unknown group context]"); //$NON-NLS-1$
}
//should resolve first to the table's column
@@ -798,7 +798,7 @@
String userUpdateStr = "UPDATE vm1.g1 SET e1='x'"; //$NON-NLS-1$
helpFailUpdateProcedure(proc.toString(), userUpdateStr,
- Table.TriggerEvent.UPDATE, "Error Code:TEIID30124 Message:TEIID30124 Nested Loop can not use the same cursor name as that of its parent."); //$NON-NLS-1$
+ Table.TriggerEvent.UPDATE, "TEIID30124 Nested Loop can not use the same cursor name as that of its parent."); //$NON-NLS-1$
}
@Test public void testTempGroupElementShouldNotBeResolable() {
@@ -855,7 +855,7 @@
String userUpdateStr = "UPDATE vm1.g1 SET e1='x'"; //$NON-NLS-1$
- helpFailUpdateProcedure(proc.toString(), userUpdateStr, Table.TriggerEvent.UPDATE, "Error Code:TEIID30118 Message:TEIID30118 Cannot create temporary table \"loopCursor\". An object with the same name already exists."); //$NON-NLS-1$
+ helpFailUpdateProcedure(proc.toString(), userUpdateStr, Table.TriggerEvent.UPDATE, "TEIID30118 Cannot create temporary table \"loopCursor\". An object with the same name already exists."); //$NON-NLS-1$
}
@Test public void testProcedureCreateDrop() {
@@ -937,7 +937,7 @@
String userUpdateStr = "UPDATE vm1.g1 SET e1=1"; //$NON-NLS-1$
helpFailUpdateProcedure(procedure, userUpdateStr,
- Table.TriggerEvent.UPDATE, "Error Code:TEIID30082 Message:Cannot set symbol 'pm1.g1.e4' with expected type double to expression 'convert(var1, string)'"); //$NON-NLS-1$
+ Table.TriggerEvent.UPDATE, "TEIID30082 Cannot set symbol 'pm1.g1.e4' with expected type double to expression 'convert(var1, string)'"); //$NON-NLS-1$
}
// special variable INPUT compared against invalid type
@@ -952,7 +952,7 @@
String userUpdateStr = "UPDATE vm1.g1 SET e1='x'"; //$NON-NLS-1$
helpFailUpdateProcedure(procedure, userUpdateStr,
- Table.TriggerEvent.UPDATE, "Error Code:TEIID30082 Message:Cannot set symbol 'pm1.g1.e2' with expected type integer to expression '\"new\".e1'"); //$NON-NLS-1$
+ Table.TriggerEvent.UPDATE, "TEIID30082 Cannot set symbol 'pm1.g1.e2' with expected type integer to expression '\"new\".e1'"); //$NON-NLS-1$
}
@Test public void testVirtualProcedure() throws Exception {
@@ -969,7 +969,7 @@
//cursor starts with "#" Defect14924
@Test public void testVirtualProcedureInvalid1() throws Exception {
- helpResolveException("EXEC pm1.vsp32()",RealMetadataFactory.example1Cached(), "Error Code:TEIID30125 Message:Cursor names cannot begin with \"#\" as that indicates the name of a temporary table: #mycursor."); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("EXEC pm1.vsp32()",RealMetadataFactory.example1Cached(), "TEIID30125 Cursor names cannot begin with \"#\" as that indicates the name of a temporary table: #mycursor."); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testVirtualProcedureWithOrderBy() throws Exception {
@@ -993,7 +993,7 @@
}
@Test public void testLoopRedefinition2() throws Exception {
- helpResolveException("EXEC pm1.vsp11()", RealMetadataFactory.example1Cached(), "Error Code:TEIID30124 Message:TEIID30124 Nested Loop can not use the same cursor name as that of its parent."); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("EXEC pm1.vsp11()", RealMetadataFactory.example1Cached(), "TEIID30124 Nested Loop can not use the same cursor name as that of its parent."); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testVariableResolutionWithIntervening() throws Exception {
Modified: trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -799,7 +799,7 @@
}
@Test public void testUnknownFunction() {
- helpResolveException("SELECT abc(e1) FROM pm1.g1", "Error Code:TEIID30068 Message:TEIID30068 The function 'abc(e1)' is an unknown form. Check that the function name and number of arguments is correct."); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("SELECT abc(e1) FROM pm1.g1", "TEIID30068 The function 'abc(e1)' is an unknown form. Check that the function name and number of arguments is correct."); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testConversionPossible() {
@@ -1405,7 +1405,7 @@
}
@Test public void testFailedConversion_defect9725() throws Exception{
- helpResolveException("select * from pm3.g1 where pm3.g1.e4 > {b 'true'}", "Error Code:TEIID30072 Message:TEIID30072 The expressions in this criteria are being compared but are of differing types (timestamp and boolean) and no implicit conversion is available: pm3.g1.e4 > TRUE"); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("select * from pm3.g1 where pm3.g1.e4 > {b 'true'}", "TEIID30072 The expressions in this criteria are being compared but are of differing types (timestamp and boolean) and no implicit conversion is available: pm3.g1.e4 > TRUE"); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testLookupFunction() {
@@ -1904,11 +1904,11 @@
* the group g1 is not known to the order by clause of a union
*/
@Test public void testUnionOrderByFail() {
- helpResolveException("SELECT pm1.g1.e1 FROM pm1.g1 UNION SELECT pm1.g2.e1 FROM pm1.g2 ORDER BY g1.e1", "Error Code:TEIID30086 Message:TEIID30086 ORDER BY expression 'g1.e1' cannot be used with a set query."); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("SELECT pm1.g1.e1 FROM pm1.g1 UNION SELECT pm1.g2.e1 FROM pm1.g2 ORDER BY g1.e1", "TEIID30086 ORDER BY expression 'g1.e1' cannot be used with a set query."); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testUnionOrderByFail1() {
- helpResolveException("SELECT pm1.g1.e1 FROM pm1.g1 UNION SELECT pm1.g2.e1 FROM pm1.g2 ORDER BY pm1.g1.e1", "Error Code:TEIID30086 Message:TEIID30086 ORDER BY expression 'pm1.g1.e1' cannot be used with a set query."); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("SELECT pm1.g1.e1 FROM pm1.g1 UNION SELECT pm1.g2.e1 FROM pm1.g2 ORDER BY pm1.g1.e1", "TEIID30086 ORDER BY expression 'pm1.g1.e1' cannot be used with a set query."); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testOrderByPartiallyQualified() {
@@ -2136,7 +2136,7 @@
}
@Test public void testParameterError() throws Exception {
- helpResolveException("EXEC pm1.sp2(1, 2)", metadata, "Error Code:TEIID30142 Message:TEIID30142 Incorrect number of parameters specified on the stored procedure pm1.sp2 - expected 1 but got 2"); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("EXEC pm1.sp2(1, 2)", metadata, "TEIID30142 Incorrect number of parameters specified on the stored procedure pm1.sp2 - expected 1 but got 2"); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testUnionOfAliasedLiteralsGetsModified() {
@@ -2263,7 +2263,7 @@
procedure = procedure + "DECLARE string VARIABLES.X = 1;\n"; //$NON-NLS-1$
procedure = procedure + "END\n"; //$NON-NLS-1$
- helpResolveException(procedure, "Error Code:TEIID30136 Message:TEIID30136 Unable to resolve element: VARIABLES.X"); //$NON-NLS-1$
+ helpResolveException(procedure, "TEIID30136 Unable to resolve element: VARIABLES.X"); //$NON-NLS-1$
}
@Test public void testCreate() {
@@ -2274,7 +2274,7 @@
@Test public void testCreateQualifiedName() {
String sql = "CREATE LOCAL TEMPORARY TABLE pm1.g1 (column1 string)"; //$NON-NLS-1$
- helpResolveException(sql, "Error Code:TEIID30117 Message:TEIID30117 Cannot create temporary table \"pm1.g1\". Local temporary tables must be created with unqualified names."); //$NON-NLS-1$
+ helpResolveException(sql, "TEIID30117 Cannot create temporary table \"pm1.g1\". Local temporary tables must be created with unqualified names."); //$NON-NLS-1$
}
@Test public void testProcedureConflict() {
@@ -2294,7 +2294,7 @@
@Test public void testCreateAlreadyExists() {
String sql = "CREATE LOCAL TEMPORARY TABLE g1 (column1 string)"; //$NON-NLS-1$
- helpResolveException(sql, "Error Code:TEIID30118 Message:TEIID30118 Cannot create temporary table \"g1\". An object with the same name already exists."); //$NON-NLS-1$
+ helpResolveException(sql, "TEIID30118 Cannot create temporary table \"g1\". An object with the same name already exists."); //$NON-NLS-1$
}
@Test public void testCreateImplicitName() {
@@ -2304,7 +2304,7 @@
}
@Test public void testCreateInProc() throws Exception{
- helpResolveException("CREATE VIRTUAL PROCEDURE BEGIN create local temporary table g1(c1 string); end", "Error Code:TEIID30118 Message:TEIID30118 Cannot create temporary table \"g1\". An object with the same name already exists.");//$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("CREATE VIRTUAL PROCEDURE BEGIN create local temporary table g1(c1 string); end", "TEIID30118 Cannot create temporary table \"g1\". An object with the same name already exists.");//$NON-NLS-1$ //$NON-NLS-2$
}
//this was the old virt.agg procedure. It was defined in such a way that relied on the scope leak of #temp
@@ -2399,7 +2399,7 @@
@Test public void testLookupWithoutConstant() throws Exception{
String sql = "SELECT lookup('pm1.g1', convert('e3', float), 'e2', e2) FROM pm1.g1"; //$NON-NLS-1$
- helpResolveException(sql, metadata, "Error Code:TEIID30095 Message:TEIID30095 The first three arguments for the LOOKUP function must be specified as constants."); //$NON-NLS-1$
+ helpResolveException(sql, metadata, "TEIID30095 The first three arguments for the LOOKUP function must be specified as constants."); //$NON-NLS-1$
}
/**
@@ -2420,19 +2420,19 @@
@Test public void testUpdateError() {
String userUpdateStr = "UPDATE vm1.g2 SET e1='x'"; //$NON-NLS-1$
- helpResolveException(userUpdateStr, metadata, "Error Code:TEIID30061 Message:TEIID30061 Update is not allowed on the view vm1.g2: a procedure must be defined to handle the Update."); //$NON-NLS-1$
+ helpResolveException(userUpdateStr, metadata, "TEIID30061 Update is not allowed on the view vm1.g2: a procedure must be defined to handle the Update."); //$NON-NLS-1$
}
@Test public void testInsertError() {
String userUpdateStr = "INSERT into vm1.g2 (e1) values ('x')"; //$NON-NLS-1$
- helpResolveException(userUpdateStr, metadata, "Error Code:TEIID30061 Message:TEIID30061 Insert is not allowed on the view vm1.g2: a procedure must be defined to handle the Insert."); //$NON-NLS-1$
+ helpResolveException(userUpdateStr, metadata, "TEIID30061 Insert is not allowed on the view vm1.g2: a procedure must be defined to handle the Insert."); //$NON-NLS-1$
}
@Test public void testDeleteError() {
String userUpdateStr = "DELETE from vm1.g2 where e1='x'"; //$NON-NLS-1$
- helpResolveException(userUpdateStr, metadata, "Error Code:TEIID30061 Message:TEIID30061 Delete is not allowed on the view vm1.g2: a procedure must be defined to handle the Delete."); //$NON-NLS-1$
+ helpResolveException(userUpdateStr, metadata, "TEIID30061 Delete is not allowed on the view vm1.g2: a procedure must be defined to handle the Delete."); //$NON-NLS-1$
}
@Test public void testResolveXMLSelect() {
@@ -2442,13 +2442,13 @@
procedure = procedure + "select VARIABLES.X from xmltest.doc1;\n"; //$NON-NLS-1$
procedure = procedure + "END\n"; //$NON-NLS-1$
- helpResolveException(procedure, "Error Code:TEIID30136 Message:TEIID30136 Unable to resolve element: VARIABLES.X"); //$NON-NLS-1$
+ helpResolveException(procedure, "TEIID30136 Unable to resolve element: VARIABLES.X"); //$NON-NLS-1$
}
@Test public void testXMLJoinFail() {
String query = "select * from xmltest.doc1, xmltest.doc2"; //$NON-NLS-1$
- helpResolveException(query, "Error Code:TEIID30112 Message:TEIID30112 Only one XML document may be specified in the FROM clause of a query."); //$NON-NLS-1$
+ helpResolveException(query, "TEIID30112 Only one XML document may be specified in the FROM clause of a query."); //$NON-NLS-1$
}
@Test public void testExecProjectedSymbols() {
@@ -2478,7 +2478,7 @@
QueryMetadataInterface metadata = RealMetadataFactory.createTransformationMetadata(metadataStore, "example1");
- helpResolveException("select * from pm1.sq2", metadata, "Error Code:TEIID30114 Message:TEIID30114 Cannot access procedure pm1.sq2 using table semantics since the parameter and result set column names are not all unique."); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("select * from pm1.sq2", metadata, "TEIID30114 Cannot access procedure pm1.sq2 using table semantics since the parameter and result set column names are not all unique."); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testInlineViewNullLiteralInUnion() {
@@ -2490,21 +2490,21 @@
@Test public void testSelectIntoWithDuplicateNames() {
String sql = "select 1 as x, 2 as x into #temp"; //$NON-NLS-1$
- helpResolveException(sql, "Error Code:TEIID30091 Message:TEIID30091 Cannot create group '#temp' with multiple columns named 'x'"); //$NON-NLS-1$
+ helpResolveException(sql, "TEIID30091 Cannot create group '#temp' with multiple columns named 'x'"); //$NON-NLS-1$
}
@Test public void testCreateWithDuplicateNames() {
String sql = "CREATE LOCAL TEMPORARY TABLE temp_table (column1 string, column1 string)"; //$NON-NLS-1$
- helpResolveException(sql, "Error Code:TEIID30091 Message:TEIID30091 Cannot create group \'temp_table\' with multiple columns named \'column1\'"); //$NON-NLS-1$
+ helpResolveException(sql, "TEIID30091 Cannot create group \'temp_table\' with multiple columns named \'column1\'"); //$NON-NLS-1$
}
@Test public void testXMLQuery4() {
- helpResolveException("SELECT * FROM xmltest.doc1 group by a2", "Error Code:TEIID30130 Message:TEIID30130 Queries against XML documents can not have a GROUP By clause"); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("SELECT * FROM xmltest.doc1 group by a2", "TEIID30130 Queries against XML documents can not have a GROUP By clause"); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testXMLQuery5() {
- helpResolveException("SELECT * FROM xmltest.doc1 having a2='x'", "Error Code:TEIID30131 Message:TEIID30131 Queries against XML documents can not have a HAVING clause"); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("SELECT * FROM xmltest.doc1 having a2='x'", "TEIID30131 Queries against XML documents can not have a HAVING clause"); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testSelectIntoWithOrderBy() {
@@ -2514,8 +2514,8 @@
}
@Test public void testUnionBranchesWithDifferentElementCounts() {
- helpResolveException("SELECT e2, e3 FROM pm1.g1 UNION SELECT e2 FROM pm1.g2","Error Code:TEIID30147 Message:TEIID30147 Queries combined with the set operator UNION must have the same number of output elements."); //$NON-NLS-1$ //$NON-NLS-2$
- helpResolveException("SELECT e2 FROM pm1.g1 UNION SELECT e2, e3 FROM pm1.g2","Error Code:TEIID30147 Message:TEIID30147 Queries combined with the set operator UNION must have the same number of output elements."); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("SELECT e2, e3 FROM pm1.g1 UNION SELECT e2 FROM pm1.g2","TEIID30147 Queries combined with the set operator UNION must have the same number of output elements."); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("SELECT e2 FROM pm1.g1 UNION SELECT e2, e3 FROM pm1.g2","TEIID30147 Queries combined with the set operator UNION must have the same number of output elements."); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testSelectIntoWithNullLiteral() {
@@ -2545,19 +2545,19 @@
@Test public void testInsertWithoutColumnsFails() {
String sql = "Insert into pm1.g1 values (1, 2)"; //$NON-NLS-1$
- helpResolveException(sql, "Error Code:TEIID30127 Message:TEIID30127 INSERT statement must have the same number of elements and values specified. This statement has 4 elements and 2 values."); //$NON-NLS-1$
+ helpResolveException(sql, "TEIID30127 INSERT statement must have the same number of elements and values specified. This statement has 4 elements and 2 values."); //$NON-NLS-1$
}
@Test public void testInsertWithoutColumnsFails1() {
String sql = "Insert into pm1.g1 values (1, 2, 3, 4)"; //$NON-NLS-1$
- helpResolveException(sql, "Error Code:TEIID30082 Message:TEIID30082 Expected value of type 'boolean' but '3' is of type 'integer' and no implicit conversion is available."); //$NON-NLS-1$
+ helpResolveException(sql, "TEIID30082 Expected value of type 'boolean' but '3' is of type 'integer' and no implicit conversion is available."); //$NON-NLS-1$
}
@Test public void testInsertWithQueryFails() {
String sql = "Insert into pm1.g1 select 1, 2, 3, 4"; //$NON-NLS-1$
- helpResolveException(sql, "Error Code:TEIID30128 Message:TEIID30128 Cannot convert insert query expression projected symbol '3' of type java.lang.Integer to insert column 'pm1.g1.e3' of type java.lang.Boolean"); //$NON-NLS-1$
+ helpResolveException(sql, "TEIID30128 Cannot convert insert query expression projected symbol '3' of type java.lang.Integer to insert column 'pm1.g1.e3' of type java.lang.Boolean"); //$NON-NLS-1$
}
@Test public void testInsertWithQueryImplicitWithColumns() {
@@ -2573,7 +2573,7 @@
@Test public void testInsertWithQueryImplicitWithoutColumns1() {
String sql = "Insert into #X select 1 as x, 2 as y, 3 as y"; //$NON-NLS-1$
- helpResolveException(sql, "Error Code:TEIID30091 Message:TEIID30091 Cannot create group '#X' with multiple columns named 'y'"); //$NON-NLS-1$
+ helpResolveException(sql, "TEIID30091 Cannot create group '#X' with multiple columns named 'y'"); //$NON-NLS-1$
}
@Test public void testInsertWithoutColumnsPasses() {
@@ -2612,7 +2612,7 @@
}
@Test public void testUniqeNamesWithInlineView() {
- helpResolveException("select * from (select count(intNum) a, count(stringKey) b, bqt1.smalla.intkey as b from bqt1.smalla group by bqt1.smalla.intkey) q1 order by q1.a", RealMetadataFactory.exampleBQTCached(), "Error Code:TEIID30091 Message:TEIID30091 Cannot create group 'q1' with multiple columns named 'b'"); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("select * from (select count(intNum) a, count(stringKey) b, bqt1.smalla.intkey as b from bqt1.smalla group by bqt1.smalla.intkey) q1 order by q1.a", RealMetadataFactory.exampleBQTCached(), "TEIID30091 Cannot create group 'q1' with multiple columns named 'b'"); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testResolveOldProcRelational() {
@@ -2640,7 +2640,7 @@
@Test public void testCallableStatementTooManyParameters() throws Exception {
String sql = "{call pm4.spTest9(?, ?)}"; //$NON-NLS-1$
- TestResolver.helpResolveException(sql, RealMetadataFactory.exampleBQTCached(), "Error Code:TEIID30142 Message:TEIID30142 Incorrect number of parameters specified on the stored procedure pm4.spTest9 - expected 1 but got 2"); //$NON-NLS-1$
+ TestResolver.helpResolveException(sql, RealMetadataFactory.exampleBQTCached(), "TEIID30142 Incorrect number of parameters specified on the stored procedure pm4.spTest9 - expected 1 but got 2"); //$NON-NLS-1$
}
@Test public void testUpdateSetClauseReferenceType() {
@@ -2656,7 +2656,7 @@
@Test public void testNoTypeCriteria() {
String sql = "select * from pm1.g1 where ? = ?"; //$NON-NLS-1$
- helpResolveException(sql, RealMetadataFactory.example1Cached(), "Error Code:TEIID30083 Message:TEIID30083 Expression '? = ?' has a parameter with non-determinable type information. The use of an explicit convert may be necessary."); //$NON-NLS-1$
+ helpResolveException(sql, RealMetadataFactory.example1Cached(), "TEIID30083 Expression '? = ?' has a parameter with non-determinable type information. The use of an explicit convert may be necessary."); //$NON-NLS-1$
}
@Test public void testReferenceInSelect() {
@@ -2710,7 +2710,7 @@
// ambiguous, should fail
@Test public void testOrderBy_J658d() {
- helpResolveException("SELECT pm1.g1.e1, e2 as x, e3 as x FROM pm1.g1 ORDER BY x, e1 ", "Error Code:TEIID30084 Message:TEIID30084 Element 'x' in ORDER BY is ambiguous and may refer to more than one element of SELECT clause."); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("SELECT pm1.g1.e1, e2 as x, e3 as x FROM pm1.g1 ORDER BY x, e1 ", "TEIID30084 Element 'x' in ORDER BY is ambiguous and may refer to more than one element of SELECT clause."); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testOrderBy_J658e() {
Query resolvedQuery = (Query) helpResolve("SELECT pm1.g1.e1, e2 as x, e3 as e2 FROM pm1.g1 ORDER BY x, e2 "); //$NON-NLS-1$
@@ -2829,7 +2829,7 @@
}
@Test public void testOrderByExpression2() {
- helpResolveException("select pm1.g1.e1 from pm1.g1 union select pm1.g2.e1 from pm1.g2 order by pm1.g1.e1 || 2", "Error Code:TEIID30086 Message:TEIID30086 ORDER BY expression '(pm1.g1.e1 || 2)' cannot be used with a set query."); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("select pm1.g1.e1 from pm1.g1 union select pm1.g2.e1 from pm1.g2 order by pm1.g1.e1 || 2", "TEIID30086 ORDER BY expression '(pm1.g1.e1 || 2)' cannot be used with a set query."); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testOrderByConstantFails() {
Modified: trunk/engine/src/test/java/org/teiid/query/resolver/TestXMLResolver.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/resolver/TestXMLResolver.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/query/resolver/TestXMLResolver.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -404,7 +404,7 @@
}
@Test public void testXMLWithSelect1a() {
- helpResolveException("select 'a' from xmltest.doc1 where node1 = 'yyz'", "Error Code:TEIID30134 Message:TEIID30134 Expressions cannot be selected by XML Queries"); //$NON-NLS-1$ //$NON-NLS-2$
+ helpResolveException("select 'a' from xmltest.doc1 where node1 = 'yyz'", "TEIID30134 Expressions cannot be selected by XML Queries"); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test public void testXMLWithSelect2() {
Modified: trunk/engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -883,7 +883,7 @@
fail("Expected QueryValidatorException due to divide by 0"); //$NON-NLS-1$
} catch(TeiidException e) {
// looks like message is being wrapped with another exception with same message
- assertEquals("Error Code:TEIID30328 Message:TEIID30328 Unable to evaluate (5 / 0): Error Code:TEIID30384 Message:TEIID30384 Error while evaluating function /", e.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30328 Unable to evaluate (5 / 0): TEIID30384 Error while evaluating function /", e.getMessage()); //$NON-NLS-1$
}
}
@@ -896,7 +896,7 @@
QueryRewriter.rewriteCriteria(origCrit, null, metadata);
fail("Expected QueryValidatorException due to invalid string"); //$NON-NLS-1$
} catch(TeiidException e) {
- assertEquals("Error Code:TEIID30328 Message:TEIID30328 Unable to evaluate convert('x', integer): Error Code:TEIID30384 Message:TEIID30384 Error while evaluating function convert", e.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30328 Unable to evaluate convert('x', integer): TEIID30384 Error while evaluating function convert", e.getMessage()); //$NON-NLS-1$
}
}
@@ -1118,7 +1118,7 @@
getRewritenProcedure(procedure, userQuery, Table.TriggerEvent.INSERT);
fail("exception expected"); //$NON-NLS-1$
} catch (QueryValidatorException e) {
- assertEquals("Error Code:TEIID30367 Message:TEIID30367 Infinite loop detected, procedure will not be executed.", e.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID30367 Infinite loop detected, procedure will not be executed.", e.getMessage()); //$NON-NLS-1$
}
}
Modified: trunk/runtime/src/test/java/org/teiid/transport/TestSocketRemoting.java
===================================================================
--- trunk/runtime/src/test/java/org/teiid/transport/TestSocketRemoting.java 2012-05-24 19:29:03 UTC (rev 4143)
+++ trunk/runtime/src/test/java/org/teiid/transport/TestSocketRemoting.java 2012-05-25 15:11:25 UTC (rev 4144)
@@ -118,11 +118,11 @@
}
@Override
- public void send(Message message, ResultsReceiver<Object> listener,
+ public void send(Message message, ResultsReceiver<Object> l,
Serializable messageKey) throws CommunicationException,
InterruptedException {
ServerWorkItem workItem = new ServerWorkItem(this, messageKey, message, server);
- this.listener = listener;
+ this.listener = l;
workItem.run();
}
@@ -154,7 +154,7 @@
createFakeConnection(serverInstance);
fail("expected exception"); //$NON-NLS-1$
} catch (CommunicationException e) {
- assertEquals("Error Code:TEIID20018 Message:TEIID20018 Unable to find a component used authenticate on to Teiid", e.getMessage()); //$NON-NLS-1$
+ assertEquals("TEIID20018 Unable to find a component used authenticate on to Teiid", e.getMessage()); //$NON-NLS-1$
}
}
11 years, 11 months
- 1
- 0
teiid SVN: r4143 - in trunk: api/src/main/java/org/teiid/translator and 41 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-05-24 15:29:03 -0400 (Thu, 24 May 2012)
New Revision: 4143
Modified:
trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java
trunk/api/src/main/java/org/teiid/translator/DataNotAvailableException.java
trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java
trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java
trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java
trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java
trunk/client/src/test/java/org/teiid/net/socket/TestServiceInvocationStruct.java
trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java
trunk/common-core/src/test/java/org/teiid/core/crypto/TestEncryptDecrypt.java
trunk/common-core/src/test/java/org/teiid/core/util/TestPropertiesUtils.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestEscapeSyntaxModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/modeshape/TestPathFunctionModifier.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorDatetimeConversion.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorSourceSystemFunctions.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorTypeMapping.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestSubstringFunctionModifier.java
trunk/engine/pom.xml
trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourceMetadataWrapper.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java
trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/BasicSourceCapabilities.java
trunk/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java
trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestLikeCriteriaImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestSubqueryInCriteriaImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestUpdateImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java
trunk/engine/src/test/java/org/teiid/dqp/message/TestResultsMessage.java
trunk/engine/src/test/java/org/teiid/query/mapping/xml/TestMappingLoader.java
trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java
trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java
trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java
trunk/engine/src/test/java/org/teiid/query/processor/relational/TestBatchedUpdateNode.java
trunk/engine/src/test/java/org/teiid/query/processor/relational/TestProjectIntoNode.java
trunk/engine/src/test/java/org/teiid/query/sql/lang/TestSubquerySetCriteria.java
trunk/engine/src/test/java/org/teiid/query/sql/symbol/TestAggregateSymbol.java
trunk/engine/src/test/java/org/teiid/query/sql/visitor/TestExpressionMappingVisitor.java
trunk/jboss-integration/pom.xml
trunk/runtime/pom.xml
trunk/test-integration/common/src/test/java/org/teiid/cdk/api/TestTranslationUtility.java
trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractMMQueryTestCase.java
trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestQueryPlans.java
trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestResultsMetadataWithProvider.java
trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
trunk/test-integration/db/pom.xml
trunk/test-integration/db/src/main/java/org/teiid/test/client/ClassFactory.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryReader.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryScenario.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClient.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClientTransaction.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/TestProperties.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResult.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/TransactionFactory.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/CTCQueryScenario.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/ListNestedSortComparator.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/QueryResults.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLGenerateResults.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryReader.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryVisitationStrategy.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ExpectedResultsImpl.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ResultsGeneratorImpl.java
trunk/test-integration/db/src/main/java/org/teiid/test/client/results/TestResultStat.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyLoader.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyNames.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/TestLogger.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionContainer.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategy.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategyFactory.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/DataSourceConnection.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/DriverConnection.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/JEEConnection.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSource.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceFactory.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceMgr.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataStore.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/JNDITransaction.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/LocalTransaction.java
trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/XATransaction.java
trunk/test-integration/db/src/main/java/org/teiid/test/util/PropUtils.java
trunk/test-integration/db/src/main/java/org/teiid/test/util/TestResultSetUtil.java
trunk/test-integration/db/src/test/java/org/teiid/adminapi/jboss/BaseConnection.java
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/AutoWrapTransactionTests.java
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionTests.java
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OffWrapTransactionTests.java
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OnWrapTransactionTests.java
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/StandaloneGlobalTransactionTests.java
Log:
misc: NLS warnings cleanup in tests; bunch more to still there.
Modified: trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java
===================================================================
--- trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -16,6 +16,7 @@
/**
* An extension of Groovy's Sql to support getting {@link TeiidStatement} specific properties.
*/
+@SuppressWarnings("nls")
public final class TeiidSql extends Sql {
private int maxRows;
private PlanNode plan;
Modified: trunk/api/src/main/java/org/teiid/translator/DataNotAvailableException.java
===================================================================
--- trunk/api/src/main/java/org/teiid/translator/DataNotAvailableException.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/api/src/main/java/org/teiid/translator/DataNotAvailableException.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -21,7 +21,6 @@
*/
package org.teiid.translator;
-import org.teiid.core.BundleUtil;
import org.teiid.core.TeiidRuntimeException;
/**
Modified: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -161,6 +161,7 @@
* @param exception
* @return
*/
+ @SuppressWarnings("deprecation")
private static Throwable findRootException(Throwable exception) {
if (exception instanceof TeiidRuntimeException) {
while (exception.getCause() != exception
Modified: trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java
===================================================================
--- trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -37,6 +37,7 @@
/**
* @since 4.3
*/
+@SuppressWarnings("nls")
public class TestBatchResults {
static class MockBatchFetcher implements BatchFetcher {
Modified: trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java
===================================================================
--- trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -41,7 +41,7 @@
import org.teiid.client.xa.XidImpl;
import org.teiid.net.ServerConnection;
-
+@SuppressWarnings("nls")
public class TestConnection extends TestCase {
protected static final String STD_DATABASE_NAME = "QT_Ora9DS"; //$NON-NLS-1$
Modified: trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java
===================================================================
--- trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -32,7 +32,7 @@
import org.teiid.jdbc.WrapperImpl;
import junit.framework.TestCase;
-
+@SuppressWarnings("nls")
public class TestWrapperImpl extends TestCase {
interface Foo extends Wrapper {
Modified: trunk/client/src/test/java/org/teiid/net/socket/TestServiceInvocationStruct.java
===================================================================
--- trunk/client/src/test/java/org/teiid/net/socket/TestServiceInvocationStruct.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/client/src/test/java/org/teiid/net/socket/TestServiceInvocationStruct.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -29,7 +29,7 @@
import junit.framework.TestCase;
-
+@SuppressWarnings("nls")
public class TestServiceInvocationStruct extends TestCase {
public void testSerialize() throws Exception {
Modified: trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java
===================================================================
--- trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -56,7 +56,8 @@
assertNotNull(e);
}
- public void testMetaMatrixExceptionWithNullThrowable() {
+ @SuppressWarnings("deprecation")
+ public void testMetaMatrixExceptionWithNullThrowable() {
final TeiidException err = new TeiidException((Throwable)null);
assertNull(err.getChild());
assertNull(err.getCode());
@@ -64,7 +65,8 @@
}
- public void testMetaMatrixExceptionWithMessage() {
+ @SuppressWarnings("deprecation")
+ public void testMetaMatrixExceptionWithMessage() {
final TeiidException err = new TeiidException("Test"); //$NON-NLS-1$
assertNull(err.getChild());
assertNull(err.getCode());
@@ -75,6 +77,7 @@
Code,
propertyValuePhrase,
}
+ @SuppressWarnings("deprecation")
public void testMetaMatrixExceptionWithCodeAndMessage() {
final TeiidException err = new TeiidException(Event.Code, "Test"); //$NON-NLS-1$
assertNull(err.getChild());
@@ -83,7 +86,7 @@
}
-
+ @SuppressWarnings("deprecation")
public void testMetaMatrixExceptionWithExceptionAndMessage() {
final TeiidException child = new TeiidException(Event.propertyValuePhrase, "Child"); //$NON-NLS-1$
final TeiidException err = new TeiidException(child, "Test"); //$NON-NLS-1$
@@ -92,7 +95,7 @@
assertEquals("Error Code:propertyValuePhrase Message:Test", err.getMessage()); //$NON-NLS-1$
}
-
+ @SuppressWarnings("deprecation")
public void testMetaMatrixExceptionWithExceptionAndCodeAndMessage() {
final TeiidException child = new TeiidException(Event.propertyValuePhrase, "Child"); //$NON-NLS-1$
final TeiidException err = new TeiidException(Event.Code,child, "Test"); //$NON-NLS-1$
Modified: trunk/common-core/src/test/java/org/teiid/core/crypto/TestEncryptDecrypt.java
===================================================================
--- trunk/common-core/src/test/java/org/teiid/core/crypto/TestEncryptDecrypt.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/common-core/src/test/java/org/teiid/core/crypto/TestEncryptDecrypt.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -44,6 +44,7 @@
* <p>Test cases for {@link CryptoFactory} and carious <code>Encryptor</code>
* and <code>Decryptor</code> implementations. </p>
*/
+@SuppressWarnings("nls")
public class TestEncryptDecrypt {
// Some strings for testing...
Modified: trunk/common-core/src/test/java/org/teiid/core/util/TestPropertiesUtils.java
===================================================================
--- trunk/common-core/src/test/java/org/teiid/core/util/TestPropertiesUtils.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/common-core/src/test/java/org/teiid/core/util/TestPropertiesUtils.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -43,6 +43,7 @@
/**
* Tests primarily the various cloning scenarios available with PropertiesUtils
*/
+@SuppressWarnings("nls")
public class TestPropertiesUtils extends TestCase {
private final static String TEMP_FILE = UnitTestUtil.getTestScratchPath() + "/temp.properties"; //$NON-NLS-1$
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestEscapeSyntaxModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestEscapeSyntaxModifier.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestEscapeSyntaxModifier.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -38,6 +38,7 @@
/**
*/
+@SuppressWarnings("nls")
public class TestEscapeSyntaxModifier extends TestCase {
/**
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/modeshape/TestPathFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/modeshape/TestPathFunctionModifier.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/modeshape/TestPathFunctionModifier.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -27,8 +27,6 @@
import junit.framework.TestCase;
-import org.junit.Test;
-import org.teiid.cdk.api.TranslationUtility;
import org.teiid.language.Expression;
import org.teiid.language.Function;
import org.teiid.language.LanguageFactory;
@@ -38,6 +36,7 @@
/**
*/
+@SuppressWarnings("nls")
public class TestPathFunctionModifier extends TestCase {
private static final LanguageFactory LANG_FACTORY = new LanguageFactory();
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorDatetimeConversion.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorDatetimeConversion.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorDatetimeConversion.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -38,6 +38,7 @@
/**
*/
+@SuppressWarnings("nls")
public class TestNetezzaTranslatorDatetimeConversion {
private static NetezzaExecutionFactory TRANSLATOR;
@@ -54,11 +55,6 @@
/////////////////UTILLITY FUNCTIONS/////////
////////////////////////////////////////////
- private String getTestVDB() {
- //return TranslationHelper.NETEZZA_VDB;
- return TranslationHelper.PARTS_VDB;
- }
-
private String getTestBQTVDB() {
return TranslationHelper.BQT_VDB;
}
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorSourceSystemFunctions.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorSourceSystemFunctions.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorSourceSystemFunctions.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -30,6 +30,7 @@
/**
*/
+@SuppressWarnings("nls")
public class TestNetezzaTranslatorSourceSystemFunctions {
private static NetezzaExecutionFactory TRANSLATOR;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorTypeMapping.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorTypeMapping.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorTypeMapping.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -36,7 +36,7 @@
import org.teiid.translator.jdbc.SQLConversionVisitor;
import org.teiid.translator.jdbc.TranslationHelper;
-
+@SuppressWarnings("nls")
public class TestNetezzaTranslatorTypeMapping {
private static NetezzaExecutionFactory TRANSLATOR;
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestSubstringFunctionModifier.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestSubstringFunctionModifier.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestSubstringFunctionModifier.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -34,6 +34,7 @@
/**
*/
+@SuppressWarnings("nls")
public class TestSubstringFunctionModifier extends TestCase {
private static final LanguageFactory LANG_FACTORY = new LanguageFactory();
Modified: trunk/engine/pom.xml
===================================================================
--- trunk/engine/pom.xml 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/pom.xml 2012-05-24 19:29:03 UTC (rev 4143)
@@ -26,6 +26,35 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <versionRange>[2.4,)</versionRange>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourceMetadataWrapper.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourceMetadataWrapper.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourceMetadataWrapper.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -134,7 +134,7 @@
boolean elementExists = false;
for(int i=0; i<elements.size(); i++) {
Object elemID = elements.get(i);
- if(actualMetadata.getName(elemID).equalsIgnoreCase(MultiSourceElement.MULTI_SOURCE_ELEMENT_NAME)) { //$NON-NLS-1$
+ if(actualMetadata.getName(elemID).equalsIgnoreCase(MultiSourceElement.MULTI_SOURCE_ELEMENT_NAME)) {
// Replace the element with a MultiSourceElement
elements.set(i, new MultiSourceElement(groupID, i+1, fullName));
elementExists = true;
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -216,7 +216,7 @@
if (RelationalNodeUtil.isUpdate(accessNode.getCommand())) {
update = true;
GroupingNode groupNode = new GroupingNode(getID());
- AggregateSymbol sumCount = new AggregateSymbol(NonReserved.SUM, false, accessNode.getElements().get(0)); //$NON-NLS-1$
+ AggregateSymbol sumCount = new AggregateSymbol(NonReserved.SUM, false, accessNode.getElements().get(0));
List<Expression> outputElements = new ArrayList<Expression>(1);
outputElements.add(sumCount);
groupNode.setElements(outputElements);
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/BasicSourceCapabilities.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/BasicSourceCapabilities.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/BasicSourceCapabilities.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -71,7 +71,7 @@
}
public String toString() {
- return "BasicSourceCapabilities<caps=" + capabilityMap + ", funcs=" + functionMap + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ return "BasicSourceCapabilities<caps=" + capabilityMap + ", funcs=" + functionMap + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
/**
Modified: trunk/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -287,7 +287,7 @@
} else if(namespacePrefix.equals(MappingNodeConstants.INSTANCES_NAMESPACE_PREFIX)) {
uri = MappingNodeConstants.INSTANCES_NAMESPACE;
}else {
- String msg = QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30213, new Object[] {namespacePrefix, name}); //$NON-NLS-1$
+ String msg = QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30213, new Object[] {namespacePrefix, name});
throw new TeiidComponentException(QueryPlugin.Event.TEIID30213, msg);
}
}
Modified: trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
===================================================================
--- trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2012-05-24 19:29:03 UTC (rev 4143)
@@ -32,7 +32,7 @@
* file. <B>WARNING:</B> DO NOT MODIFY the SQLParser.java file as it will be
* regenerated from the .jj file and your changes will be lost!</p>
*/
-@SuppressWarnings("nls")
+@SuppressWarnings({"nls", "unused"})
public class SQLParser extends SQLParserUtil {
} // end class
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestLikeCriteriaImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestLikeCriteriaImpl.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestLikeCriteriaImpl.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -49,7 +49,7 @@
}
public static Like example(String right, char escape, boolean negated) throws Exception {
- return (Like)TstLanguageBridgeFactory.factory.translate(helpExample(right, escape, negated));
+ return TstLanguageBridgeFactory.factory.translate(helpExample(right, escape, negated));
}
public void testGetLeftExpression() throws Exception {
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestSubqueryInCriteriaImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestSubqueryInCriteriaImpl.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestSubqueryInCriteriaImpl.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -52,7 +52,7 @@
}
public static SubqueryIn example() throws Exception {
- return (SubqueryIn)TstLanguageBridgeFactory.factory.translate(helpExample());
+ return TstLanguageBridgeFactory.factory.translate(helpExample());
}
public void testGetExpression() throws Exception {
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestUpdateImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestUpdateImpl.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestUpdateImpl.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -31,7 +31,7 @@
import org.teiid.query.sql.symbol.Constant;
import org.teiid.query.sql.symbol.GroupSymbol;
-
+@SuppressWarnings("nls")
public class TestUpdateImpl extends TestCase {
/**
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -42,8 +42,8 @@
import org.teiid.cache.CacheConfiguration;
import org.teiid.cache.DefaultCacheFactory;
import org.teiid.client.RequestMessage;
-import org.teiid.client.ResultsMessage;
import org.teiid.client.RequestMessage.StatementType;
+import org.teiid.client.ResultsMessage;
import org.teiid.client.lob.LobChunk;
import org.teiid.client.util.ResultsFuture;
import org.teiid.common.buffer.BufferManagerFactory;
@@ -54,7 +54,6 @@
import org.teiid.dqp.internal.datamgr.FakeTransactionService;
import org.teiid.dqp.internal.process.AbstractWorkItem.ThreadState;
import org.teiid.dqp.service.AutoGenDataService;
-import org.teiid.dqp.service.BufferService;
import org.teiid.dqp.service.FakeBufferService;
import org.teiid.query.optimizer.TestOptimizer;
import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities;
Modified: trunk/engine/src/test/java/org/teiid/dqp/message/TestResultsMessage.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/message/TestResultsMessage.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/test/java/org/teiid/dqp/message/TestResultsMessage.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -79,7 +79,7 @@
message.setWarnings(warnings);
return message;
}
-
+ @SuppressWarnings("deprecation")
public void testSerialize() throws Exception {
ResultsMessage message = example();
Modified: trunk/engine/src/test/java/org/teiid/query/mapping/xml/TestMappingLoader.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/mapping/xml/TestMappingLoader.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/test/java/org/teiid/query/mapping/xml/TestMappingLoader.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -248,7 +248,7 @@
assertEquals(1, element.getMinOccurence());
assertEquals(1, element.getMaxOccurence());
- MappingNode node1 = (MappingNode)element.getNodeChildren().get(0);
+ MappingNode node1 = element.getNodeChildren().get(0);
// make sure source's child is mapping element and mapping element's source
// is above source
@@ -288,17 +288,17 @@
MappingElement element = (MappingElement)node;
assertEquals("parentNode", element.getName()); //$NON-NLS-1$
- node = (MappingNode)element.getNodeChildren().get(0);
+ node = element.getNodeChildren().get(0);
assertTrue(node instanceof MappingChoiceNode);
MappingChoiceNode choice = (MappingChoiceNode)node;
assertTrue(choice.throwExceptionOnDefault());
- node = (MappingNode)choice.getNodeChildren().get(0);
+ node = choice.getNodeChildren().get(0);
assertTrue(node instanceof MappingCriteriaNode);
MappingCriteriaNode criteria = (MappingCriteriaNode)node;
assertEquals("childNodeCriteria", criteria.getCriteria()); //$NON-NLS-1$
- node = (MappingNode)criteria.getNodeChildren().get(0);
+ node = criteria.getNodeChildren().get(0);
assertTrue(node instanceof MappingElement);
element = (MappingElement)node;
assertEquals("childNode", element.getName()); //$NON-NLS-1$
@@ -334,17 +334,17 @@
MappingElement element = (MappingElement)node;
assertEquals("parentNode", element.getName()); //$NON-NLS-1$
- node = (MappingNode)element.getNodeChildren().get(0);
+ node = element.getNodeChildren().get(0);
assertTrue(node instanceof MappingChoiceNode);
MappingChoiceNode choice = (MappingChoiceNode)node;
assertTrue(choice.throwExceptionOnDefault());
- node = (MappingNode)choice.getNodeChildren().get(0);
+ node = choice.getNodeChildren().get(0);
assertTrue(node instanceof MappingCriteriaNode);
MappingCriteriaNode criteria = (MappingCriteriaNode)node;
assertEquals("childNodeCriteria", criteria.getCriteria()); //$NON-NLS-1$
- node = (MappingNode)criteria.getNodeChildren().get(0);
+ node = criteria.getNodeChildren().get(0);
assertTrue(node instanceof MappingElement);
element = (MappingElement)node;
assertEquals("childNode", element.getName()); //$NON-NLS-1$
@@ -419,7 +419,7 @@
assertFalse(element.isRecursive());
assertEquals("parentNodeSource", element.getSource()); //$NON-NLS-1$
- node = (MappingNode)element.getNodeChildren().get(0);
+ node = element.getNodeChildren().get(0);
assertTrue(node instanceof MappingElement);
element = (MappingElement)node;
assertEquals("childNode", element.getName()); //$NON-NLS-1$
@@ -431,7 +431,7 @@
assertEquals("ddd", attribute.getDefaultValue()); //$NON-NLS-1$
assertEquals("fff", attribute.getValue()); //$NON-NLS-1$
- node = (MappingNode)element.getNodeChildren().get(0);
+ node = element.getNodeChildren().get(0);
assertTrue(node instanceof MappingRecursiveElement);
MappingRecursiveElement recursive = (MappingRecursiveElement)node;
assertEquals("recursivenodename", recursive.getName()); //$NON-NLS-1$
@@ -627,7 +627,7 @@
assertEquals("parentSource", element.getSource()); //$NON-NLS-1$
// recursive source
- node = (MappingNode)element.getNodeChildren().get(0);
+ node = element.getNodeChildren().get(0);
assertTrue(node instanceof MappingRecursiveElement);
MappingRecursiveElement relement = (MappingRecursiveElement)node;
Modified: trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -22,12 +22,7 @@
package org.teiid.query.processor;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import org.teiid.api.exception.query.ExpressionEvaluationException;
import org.teiid.api.exception.query.QueryResolverException;
@@ -36,7 +31,6 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.events.EventDistributor;
import org.teiid.logging.LogManager;
-import org.teiid.metadata.MetadataRepository;
import org.teiid.query.eval.Evaluator;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.metadata.TempMetadataID;
Modified: trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -22,18 +22,13 @@
package org.teiid.query.processor;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import org.teiid.common.buffer.BlockedException;
import org.teiid.common.buffer.TupleSource;
import org.teiid.core.TeiidComponentException;
import org.teiid.dqp.internal.datamgr.LanguageBridgeFactory;
import org.teiid.events.EventDistributor;
-import org.teiid.metadata.MetadataRepository;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.sql.lang.Command;
import org.teiid.query.sql.symbol.Expression;
Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -457,7 +457,7 @@
BatchCollector collector = processor.createBatchCollector();
TupleBuffer id = collector.collectTuples();
- TestProcessor.examineResults((List[])expected.toArray(new List[expected.size()]), bufferMgr, id);
+ TestProcessor.examineResults(expected.toArray(new List[expected.size()]), bufferMgr, id);
}
private BufferManager createCustomBufferMgr(int batchSize) {
@@ -556,7 +556,7 @@
dataMgr.registerTuples(
metadata,
- "CustomerMaster.Customers", (List[])data.toArray(new List[data.size()]));
+ "CustomerMaster.Customers", data.toArray(new List[data.size()]));
}
@Test public void testVirtualAccessVirtualDep() throws Exception {
Modified: trunk/engine/src/test/java/org/teiid/query/processor/relational/TestBatchedUpdateNode.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/relational/TestBatchedUpdateNode.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/test/java/org/teiid/query/processor/relational/TestBatchedUpdateNode.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -22,7 +22,9 @@
package org.teiid.query.processor.relational;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Arrays;
@@ -37,7 +39,6 @@
import org.teiid.common.buffer.TupleSource;
import org.teiid.core.TeiidComponentException;
import org.teiid.events.EventDistributor;
-import org.teiid.metadata.MetadataRepository;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.optimizer.TestBatchedUpdatePlanner;
import org.teiid.query.processor.ProcessorDataManager;
Modified: trunk/engine/src/test/java/org/teiid/query/processor/relational/TestProjectIntoNode.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/relational/TestProjectIntoNode.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/test/java/org/teiid/query/processor/relational/TestProjectIntoNode.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -22,7 +22,9 @@
package org.teiid.query.processor.relational;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Arrays;
@@ -30,15 +32,10 @@
import org.junit.Test;
import org.teiid.api.exception.query.ExpressionEvaluationException;
-import org.teiid.common.buffer.BlockedException;
-import org.teiid.common.buffer.BufferManager;
-import org.teiid.common.buffer.BufferManagerFactory;
-import org.teiid.common.buffer.TupleBatch;
-import org.teiid.common.buffer.TupleSource;
+import org.teiid.common.buffer.*;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.events.EventDistributor;
-import org.teiid.metadata.MetadataRepository;
import org.teiid.query.eval.Evaluator;
import org.teiid.query.processor.FakeTupleSource;
import org.teiid.query.processor.ProcessorDataManager;
Modified: trunk/engine/src/test/java/org/teiid/query/sql/lang/TestSubquerySetCriteria.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/sql/lang/TestSubquerySetCriteria.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/test/java/org/teiid/query/sql/lang/TestSubquerySetCriteria.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -87,13 +87,13 @@
public void testEquals2() {
SubquerySetCriteria c1 = example1();
- SubquerySetCriteria c2 = (SubquerySetCriteria)c1.clone();
+ SubquerySetCriteria c2 = c1.clone();
assertTrue("Equivalent set criteria should have been equal.", c1.equals(c2)); //$NON-NLS-1$
}
public void testEquals3() {
SubquerySetCriteria c1 = example1();
- SubquerySetCriteria c2 = (SubquerySetCriteria)c1.clone();
+ SubquerySetCriteria c2 = c1.clone();
c2.setNegated(true);
assertFalse("Set criteria are not the same", c1.equals(c2)); //$NON-NLS-1$
}
Modified: trunk/engine/src/test/java/org/teiid/query/sql/symbol/TestAggregateSymbol.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/sql/symbol/TestAggregateSymbol.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/test/java/org/teiid/query/sql/symbol/TestAggregateSymbol.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -32,7 +32,7 @@
import org.teiid.query.sql.symbol.Expression;
import org.teiid.query.sql.symbol.Function;
-
+@SuppressWarnings("nls")
public class TestAggregateSymbol extends TestCase {
// ################################## FRAMEWORK ################################
Modified: trunk/engine/src/test/java/org/teiid/query/sql/visitor/TestExpressionMappingVisitor.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/sql/visitor/TestExpressionMappingVisitor.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/engine/src/test/java/org/teiid/query/sql/visitor/TestExpressionMappingVisitor.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -207,10 +207,10 @@
*/
@Test public void testRecursionDetection() {
ElementSymbol e1 = new ElementSymbol("g1.e1"); //$NON-NLS-1$
- AggregateSymbol a1 = new AggregateSymbol(NonReserved.SUM, false, e1); //$NON-NLS-1$
+ AggregateSymbol a1 = new AggregateSymbol(NonReserved.SUM, false, e1);
Function f = new Function(SourceSystemFunctions.ADD_OP, new Expression[] {a1, a1});
HashMap<AggregateSymbol, AggregateSymbol> map = new HashMap<AggregateSymbol, AggregateSymbol>();
- map.put(a1, new AggregateSymbol(NonReserved.SUM, false, a1)); //$NON-NLS-1$
+ map.put(a1, new AggregateSymbol(NonReserved.SUM, false, a1));
ExpressionMappingVisitor.mapExpressions(f, map);
assertEquals("(SUM(SUM(g1.e1)) + SUM(SUM(g1.e1)))", f.toString()); //$NON-NLS-1$
}
Modified: trunk/jboss-integration/pom.xml
===================================================================
--- trunk/jboss-integration/pom.xml 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/jboss-integration/pom.xml 2012-05-24 19:29:03 UTC (rev 4143)
@@ -5,7 +5,6 @@
<version>8.1.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.teiid</groupId>
<artifactId>teiid-jboss-integration</artifactId>
<name>teiid-jboss-integration</name>
<description>JBoss specific integration layer for teiid</description>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/runtime/pom.xml 2012-05-24 19:29:03 UTC (rev 4143)
@@ -6,7 +6,6 @@
<version>8.1.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.teiid</groupId>
<artifactId>teiid-runtime</artifactId>
<name>Runtime Engine</name>
<description>Teiid Runtime Engine</description>
Modified: trunk/test-integration/common/src/test/java/org/teiid/cdk/api/TestTranslationUtility.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/cdk/api/TestTranslationUtility.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/common/src/test/java/org/teiid/cdk/api/TestTranslationUtility.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -22,7 +22,6 @@
package org.teiid.cdk.api;
-import static org.junit.Assert.assertEquals;
import junit.framework.TestCase;
import org.teiid.core.util.UnitTestUtil;
Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractMMQueryTestCase.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractMMQueryTestCase.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractMMQueryTestCase.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -23,19 +23,13 @@
package org.teiid.jdbc;
-import java.io.File;
import java.sql.Connection;
import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.Stack;
-import org.teiid.core.util.UnitTestUtil;
-import org.teiid.jdbc.TeiidDriver;
-
/**
* This class can be used as the base class to write Query based tests using
* the Teiid Driver for integration testing. Just like the scripted one this one should provide all
Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestQueryPlans.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestQueryPlans.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestQueryPlans.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -24,15 +24,10 @@
import static org.junit.Assert.*;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLXML;
-import java.sql.Statement;
-import java.sql.Types;
+import java.sql.*;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.teiid.core.util.UnitTestUtil;
Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestResultsMetadataWithProvider.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestResultsMetadataWithProvider.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestResultsMetadataWithProvider.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -33,6 +33,7 @@
/**
*/
+@SuppressWarnings("nls")
public class TestResultsMetadataWithProvider extends TestCase {
/**
Modified: trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -22,7 +22,10 @@
package org.teiid.transport;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.net.InetAddress;
@@ -31,22 +34,14 @@
import java.net.UnknownHostException;
import java.nio.charset.Charset;
import java.security.NoSuchAlgorithmException;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
import java.util.Properties;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
import org.mockito.Mockito;
import org.postgresql.Driver;
import org.teiid.client.security.ILogon;
@@ -55,7 +50,6 @@
import org.teiid.jdbc.FakeServer;
import org.teiid.jdbc.TeiidDriver;
import org.teiid.jdbc.TestMMDatabaseMetaData;
-import org.teiid.jdbc.util.ResultSetUtil;
import org.teiid.net.socket.SocketUtil;
@SuppressWarnings("nls")
Modified: trunk/test-integration/db/pom.xml
===================================================================
--- trunk/test-integration/db/pom.xml 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/pom.xml 2012-05-24 19:29:03 UTC (rev 4143)
@@ -29,7 +29,6 @@
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
@@ -76,7 +75,6 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.0</version>
</dependency>
<dependency>
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ClassFactory.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/ClassFactory.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ClassFactory.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -33,6 +33,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public class ClassFactory {
/**
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryReader.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryReader.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryReader.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -44,6 +44,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public interface QueryReader {
/**
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryScenario.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryScenario.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryScenario.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -21,18 +21,13 @@
*/
package org.teiid.test.client;
-import java.io.File;
-import java.io.IOException;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Properties;
-import org.teiid.core.util.FileUtils;
-import org.teiid.core.util.PropertiesUtils;
import org.teiid.test.client.TestProperties.RESULT_MODES;
-import org.teiid.test.framework.ConfigPropertyLoader;
import org.teiid.test.framework.TestLogger;
import org.teiid.test.framework.exception.QueryTestFailedException;
import org.teiid.test.framework.exception.TransactionRuntimeException;
@@ -49,6 +44,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public abstract class QueryScenario {
protected QueryReader reader = null;
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClient.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClient.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClient.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -58,6 +58,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public class TestClient {
public static final SimpleDateFormat TSFORMAT = new SimpleDateFormat(
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClientTransaction.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClientTransaction.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClientTransaction.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -38,6 +38,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public class TestClientTransaction extends AbstractQueryTransactionTest {
private QueryScenario querySet = null;
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestProperties.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/TestProperties.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestProperties.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -25,6 +25,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public class TestProperties {
/**
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResult.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResult.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResult.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -29,6 +29,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public interface TestResult {
/**
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -46,6 +46,7 @@
import org.teiid.test.framework.TestLogger;
import org.teiid.test.util.StringUtil;
+@SuppressWarnings("nls")
public class TestResultsSummary {
private static final String OVERALL_SUMMARY_FILE = "Summary_totals.txt";
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TransactionFactory.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/TransactionFactory.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TransactionFactory.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -42,6 +42,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public class TransactionFactory {
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/CTCQueryScenario.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/CTCQueryScenario.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/CTCQueryScenario.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -36,6 +36,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public class CTCQueryScenario extends QueryScenario {
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/ListNestedSortComparator.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/ListNestedSortComparator.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/ListNestedSortComparator.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -24,11 +24,9 @@
import java.util.List;
-import org.teiid.core.util.ArgCheck;
-
/**
* This class can be used for comparing lists of elements, when the fields to
* be sorted on and the comparison mechanism are dynamically specified. <p>
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/QueryResults.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/QueryResults.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/QueryResults.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -78,6 +78,7 @@
* the query select statement. If no ordering list is specified, the order is the same as results fields are added to this object.
* <p>
*/
+@SuppressWarnings("nls")
public class QueryResults implements
Externalizable {
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -57,7 +57,7 @@
-
+@SuppressWarnings("nls")
public class XMLExpectedResults implements ExpectedResults {
protected Properties props;
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLGenerateResults.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLGenerateResults.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLGenerateResults.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -22,24 +22,13 @@
package org.teiid.test.client.ctc;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
+import java.io.*;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
import java.util.Properties;
-import org.jdom.Attribute;
-import org.jdom.CDATA;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom.*;
import org.jdom.output.XMLOutputter;
import org.junit.Assert;
import org.teiid.core.util.FileUtils;
@@ -50,7 +39,7 @@
import org.teiid.test.framework.exception.QueryTestFailedException;
import org.teiid.test.util.TestResultSetUtil;
-
+@SuppressWarnings("nls")
public class XMLGenerateResults implements ResultsGenerator {
private static final SimpleDateFormat FILE_NAME_DATE_FORMATER = new SimpleDateFormat(
"yyyyMMdd_HHmmss"); //$NON-NLS-1$
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryReader.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryReader.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryReader.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -42,7 +42,7 @@
import org.teiid.test.framework.exception.QueryTestFailedException;
import org.teiid.test.framework.exception.TransactionRuntimeException;
-
+@SuppressWarnings("nls")
public class XMLQueryReader implements QueryReader {
private Properties props = null;
@@ -116,7 +116,6 @@
private List <QueryTest> loadQueries(String querySetID, String queryFileName)
throws IOException {
- List<QueryTest> queries = null;
// Map<String, Object> queries = new HashMap<String, Object>();
File queryFile = new File(queryFileName);
if (!queryFile.exists() || !queryFile.canRead()) {
@@ -153,7 +152,7 @@
String querySet = queryFileName;
List<String> nameParts = StringUtil.split(querySet, "./\\"); //$NON-NLS-1$
if (nameParts.size() > 1) {
- querySet = (String) nameParts.get(nameParts.size() - 2);
+ querySet = nameParts.get(nameParts.size() - 2);
}
return querySet;
}
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryVisitationStrategy.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryVisitationStrategy.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryVisitationStrategy.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -26,19 +26,8 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.SQLXML;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
+import java.sql.*;
+import java.util.*;
import org.jdom.Attribute;
import org.jdom.Document;
@@ -54,7 +43,6 @@
import org.teiid.test.client.QueryTest;
import org.teiid.test.client.ctc.QueryResults.ColumnInfo;
import org.teiid.test.framework.TestLogger;
-import org.teiid.test.framework.exception.QueryTestFailedException;
import org.teiid.test.framework.exception.TransactionRuntimeException;
import org.teiid.test.util.StringUtil;
@@ -69,7 +57,7 @@
* convert the ResultSets into XML. This also helps convert Exceptions into XML
* format.</P>
*/
-
+@SuppressWarnings("nls")
public class XMLQueryVisitationStrategy {
//the row from which we start converting ResultSets to XML
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ExpectedResultsImpl.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ExpectedResultsImpl.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ExpectedResultsImpl.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -31,13 +31,12 @@
import org.teiid.core.util.SqlUtil;
import org.teiid.test.client.ExpectedResults;
-import org.teiid.test.client.TestProperties;
import org.teiid.test.client.ctc.ResultsHolder;
import org.teiid.test.framework.TestLogger;
import org.teiid.test.framework.exception.QueryTestFailedException;
import org.teiid.test.util.TestResultSetUtil;
-
+@SuppressWarnings("nls")
public class ExpectedResultsImpl implements ExpectedResults {
private static final int MAX_COL_WIDTH = 65;
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -36,6 +36,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public class QueryScenarioImpl extends QueryScenario {
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ResultsGeneratorImpl.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ResultsGeneratorImpl.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ResultsGeneratorImpl.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -28,8 +28,6 @@
import java.io.PrintStream;
import java.sql.ResultSet;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
import java.util.List;
import java.util.Properties;
@@ -40,7 +38,7 @@
import org.teiid.test.framework.exception.QueryTestFailedException;
import org.teiid.test.util.TestResultSetUtil;
-
+@SuppressWarnings("nls")
public class ResultsGeneratorImpl implements ResultsGenerator {
private static final SimpleDateFormat FILE_NAME_DATE_FORMATER = new SimpleDateFormat(
"yyyyMMdd_HHmmss"); //$NON-NLS-1$
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/results/TestResultStat.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/results/TestResultStat.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/results/TestResultStat.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -30,6 +30,7 @@
*
* <p>A per-query set of result stats.</p>
*/
+@SuppressWarnings("nls")
public class TestResultStat implements TestResult, Serializable {
/**
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyLoader.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyLoader.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyLoader.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -19,7 +19,7 @@
* @author vanhalbert
*
*/
-
+@SuppressWarnings("nls")
public class ConfigPropertyLoader {
/**
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyNames.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyNames.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyNames.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -15,6 +15,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public interface ConfigPropertyNames {
/**
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/TestLogger.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/TestLogger.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/TestLogger.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -32,6 +32,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public class TestLogger {
public static final Level INFO = Level.INFO;
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionContainer.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionContainer.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionContainer.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -7,7 +7,7 @@
import org.teiid.core.util.StringUtil;
import org.teiid.test.framework.exception.TransactionRuntimeException;
-
+@SuppressWarnings("nls")
public abstract class TransactionContainer {
private String testClassName = null;
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategy.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategy.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategy.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -17,7 +17,7 @@
import org.teiid.test.framework.exception.QueryTestFailedException;
import org.teiid.test.framework.exception.TransactionRuntimeException;
-
+@SuppressWarnings("nls")
public abstract class ConnectionStrategy {
private Properties env = null;
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategyFactory.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategyFactory.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategyFactory.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -18,6 +18,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public class ConnectionStrategyFactory {
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/DataSourceConnection.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/DataSourceConnection.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/DataSourceConnection.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -19,7 +19,7 @@
import org.teiid.test.framework.exception.QueryTestFailedException;
import org.teiid.test.framework.exception.TransactionRuntimeException;
-
+@SuppressWarnings("nls")
public class DataSourceConnection extends ConnectionStrategy {
public static final String DS_USER = "user"; //$NON-NLS-1$
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/DriverConnection.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/DriverConnection.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/DriverConnection.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -18,6 +18,7 @@
* The DriverConnection strategy that can get connections in standalone mode or
* embedded mode.
*/
+@SuppressWarnings("nls")
public class DriverConnection extends ConnectionStrategy {
public static final String DS_USER = "user"; //$NON-NLS-1$
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/JEEConnection.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/JEEConnection.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/JEEConnection.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -10,7 +10,6 @@
import javax.naming.InitialContext;
import javax.sql.DataSource;
-import org.teiid.test.framework.datasource.DataSourceFactory;
import org.teiid.test.framework.exception.QueryTestFailedException;
import org.teiid.test.framework.exception.TransactionRuntimeException;
@@ -19,6 +18,7 @@
* server. Make sure all the jndi names are set correctly in the properties
* file.
*/
+@SuppressWarnings("nls")
public class JEEConnection extends ConnectionStrategy {
public static final String DS_JNDINAME = "ds-jndiname"; //$NON-NLS-1$
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSource.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSource.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSource.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -17,6 +17,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public class DataSource {
public static final String CONNECTOR_TYPE="db.connectortype";
public static final String DB_TYPE="db.type";
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceFactory.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceFactory.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceFactory.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -69,6 +69,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public class DataSourceFactory {
/**
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceMgr.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceMgr.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceMgr.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -30,6 +30,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public class DataSourceMgr {
private static DataSourceMgr _instance = null;
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataStore.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataStore.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataStore.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -13,6 +13,7 @@
/**
* This class loads the data in the databases specified, to a known state
*/
+@SuppressWarnings("nls")
public class DataStore {
/**
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -46,6 +46,7 @@
* validate the results of the testcase.
*
*/
+@SuppressWarnings("nls")
public abstract class AbstractQueryTransactionTest extends org.teiid.jdbc.AbstractQueryTest
implements TransactionQueryTestCase {
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/JNDITransaction.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/JNDITransaction.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/JNDITransaction.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -14,7 +14,7 @@
-
+@SuppressWarnings("nls")
public class JNDITransaction extends TransactionContainer {
UserTransaction userTxn = null;
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/LocalTransaction.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/LocalTransaction.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/LocalTransaction.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -17,6 +17,7 @@
/**
* A transaction which is user controlled.
*/
+@SuppressWarnings("nls")
public class LocalTransaction extends TransactionContainer {
public LocalTransaction() {
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/XATransaction.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/XATransaction.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/XATransaction.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -13,7 +13,7 @@
import org.teiid.test.framework.TransactionQueryTestCase;
import org.teiid.test.framework.exception.TransactionRuntimeException;
-
+@SuppressWarnings("nls")
public class XATransaction extends TransactionContainer {
private static Random RANDOM = new Random();
private XidImpl xid;
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/util/PropUtils.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/util/PropUtils.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/util/PropUtils.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -10,7 +10,7 @@
import org.teiid.test.framework.ConfigPropertyLoader;
import org.teiid.test.framework.exception.TransactionRuntimeException;
-
+@SuppressWarnings("nls")
public class PropUtils {
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/util/TestResultSetUtil.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/util/TestResultSetUtil.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/util/TestResultSetUtil.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -51,6 +51,7 @@
*
* @since
*/
+@SuppressWarnings("nls")
public class TestResultSetUtil {
@@ -60,7 +61,7 @@
private static final String MORE = "$ ";
- public static List compareThrowable(Throwable t, String query, File expectedResultsFile, boolean printToConsole) throws IOException, SQLException {
+ public static List compareThrowable(Throwable t, String query, File expectedResultsFile, boolean printToConsole) throws IOException {
BufferedReader expectedResultsReader = null;
if (expectedResultsFile != null && expectedResultsFile.exists() && expectedResultsFile.canRead()) {
expectedResultsReader = new BufferedReader(new FileReader(expectedResultsFile));
Modified: trunk/test-integration/db/src/test/java/org/teiid/adminapi/jboss/BaseConnection.java
===================================================================
--- trunk/test-integration/db/src/test/java/org/teiid/adminapi/jboss/BaseConnection.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/test/java/org/teiid/adminapi/jboss/BaseConnection.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -8,7 +8,7 @@
import org.teiid.jdbc.TeiidDataSource;
-
+@SuppressWarnings("nls")
public class BaseConnection {
static String user = "admin";
static String password = "teiid";
Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/AutoWrapTransactionTests.java
===================================================================
--- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/AutoWrapTransactionTests.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/AutoWrapTransactionTests.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -14,7 +14,7 @@
import org.teiid.test.framework.query.QueryExecution;
import org.teiid.test.framework.transaction.TxnAutoTransaction;
-
+@SuppressWarnings("nls")
public class AutoWrapTransactionTests extends CommonTransactionTests {
Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java
===================================================================
--- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -9,11 +9,9 @@
import java.util.concurrent.TimeoutException;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.teiid.jdbc.AbstractQueryTest;
import org.teiid.jdbc.TeiidSQLException;
-import org.teiid.test.framework.TransactionContainer;
import org.teiid.test.framework.query.AbstractQueryTransactionTest;
import org.teiid.test.framework.query.QueryExecution;
@@ -21,6 +19,7 @@
/**
* A common test case among many different transaction stuff.
*/
+@SuppressWarnings("nls")
public abstract class CommonTransactionTests extends BaseAbstractTransactionTestCase {
Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionTests.java
===================================================================
--- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionTests.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionTests.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -18,6 +18,7 @@
* User Transaction Test is where user handles all the transaction boundaries
* so, autocmmit = OFF, and No transaction auto wrapping.
*/
+@SuppressWarnings("nls")
public class LocalTransactionTests extends CommonTransactionTests {
Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OffWrapTransactionTests.java
===================================================================
--- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OffWrapTransactionTests.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OffWrapTransactionTests.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -14,7 +14,7 @@
import org.teiid.test.framework.query.QueryExecution;
import org.teiid.test.framework.transaction.TxnAutoTransaction;
-
+@SuppressWarnings("nls")
public class OffWrapTransactionTests extends BaseAbstractTransactionTestCase {
Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OnWrapTransactionTests.java
===================================================================
--- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OnWrapTransactionTests.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OnWrapTransactionTests.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -36,6 +36,7 @@
* @author vanhalbert
*
*/
+@SuppressWarnings("nls")
public class OnWrapTransactionTests extends CommonTransactionTests {
@@ -143,7 +144,7 @@
// force the rollback by trying to insert an invalid row.
list.add("insert into pm1.g2 (e1, e2) values(9999,'9999')");
- executeBatch((String[]) list.toArray(new String[list.size()]));
+ executeBatch(list.toArray(new String[list.size()]));
}
@Override
Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/StandaloneGlobalTransactionTests.java
===================================================================
--- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/StandaloneGlobalTransactionTests.java 2012-05-24 19:25:06 UTC (rev 4142)
+++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/StandaloneGlobalTransactionTests.java 2012-05-24 19:29:03 UTC (rev 4143)
@@ -19,6 +19,7 @@
* This is global transaction test to be used when transaction is external
* in places like inside app server
*/
+@SuppressWarnings("nls")
public class StandaloneGlobalTransactionTests extends LocalTransactionTests {
private static Properties SYS_PROPS;
11 years, 11 months
- 1
- 0
teiid SVN: r4142 - trunk/runtime/src/main/java/org/teiid/transport.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-05-24 15:25:06 -0400 (Thu, 24 May 2012)
New Revision: 4142
Modified:
trunk/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java
Log:
TEIID-2055, TEIID-2037: cleanup the security context from io threads
Modified: trunk/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java 2012-05-24 19:23:47 UTC (rev 4141)
+++ trunk/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java 2012-05-24 19:25:06 UTC (rev 4142)
@@ -159,6 +159,9 @@
if (LogManager.isMessageToBeRecorded(LogConstants.CTX_TRANSPORT, MessageLevel.DETAIL)) {
LogManager.logDetail(LogConstants.CTX_TRANSPORT, "processing message:" + packet); //$NON-NLS-1$
}
+ if (this.workContext.getSecurityHelper() != null) {
+ this.workContext.getSecurityHelper().clearSecurityContext();
+ }
final ServerWorkItem work = new ServerWorkItem(this, packet.getMessageKey(), packet, this.csr);
this.workContext.runInContext(work);
}
11 years, 11 months
- 1
- 0
teiid SVN: r4141 - branches/7.7.x/runtime/src/test/java/org/teiid/services.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-05-24 15:23:47 -0400 (Thu, 24 May 2012)
New Revision: 4141
Modified:
branches/7.7.x/runtime/src/test/java/org/teiid/services/TestMembershipServiceImpl.java
Log:
TEIID-2037, TEIID-2055: fixing the test
Modified: branches/7.7.x/runtime/src/test/java/org/teiid/services/TestMembershipServiceImpl.java
===================================================================
--- branches/7.7.x/runtime/src/test/java/org/teiid/services/TestMembershipServiceImpl.java 2012-05-24 18:00:40 UTC (rev 4140)
+++ branches/7.7.x/runtime/src/test/java/org/teiid/services/TestMembershipServiceImpl.java 2012-05-24 19:23:47 UTC (rev 4141)
@@ -59,17 +59,19 @@
HashSet<Principal> principals = new HashSet<Principal>();
principals.add(p);
- Subject subject = new Subject(false, principals, new HashSet(), new HashSet());
+ final Subject subject = new Subject(false, principals, new HashSet(), new HashSet());
SecurityHelper sh = Mockito.mock(SecurityHelper.class);
Mockito.stub(sh.getSubjectInContext("passthrough")).toReturn(subject); //$NON-NLS-1$
TeiidLoginContext membershipService = new TeiidLoginContext(sh) {
public LoginContext createLoginContext(String domain, CallbackHandler handler) throws LoginException {
LoginContext context = Mockito.mock(LoginContext.class);
+ Mockito.stub(context.getSubject()).toReturn(subject);
return context;
}
protected LoginContext createLoginContext(String domain, Subject subject) throws LoginException {
LoginContext context = Mockito.mock(LoginContext.class);
+ Mockito.stub(context.getSubject()).toReturn(subject);
return context;
}
};
11 years, 11 months
- 1
- 0
teiid SVN: r4140 - in branches/7.7.x/runtime/src/main/java/org/teiid: transport and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-05-24 14:00:40 -0400 (Thu, 24 May 2012)
New Revision: 4140
Modified:
branches/7.7.x/runtime/src/main/java/org/teiid/services/TeiidLoginContext.java
branches/7.7.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java
Log:
TEIID-2055: Further enhancements to make sure the security context and logged in user are both in sync
Modified: branches/7.7.x/runtime/src/main/java/org/teiid/services/TeiidLoginContext.java
===================================================================
--- branches/7.7.x/runtime/src/main/java/org/teiid/services/TeiidLoginContext.java 2012-05-24 16:46:59 UTC (rev 4139)
+++ branches/7.7.x/runtime/src/main/java/org/teiid/services/TeiidLoginContext.java 2012-05-24 18:00:40 UTC (rev 4140)
@@ -59,6 +59,7 @@
private String securitydomain;
private Object credentials;
private SecurityHelper securityHelper;
+ private Object securityContext;
public TeiidLoginContext(SecurityHelper helper) {
this.securityHelper = helper;
@@ -79,6 +80,7 @@
this.userName = getUserName(existing)+AT+domain;
this.securitydomain = domain;
this.loginContext = createLoginContext(domain, existing);
+ this.securityContext = this.securityHelper.getSecurityContext(this.securitydomain);
return;
}
}
@@ -118,7 +120,16 @@
this.loginContext.login();
this.userName = baseUsername+AT+domain;
this.securitydomain = domain;
- return;
+ Subject subject = this.loginContext.getSubject();
+ Principal principal = null;
+ for(Principal p:subject.getPrincipals()) {
+ if (baseUsername.equals(p.getName())) {
+ principal = p;
+ break;
+ }
+ }
+ this.securityContext = this.securityHelper.createSecurityContext(this.securitydomain, principal, credentials, subject);
+ return;
} catch (LoginException e) {
LogManager.logDetail(LogConstants.CTX_SECURITY,e, e.getMessage());
}
@@ -158,22 +169,7 @@
}
public Object getSecurityContext() {
- Object sc = null;
- if (this.loginContext != null) {
- sc = this.securityHelper.getSecurityContext(this.securitydomain);
- if ( sc == null){
- Subject subject = this.loginContext.getSubject();
- Principal principal = null;
- for(Principal p:subject.getPrincipals()) {
- if (this.userName.startsWith(p.getName())) {
- principal = p;
- break;
- }
- }
- return this.securityHelper.createSecurityContext(this.securitydomain, principal, credentials, subject);
- }
- }
- return sc;
+ return securityContext;
}
static String getBaseUsername(String username) {
Modified: branches/7.7.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java
===================================================================
--- branches/7.7.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java 2012-05-24 16:46:59 UTC (rev 4139)
+++ branches/7.7.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java 2012-05-24 18:00:40 UTC (rev 4140)
@@ -159,6 +159,9 @@
if (LogManager.isMessageToBeRecorded(LogConstants.CTX_TRANSPORT, MessageLevel.DETAIL)) {
LogManager.logDetail(LogConstants.CTX_TRANSPORT, "processing message:" + packet); //$NON-NLS-1$
}
+ if (this.workContext.getSecurityHelper() != null) {
+ this.workContext.getSecurityHelper().clearSecurityContext();
+ }
final ServerWorkItem work = new ServerWorkItem(this, packet.getMessageKey(), packet, this.csr);
this.workContext.runInContext(work);
}
11 years, 11 months
- 1
- 0
teiid SVN: r4139 - trunk/connectors/translator-jpa.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-05-24 12:46:59 -0400 (Thu, 24 May 2012)
New Revision: 4139
Modified:
trunk/connectors/translator-jpa/
Log:
adding ignores
Property changes on: trunk/connectors/translator-jpa
___________________________________________________________________
Modified: svn:ignore
- .project
.settings
.classpath
+ .project
.settings
.classpath
target
11 years, 11 months
- 1
- 0
teiid SVN: r4138 - trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-05-24 12:45:13 -0400 (Thu, 24 May 2012)
New Revision: 4138
Removed:
trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/conf/
Modified:
trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml
Log:
TEIID-2050: removing the conf directory, since it is unused and the kitting does not copy it
Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml
===================================================================
--- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml 2012-05-23 21:51:53 UTC (rev 4137)
+++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml 2012-05-24 16:45:13 UTC (rev 4138)
@@ -10,10 +10,8 @@
<resource-root path="json-simple-1.1.jar" />
<resource-root path="xom-1.2.jar" />
<resource-root path="nux-1.6.jar" />
- <resource-root path="conf" />
</resources>
-
<dependencies>
<module name="javax.api" />
<module name="javax.xml.bind.api" />
11 years, 11 months
- 1
- 0
teiid SVN: r4137 - in trunk: admin/src/main/java/org/teiid/adminapi/impl and 21 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-05-23 17:51:53 -0400 (Wed, 23 May 2012)
New Revision: 4137
Added:
trunk/admin/src/main/java/org/teiid/adminapi/VDBImport.java
trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBImportMetadata.java
Modified:
trunk/admin/src/main/java/org/teiid/adminapi/Admin.java
trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java
trunk/admin/src/main/java/org/teiid/adminapi/VDB.java
trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java
trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataMapper.java
trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java
trunk/admin/src/main/resources/org/teiid/adminapi/i18n.properties
trunk/admin/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java
trunk/admin/src/test/resources/parser-test-vdb.xml
trunk/admin/src/test/resources/vdb-describe.txt
trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
trunk/client/src/main/resources/vdb-deployer.xsd
trunk/documentation/javadocs/
trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java
trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadata.java
trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadataWrapper.java
trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java
trunk/engine/src/main/java/org/teiid/query/metadata/QueryMetadataInterface.java
trunk/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java
trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/SourceCapabilities.java
trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java
trunk/engine/src/main/resources/org/teiid/query/i18n.properties
trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidExtension.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBParserDeployer.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
trunk/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java
trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java
trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java
trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties
trunk/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java
trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java
trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestLocalConnections.java
trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java
trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViews.java
trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMetadataUpdates.java
trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestReplication.java
Log:
TEIID-1366 introducing the concept of an imported vdb to replace merge vdb
Modified: trunk/admin/src/main/java/org/teiid/adminapi/Admin.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/Admin.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/admin/src/main/java/org/teiid/adminapi/Admin.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -249,17 +249,6 @@
void setAnyAuthenticatedForDataRole(String vdbName, int vdbVersion, String dataRole, boolean anyAuthenticated) throws AdminException;
/**
- * Merge the Source VDB into Target VDB. Both Source and Target VDBs must be present for this method to
- * succeed. The changes will not be persistent between server restarts.
- * @param sourceVDBName
- * @param sourceVDBVersion
- * @param targetVDBName
- * @param targetVDBVersion
- */
- void mergeVDBs(String sourceVDBName, int sourceVDBVersion, String targetVDBName, int targetVDBVersion) throws AdminException;
-
-
- /**
* Creates a JCA data source
* @param deploymentName - name of the source
* @param templateName - template of data source
Modified: trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -1203,25 +1203,6 @@
}
@Override
- public void mergeVDBs(String sourceVDBName, int sourceVDBVersion,
- String targetVDBName, int targetVDBVersion)
- throws AdminException {
- final ModelNode request = buildRequest("teiid", "merge-vdbs",
- "source-vdb-name", sourceVDBName,
- "source-vdb-name", String.valueOf(sourceVDBVersion),
- "target-vdb-name", targetVDBName,
- "target-vdb-version", String.valueOf(targetVDBVersion));//$NON-NLS-1$
- try {
- ModelNode outcome = this.connection.execute(request);
- if (!Util.isSuccess(outcome)) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70037, Util.getFailureDescription(outcome));
- }
- } catch (Exception e) {
- throw new AdminProcessingException(AdminPlugin.Event.TEIID70038, e, e.getMessage());
- }
- }
-
- @Override
public void addDataRoleMapping(String vdbName, int vdbVersion, String dataRole, String mappedRoleName) throws AdminException {
final ModelNode request = buildRequest("teiid", "add-data-role",
"vdb-name", vdbName,
Modified: trunk/admin/src/main/java/org/teiid/adminapi/VDB.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/VDB.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/admin/src/main/java/org/teiid/adminapi/VDB.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -65,12 +65,6 @@
public int getVersion();
/**
- * Get the URL for the VDB
- * @return
- */
- public String getUrl();
-
- /**
* Get the description of the VDB
* @return
*/
@@ -99,4 +93,10 @@
* @return
*/
public List<Translator> getOverrideTranslators();
+
+ /**
+ * Get the list of vdb imports
+ * @return
+ */
+ public List<? extends VDBImport> getVDBImports();
}
Added: trunk/admin/src/main/java/org/teiid/adminapi/VDBImport.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/VDBImport.java (rev 0)
+++ trunk/admin/src/main/java/org/teiid/adminapi/VDBImport.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package org.teiid.adminapi;
+
+public interface VDBImport {
+
+ String getName();
+
+ int getVersion();
+
+ boolean isImportDataPolicies();
+
+}
\ No newline at end of file
Property changes on: trunk/admin/src/main/java/org/teiid/adminapi/VDBImport.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBImportMetadata.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBImportMetadata.java (rev 0)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBImportMetadata.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package org.teiid.adminapi.impl;
+
+import org.teiid.adminapi.VDBImport;
+
+public class VDBImportMetadata extends AdminObjectImpl implements VDBImport {
+
+ private static final long serialVersionUID = 8827106139518843217L;
+
+ private String name;
+ private int version = 1;
+ private boolean importDataPolicies = true;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getVersion() {
+ return version;
+ }
+
+ public void setVersion(int version) {
+ this.version = version;
+ }
+
+ public boolean isImportDataPolicies() {
+ return importDataPolicies;
+ }
+
+ public void setImportDataPolicies(boolean importDataPolicies) {
+ this.importDataPolicies = importDataPolicies;
+ }
+
+}
Property changes on: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBImportMetadata.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -21,8 +21,8 @@
*/
package org.teiid.adminapi.impl;
-import java.net.URL;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -33,7 +33,6 @@
import org.teiid.adminapi.Translator;
import org.teiid.adminapi.VDB;
import org.teiid.adminapi.impl.ModelMetaData.ValidationError;
-import org.teiid.core.util.StringUtil;
public class VDBMetaData extends AdminObjectImpl implements VDB {
@@ -71,18 +70,20 @@
public String getKey(DataPolicyMetadata entry) {
return entry.getName();
}
- });
+ });
+ private List<VDBImportMetadata> imports = new ArrayList<VDBImportMetadata>(2);
+
private int version = 1;
protected String description;
- private String fileUrl = null;
private boolean dynamic = false;
private VDB.Status status = VDB.Status.INACTIVE;
private ConnectionType connectionType = VDB.ConnectionType.BY_VERSION;
private boolean removed;
private long queryTimeout = Long.MIN_VALUE;
+ private Set<String> importedModels = Collections.emptySet();
public String getName() {
return super.getName();
@@ -131,7 +132,6 @@
this.status = Status.valueOf(s);
}
-
@Override
public int getVersion() {
return this.version;
@@ -142,33 +142,6 @@
}
@Override
- public String getUrl() {
- return this.fileUrl;
- }
-
- public void setUrl(String url) {
- this.fileUrl = url;
- }
-
- public void setUrl(URL url) {
- this.setUrl(url.toExternalForm());
- String path = url.getPath();
- if (path.endsWith("/")) { //$NON-NLS-1$
- path = path.substring(0, path.length() - 1);
- }
- String fileName = StringUtil.getLastToken(path, "/"); //$NON-NLS-1$
- String[] parts = fileName.split("\\."); //$NON-NLS-1$
- if (parts[0].equalsIgnoreCase(getName()) && parts.length >= 3) {
- try {
- int fileVersion = Integer.parseInt(parts[parts.length - 2]);
- this.setVersion(fileVersion);
- } catch (NumberFormatException e) {
-
- }
- }
- }
-
- @Override
public List<Model> getModels(){
return new ArrayList<Model>(this.models.getMap().values());
}
@@ -286,12 +259,6 @@
return list;
}
- // This one manages the JAXB binding
- @Override
- public List<PropertyMetadata> getJAXBProperties(){
- return super.getJAXBProperties();
- }
-
public boolean isDynamic() {
return dynamic;
}
@@ -317,8 +284,8 @@
}
}
- public void addDataPolicy(DataPolicyMetadata policy){
- this.dataPolicies.getMap().put(policy.getName(), policy);
+ public DataPolicyMetadata addDataPolicy(DataPolicyMetadata policy){
+ return this.dataPolicies.getMap().put(policy.getName(), policy);
}
public DataPolicyMetadata getDataPolicy(String policyName) {
@@ -343,4 +310,16 @@
}
return queryTimeout;
}
+
+ public List<VDBImportMetadata> getVDBImports() {
+ return imports;
+ }
+
+ public Set<String> getImportedModels() {
+ return importedModels;
+ }
+
+ public void setImportedModels(Set<String> importedModels) {
+ this.importedModels = importedModels;
+ }
}
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataMapper.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataMapper.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataMapper.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -29,9 +29,9 @@
import org.teiid.adminapi.AdminPlugin;
import org.teiid.adminapi.DataPolicy;
import org.teiid.adminapi.Model;
+import org.teiid.adminapi.Translator;
import org.teiid.adminapi.Request.ProcessingState;
import org.teiid.adminapi.Request.ThreadState;
-import org.teiid.adminapi.Translator;
import org.teiid.adminapi.VDB.ConnectionType;
import org.teiid.adminapi.VDB.Status;
import org.teiid.adminapi.impl.DataPolicyMetadata.PermissionMetaData;
@@ -42,8 +42,8 @@
private static final String CONNECTIONTYPE = "connection-type"; //$NON-NLS-1$
private static final String STATUS = "status"; //$NON-NLS-1$
private static final String VERSION = "vdb-version"; //$NON-NLS-1$
- private static final String URL = "url"; //$NON-NLS-1$
private static final String MODELS = "models"; //$NON-NLS-1$
+ private static final String IMPORT_VDBS = "import-vdbs"; //$NON-NLS-1$
private static final String OVERRIDE_TRANSLATORS = "override-translators"; //$NON-NLS-1$
private static final String VDB_DESCRIPTION = "vdb-description"; //$NON-NLS-1$
private static final String PROPERTIES = "properties"; //$NON-NLS-1$
@@ -62,8 +62,6 @@
node.get(CONNECTIONTYPE).set(vdb.getConnectionType().toString());
node.get(STATUS).set(vdb.getStatus().toString());
node.get(VERSION).set(vdb.getVersion());
- if (vdb.getUrl() != null) {
- }
if (vdb.getDescription() != null) {
node.get(VDB_DESCRIPTION).set(vdb.getDescription());
}
@@ -78,6 +76,15 @@
}
}
+ // IMPORT-VDBS
+ List<VDBImportMetadata> imports = vdb.getVDBImports();
+ if (imports != null && !imports.isEmpty()) {
+ ModelNode importNodes = node.get(IMPORT_VDBS);
+ for(VDBImportMetadata vdbImport:imports) {
+ importNodes.add(VDBImportMapper.INSTANCE.wrap(vdbImport, new ModelNode()));
+ }
+ }
+
// MODELS
Map<String, ModelMetaData> models = vdb.getModelMetaDatas();
if (models != null && !models.isEmpty()) {
@@ -126,9 +133,6 @@
if (node.has(VERSION)) {
vdb.setVersion(node.get(VERSION).asInt());
}
- if (node.has(URL)) {
- vdb.setUrl(node.get(URL).asString());
- }
if(node.has(VDB_DESCRIPTION)) {
vdb.setDescription(node.get(VDB_DESCRIPTION).asString());
}
@@ -147,6 +151,17 @@
}
}
+ // IMPORT-VDBS
+ if (node.get(IMPORT_VDBS).isDefined()) {
+ List<ModelNode> modelNodes = node.get(IMPORT_VDBS).asList();
+ for(ModelNode modelNode:modelNodes) {
+ VDBImportMetadata vdbImport = VDBImportMapper.INSTANCE.unwrap(modelNode);
+ if (vdbImport != null) {
+ vdb.getVDBImports().add(vdbImport);
+ }
+ }
+ }
+
// MODELS
if (node.get(MODELS).isDefined()) {
List<ModelNode> modelNodes = node.get(MODELS).asList();
@@ -201,7 +216,6 @@
node.get(STATUS).get(ALLOWED).set(statusAllowed);
addAttribute(node, VERSION, ModelType.INT, true);
- addAttribute(node, URL, ModelType.STRING, false);
addAttribute(node, VDB_DESCRIPTION, ModelType.STRING, false);
addAttribute(node, DYNAMIC, ModelType.BOOLEAN, false);
@@ -210,6 +224,11 @@
props.get(DESCRIPTION).set(AdminPlugin.Util.getString(PROPERTIES+DOT_DESC));
PropertyMetaDataMapper.INSTANCE.describe(props.get(VALUE_TYPE));
+ ModelNode vdbImports = node.get(IMPORT_VDBS);
+ vdbImports.get(TYPE).set(ModelType.LIST);
+ VDBImportMapper.INSTANCE.describe(vdbImports.get(VALUE_TYPE));
+ vdbImports.get(DESCRIPTION).set(AdminPlugin.Util.getString(IMPORT_VDBS+DOT_DESC));
+
ModelNode models = node.get( MODELS);
models.get(TYPE).set(ModelType.LIST);
ModelMetadataMapper.INSTANCE.describe(models.get(VALUE_TYPE));
@@ -386,6 +405,54 @@
}
/**
+ * vdb import mapper
+ */
+ public static class VDBImportMapper implements MetadataMapper<VDBImportMetadata>{
+ private static final String VDB_NAME = "import-vdb-name"; //$NON-NLS-1$
+ private static final String VDB_VERSION = "import-vdb-version"; //$NON-NLS-1$
+ private static final String IMPORT_POLICIES = "import-policies"; //$NON-NLS-1$
+
+ public static VDBImportMapper INSTANCE = new VDBImportMapper();
+
+ @Override
+ public ModelNode wrap(VDBImportMetadata obj, ModelNode node) {
+ if (obj == null) {
+ return null;
+ }
+
+ node.get(VDB_NAME).set(obj.getName());
+ node.get(VDB_VERSION).set(obj.getVersion());
+ node.get(IMPORT_POLICIES).set(obj.isImportDataPolicies());
+ return node;
+ }
+
+ public VDBImportMetadata unwrap(ModelNode node) {
+ if (node == null) {
+ return null;
+ }
+
+ VDBImportMetadata vdbImport = new VDBImportMetadata();
+ if (node.has(VDB_NAME)) {
+ vdbImport.setName(node.get(VDB_NAME).asString());
+ }
+ if (node.has(VDB_VERSION)) {
+ vdbImport.setVersion(node.get(VDB_VERSION).asInt());
+ }
+ if (node.has(IMPORT_POLICIES)) {
+ vdbImport.setImportDataPolicies(node.get(IMPORT_POLICIES).asBoolean());
+ }
+ return vdbImport;
+ }
+
+ public ModelNode describe(ModelNode node) {
+ addAttribute(node, VDB_NAME, ModelType.STRING, true);
+ addAttribute(node, VDB_VERSION, ModelType.INT, true);
+ addAttribute(node, IMPORT_POLICIES, ModelType.BOOLEAN, false);
+ return node;
+ }
+ }
+
+ /**
* validation error mapper
*/
public static class ValidationErrorMapper implements MetadataMapper<ValidationError>{
@@ -710,30 +777,8 @@
permissions.get(TYPE).set(ModelType.LIST);
permissions.get(DESCRIPTION).set(AdminPlugin.Util.getString(DATA_PERMISSIONS+DOT_DESC));
- ModelNode create = permissions.get(VALUE_TYPE, ALLOW_CREATE);
- create.get(DESCRIPTION).set(AdminPlugin.Util.getString(ALLOW_CREATE+DOT_DESC));
- create.get(TYPE).set(ModelType.STRING);
+ PermissionMetaDataMapper.INSTANCE.describe(permissions.get(VALUE_TYPE));
- ModelNode read = permissions.get(VALUE_TYPE, ALLOW_READ);
- read.get(DESCRIPTION).set(AdminPlugin.Util.getString(ALLOW_READ+DOT_DESC));
- read.get(TYPE).set(ModelType.STRING);
-
- ModelNode update = permissions.get(VALUE_TYPE, ALLOW_UPDATE);
- update.get(DESCRIPTION).set(AdminPlugin.Util.getString(ALLOW_UPDATE+DOT_DESC));
- update.get(TYPE).set(ModelType.STRING);
-
- ModelNode delete = permissions.get(VALUE_TYPE, ALLOW_DELETE);
- delete.get(DESCRIPTION).set(AdminPlugin.Util.getString(ALLOW_DELETE+DOT_DESC));
- delete.get(TYPE).set(ModelType.STRING);
-
- ModelNode execute = permissions.get(VALUE_TYPE, ALLOW_EXECUTE);
- execute.get(DESCRIPTION).set(AdminPlugin.Util.getString(ALLOW_EXECUTE+DOT_DESC));
- execute.get(TYPE).set(ModelType.STRING);
-
- ModelNode alter = permissions.get(VALUE_TYPE, ALLOW_ALTER);
- alter.get(DESCRIPTION).set(AdminPlugin.Util.getString(ALLOW_ALTER+DOT_DESC));
- alter.get(TYPE).set(ModelType.STRING);
-
ModelNode roleNames = node.get(MAPPED_ROLE_NAMES);
roleNames.get(TYPE).set(ModelType.LIST);
roleNames.get(DESCRIPTION).set(AdminPlugin.Util.getString(MAPPED_ROLE_NAMES+DOT_DESC));
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -24,10 +24,19 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.*;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
import javax.xml.XMLConstants;
-import javax.xml.stream.*;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
@@ -36,6 +45,7 @@
import org.teiid.adminapi.AdminPlugin;
import org.teiid.adminapi.DataPolicy;
import org.teiid.adminapi.Translator;
+import org.teiid.adminapi.VDBImport;
import org.teiid.adminapi.impl.DataPolicyMetadata.PermissionMetaData;
import org.teiid.adminapi.impl.ModelMetaData.ValidationError;
import org.teiid.core.types.XMLType;
@@ -110,6 +120,15 @@
parseDataRole(reader, policy);
vdb.addDataPolicy(policy);
break;
+ case IMPORT_VDB:
+ VDBImportMetadata vdbImport = new VDBImportMetadata();
+ Properties props = getAttributes(reader);
+ vdbImport.setName(props.getProperty(Element.NAME.getLocalName()));
+ vdbImport.setVersion(Integer.parseInt(props.getProperty(Element.VERSION.getLocalName())));
+ vdbImport.setImportDataPolicies(Boolean.parseBoolean(props.getProperty(Element.IMPORT_POLICIES.getLocalName(), "true")));
+ vdb.getVDBImports().add(vdbImport);
+ ignoreTillEnd(reader);
+ break;
case ENTRY:
// this is designer specific.
break;
@@ -124,6 +143,11 @@
}
}
+ private static void ignoreTillEnd(XMLStreamReader reader)
+ throws XMLStreamException {
+ while(reader.nextTag() != XMLStreamConstants.END_ELEMENT);
+ }
+
private static void parseProperty(XMLStreamReader reader, AdminObjectImpl anObj)
throws XMLStreamException {
if (reader.getAttributeCount() > 0) {
@@ -141,7 +165,7 @@
}
anObj.addProperty(key, value);
}
- while(reader.nextTag() != XMLStreamConstants.END_ELEMENT);
+ ignoreTillEnd(reader);
}
private static void parseDataRole(XMLStreamReader reader, DataPolicyMetadata policy) throws XMLStreamException {
@@ -253,7 +277,7 @@
String translatorName = sourceProps.getProperty(Element.SOURCE_TRANSLATOR_NAME_ATTR.getLocalName());
String connectionName = sourceProps.getProperty(Element.SOURCE_CONNECTION_JNDI_NAME_ATTR.getLocalName());
model.addSourceMapping(name, translatorName, connectionName);
- while(reader.nextTag() != XMLStreamConstants.END_ELEMENT);
+ ignoreTillEnd(reader);
break;
case VALIDATION_ERROR:
Properties validationProps = getAttributes(reader);
@@ -305,6 +329,8 @@
PROPERTY("property"),
VALUE("value"),
MODEL("model"),
+ IMPORT_VDB("import-vdb"),
+ IMPORT_POLICIES("import-data-policies"),
TYPE("type"),
VISIBLE("visible"),
PATH("path"),
@@ -374,6 +400,14 @@
}
writeProperties(writer, vdb.getProperties());
+ for (VDBImport vdbImport : vdb.getVDBImports()) {
+ writer.writeStartElement(Element.IMPORT_VDB.getLocalName());
+ writer.writeAttribute(Element.NAME.getLocalName(), vdbImport.getName());
+ writer.writeAttribute(Element.VERSION.getLocalName(), String.valueOf(vdbImport.getVersion()));
+ writer.writeAttribute(Element.IMPORT_POLICIES.getLocalName(), String.valueOf(vdbImport.isImportDataPolicies()));
+ writer.writeEndElement();
+ }
+
// models
Collection<ModelMetaData> models = vdb.getModelMetaDatas().values();
for (ModelMetaData model:models) {
@@ -498,7 +532,7 @@
}
private static void writeProperties(final XMLStreamWriter writer, Properties props) throws XMLStreamException {
- Enumeration keys = props.propertyNames();
+ Enumeration<?> keys = props.propertyNames();
while (keys.hasMoreElements()) {
writer.writeStartElement(Element.PROPERTY.getLocalName());
String key = (String)keys.nextElement();
@@ -515,8 +549,4 @@
writer.writeEndElement();
}
- private static void writeAttribute(final XMLStreamWriter writer, final Element element, final String value) throws XMLStreamException {
- writer.writeAttribute(element.getLocalName(),value);
- }
-
}
Modified: trunk/admin/src/main/resources/org/teiid/adminapi/i18n.properties
===================================================================
--- trunk/admin/src/main/resources/org/teiid/adminapi/i18n.properties 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/admin/src/main/resources/org/teiid/adminapi/i18n.properties 2012-05-23 21:51:53 UTC (rev 4137)
@@ -23,15 +23,22 @@
module-name.describe=Translator's Module name
allow-create-temp-tables.describe=Allows create of temporary table
any-authenticated.describe=Indicates if the role is mapped to any authenticated user
-policy-name.describe=Resource Name, for which permission defined
+policy-name.describe=Name of the policy
properties.describe=properties
source-mappings.describe=Model to source mapping
validity-errors.describe=Model validation errors
models.describe=Models inside a virtual database
+import-vdbs.describe=Imported vdbs
+import-vdb-name.describe=Name of the Virtual Database to import
+import-vdb-version.describe=Version of the Virtual Database to import
+import-policies.describe=Whether to import associated data policies
override-translators.describe=Overridden translators for the Virtual Database
data-policies.describe=Data access policies defined for the Virtual Database
data-permissions.describe=Permissions defined for data access
mapped-role-names.describe=Policy name to role name mapping
+policy-description.describe=Description of the policy
+vdb-description.describe=Description of the Virtual Database
+resource-name.describe=Resource path name for this permission
execution-id.describe=Unique Identifier for Request
session-id.describe=Session Identifier
Modified: trunk/admin/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java
===================================================================
--- trunk/admin/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/admin/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -23,9 +23,9 @@
import static org.junit.Assert.*;
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -35,6 +35,7 @@
import org.teiid.adminapi.DataPolicy;
import org.teiid.adminapi.Model;
import org.teiid.adminapi.Translator;
+import org.teiid.adminapi.VDBImport;
import org.teiid.adminapi.impl.DataPolicyMetadata.PermissionMetaData;
import org.teiid.core.util.ObjectConverterUtil;
import org.teiid.core.util.PropertiesUtils;
@@ -71,6 +72,11 @@
assertNotNull(vdb.getModel("model-two")); //$NON-NLS-1$
assertNull(vdb.getModel("model-unknown")); //$NON-NLS-1$
+ assertEquals(1, vdb.getVDBImports().size());
+ VDBImport vdbImport = vdb.getVDBImports().get(0);
+ assertEquals("x", vdbImport.getName());
+ assertEquals(2, vdbImport.getVersion());
+
modelOne = vdb.getModel("model-one"); //$NON-NLS-1$
assertEquals("model-one", modelOne.getName()); //$NON-NLS-1$
assertEquals("s1", modelOne.getSourceNames().get(0)); //$NON-NLS-1$
@@ -133,6 +139,11 @@
vdb.addProperty("vdb-property", "vdb-value"); //$NON-NLS-1$ //$NON-NLS-2$
vdb.addProperty("vdb-property2", "vdb-value2"); //$NON-NLS-1$ //$NON-NLS-2$
+ VDBImportMetadata vdbImport = new VDBImportMetadata();
+ vdbImport.setName("x");
+ vdbImport.setVersion(2);
+ vdb.getVDBImports().add(vdbImport);
+
ModelMetaData modelOne = new ModelMetaData();
modelOne.setName("model-one"); //$NON-NLS-1$
modelOne.addSourceMapping("s1", "translator", "java:mybinding"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -190,18 +201,11 @@
public void testAdminMOCreation() {
VDBMetaData vdb = new VDBMetaData();
- PropertiesUtils.setBeanProperty(vdb, "url", "http://teiid.org/myvdb.vdb");
+ PropertiesUtils.setBeanProperty(vdb, "name", "x");
- assertEquals("http://teiid.org/myvdb.vdb", vdb.getUrl());
+ assertEquals("x", vdb.getName());
}
- @Test public void testSetUrlVersion() throws MalformedURLException {
- VDBMetaData vdb = new VDBMetaData();
- vdb.setName("foo");
- vdb.setUrl(new URL("file:///x/foo.2.vdb"));
- assertEquals(2, vdb.getVersion());
- }
-
@Test public void testVDBMetaDataMapper() {
VDBMetaData vdb = buildVDB();
Modified: trunk/admin/src/test/resources/parser-test-vdb.xml
===================================================================
--- trunk/admin/src/test/resources/parser-test-vdb.xml 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/admin/src/test/resources/parser-test-vdb.xml 2012-05-23 21:51:53 UTC (rev 4137)
@@ -2,6 +2,7 @@
<description>vdb description</description>
<property name="vdb-property2" value="vdb-value2"></property>
<property name="vdb-property" value="vdb-value"></property>
+ <import-vdb name="x" version="2"/>
<model name="model-one" type="PHYSICAL" visible="false">
<description>model description</description>
<property name="model-prop" value="model-value-override"></property>
Modified: trunk/admin/src/test/resources/vdb-describe.txt
===================================================================
--- trunk/admin/src/test/resources/vdb-describe.txt 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/admin/src/test/resources/vdb-describe.txt 2012-05-23 21:51:53 UTC (rev 4137)
@@ -36,18 +36,11 @@
"description" : "The Virtual Database Version",
"required" : true
},
- "url" : {
- "type" : {
- "TYPE_MODEL_VALUE" : "STRING"
- },
- "description" : "The Virtual Database URL",
- "required" : false
- },
"vdb-description" : {
"type" : {
"TYPE_MODEL_VALUE" : "STRING"
},
- "description" : "<Missing message for key \"vdb-description.describe\" in: org.teiid.adminapi.i18n>",
+ "description" : "Description of the Virtual Database",
"required" : false
},
"dynamic" : {
@@ -79,6 +72,35 @@
}
}
},
+ "import-vdbs" : {
+ "type" : {
+ "TYPE_MODEL_VALUE" : "LIST"
+ },
+ "value-type" : {
+ "import-vdb-name" : {
+ "type" : {
+ "TYPE_MODEL_VALUE" : "STRING"
+ },
+ "description" : "Name of the Virtual Database to import",
+ "required" : true
+ },
+ "import-vdb-version" : {
+ "type" : {
+ "TYPE_MODEL_VALUE" : "INT"
+ },
+ "description" : "Version of the Virtual Database to import",
+ "required" : true
+ },
+ "import-policies" : {
+ "type" : {
+ "TYPE_MODEL_VALUE" : "BOOLEAN"
+ },
+ "description" : "Whether to import associated data policies",
+ "required" : false
+ }
+ },
+ "description" : "Imported vdbs"
+ },
"models" : {
"type" : {
"TYPE_MODEL_VALUE" : "LIST"
@@ -276,14 +298,14 @@
"type" : {
"TYPE_MODEL_VALUE" : "STRING"
},
- "description" : "Resource Name, for which permission defined",
+ "description" : "Name of the policy",
"required" : true
},
"policy-description" : {
"type" : {
"TYPE_MODEL_VALUE" : "STRING"
},
- "description" : "<Missing message for key \"policy-description.describe\" in: org.teiid.adminapi.i18n>",
+ "description" : "Description of the policy",
"required" : false
},
"allow-create-temp-tables" : {
@@ -306,41 +328,54 @@
},
"description" : "Permissions defined for data access",
"value-type" : {
- "allow-create" : {
- "description" : "create allowed",
+ "resource-name" : {
"type" : {
"TYPE_MODEL_VALUE" : "STRING"
- }
+ },
+ "description" : "Resource path name for this permission",
+ "required" : true
},
- "allow-read" : {
- "description" : "read allowed",
+ "allow-create" : {
"type" : {
- "TYPE_MODEL_VALUE" : "STRING"
- }
+ "TYPE_MODEL_VALUE" : "BOOLEAN"
+ },
+ "description" : "create allowed",
+ "required" : false
},
+ "allow-delete" : {
+ "type" : {
+ "TYPE_MODEL_VALUE" : "BOOLEAN"
+ },
+ "description" : "delete allowed",
+ "required" : false
+ },
"allow-update" : {
+ "type" : {
+ "TYPE_MODEL_VALUE" : "BOOLEAN"
+ },
"description" : "update allowed",
- "type" : {
- "TYPE_MODEL_VALUE" : "STRING"
- }
+ "required" : false
},
- "allow-delete" : {
- "description" : "delete allowed",
+ "allow-read" : {
"type" : {
- "TYPE_MODEL_VALUE" : "STRING"
- }
+ "TYPE_MODEL_VALUE" : "BOOLEAN"
+ },
+ "description" : "read allowed",
+ "required" : false
},
"allow-execute" : {
+ "type" : {
+ "TYPE_MODEL_VALUE" : "BOOLEAN"
+ },
"description" : "execute allowed",
- "type" : {
- "TYPE_MODEL_VALUE" : "STRING"
- }
+ "required" : false
},
"allow-alter" : {
+ "type" : {
+ "TYPE_MODEL_VALUE" : "BOOLEAN"
+ },
"description" : "alter allowed",
- "type" : {
- "TYPE_MODEL_VALUE" : "STRING"
- }
+ "required" : false
}
}
},
Modified: trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
===================================================================
--- trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -33,17 +33,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.teiid.adminapi.Admin;
-import org.teiid.adminapi.AdminException;
-import org.teiid.adminapi.AdminFactory;
-import org.teiid.adminapi.CacheStatistics;
-import org.teiid.adminapi.PropertyDefinition;
-import org.teiid.adminapi.Request;
-import org.teiid.adminapi.Session;
-import org.teiid.adminapi.Transaction;
-import org.teiid.adminapi.Translator;
-import org.teiid.adminapi.VDB;
-import org.teiid.adminapi.WorkerPoolStatistics;
+import org.teiid.adminapi.*;
import org.teiid.adminapi.VDB.ConnectionType;
import org.teiid.adminshell.Help.Doc;
@@ -266,15 +256,6 @@
getAdmin().terminateTransaction(transactionId);
}
- @Doc(text = "Merge two vdbs")
- public static void mergeVDBs(
- @Doc(text = "source vdb name") String sourceVDBName,
- @Doc(text = "source vdb version") int sourceVDBVersion,
- @Doc(text = "target vdb name") String targetVDBName,
- @Doc(text = "target vdb version") int targetVDBVersion) throws AdminException {
- getAdmin().mergeVDBs(sourceVDBName, sourceVDBVersion, targetVDBName, targetVDBVersion);
- }
-
@Doc(text = "Checks if a translator exists")
public static boolean hasTranslator(@Doc(text = "deployed name") String factoryName) throws AdminException {
Collection<? extends Translator> bindings = getAdmin().getTranslators();
Modified: trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-05-23 21:51:53 UTC (rev 4137)
@@ -26,6 +26,7 @@
</UL>
<H2><A NAME="Highlights"></A>Highlights</H2>
<UL>
+ <li><B>VDB Reuse</B> a vdb.xml can now declare imported vdbs to reuse metadata.
</UL>
<h2><a name="Compatibility">Compatibility Issues</a></h2>
@@ -33,7 +34,6 @@
<li>Support for named parameter syntax using param=value has been deprecated, since it is ambiguous with a comparison predicate boolean value expression. param<b>=></b>value should be used instead.
<li>Support for using the FROM clause post item hints MAKEDEP/MAKENOTDEP has been deprecated. Use the pre item comment hint syntax instead, e.g. /*+ MAKEDEP */ tbl
<li>decodeinteger/decodestring have been deprecated. A CASE expression should be used instead.
- <li>allowCreateTemporaryTablesByDefault and allowFunctionCallsByDefault are now set to false. When data roles are in use the user must explicitly grant these options to the user on VDB
</ul>
<h4>from 8.0</h4>
@@ -42,7 +42,8 @@
<li>MetadataFactory no longer extends Schema. Use the MetadataFactory.getSchema method to get the target Schema.
<li>DDL created VIRTUAL pushdown functions should be referenced in the ExecutionFactory.getSupportedFunctions by their full <schema>.<function> name.
<li>DDL functions/procedures defined without the VIRTUAL keyword are by default VIRTUAL. Use the FOREIGN keyword to indicate that they are source specific.
- <li>FunctionMethod.getFullName returns the proper schema, not category quailified name.
+ <li>FunctionMethod.getFullName returns the proper schema, not category qualified name.
+ <li>VDB.getUrl has been removed.
<ul>
<h4>from 7.x</h4>
@@ -63,6 +64,7 @@
<li>VARBINARY, OPTIONS, and OUT were added as reserved words.
<li>AbstractMetadataRecord and its sub-classes use a case-insensitive map for properties rather than a LinkedHashMap. Thus, property key lookups are now case-insensitive.
<li>Removed the unused ExecutionFactory methods supportsBetweenCriteria and supportsCaseExpression.
+ <li>allowCreateTemporaryTablesByDefault and allowFunctionCallsByDefault are now set to false. When data roles are in use the user must explicitly grant these options to the user on VDB
</ul>
<h4>from 7.7</h4>
Modified: trunk/client/src/main/resources/vdb-deployer.xsd
===================================================================
--- trunk/client/src/main/resources/vdb-deployer.xsd 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/client/src/main/resources/vdb-deployer.xsd 2012-05-23 21:51:53 UTC (rev 4137)
@@ -8,6 +8,16 @@
<xs:sequence>
<xs:element name="description" type="xs:string" minOccurs="0"/>
<xs:element name="property" type="property" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="import-vdb" maxOccurs="unbounded" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>An imported VDB is reused in the context of this VDB.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:attribute name="import-data-policies" type="xs:boolean" default="true" />
+ <xs:attribute name="name" type="xs:string" use="required" />
+ <xs:attribute name="version" type="xs:integer" use="required" />
+ </xs:complexType>
+ </xs:element>
<xs:element name="model" maxOccurs="unbounded" minOccurs="0">
<xs:annotation>
<xs:documentation>A model defines the alias for the Schema the data being integrated. In the Designer
@@ -145,6 +155,11 @@
<xs:selector xpath="model"/>
<xs:field xpath="@name"/>
</xs:unique>
+ <xs:unique name="importUnique">
+ <xs:selector xpath="import-vdb"/>
+ <xs:field xpath="@name"/>
+ <xs:field xpath="@version"/>
+ </xs:unique>
</xs:element>
<xs:complexType name="property">
<xs:annotation>
Property changes on: trunk/documentation/javadocs
___________________________________________________________________
Modified: svn:ignore
- .project
.settings
+ .project
.settings
bin
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -404,6 +404,13 @@
if (target == null) {
throw new TeiidProcessingException(QueryPlugin.Event.TEIID30549, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30549, uuid));
}
+ AbstractMetadataRecord schema = target;
+ while (!(schema instanceof Schema) && schema.getParent() != null) {
+ schema = schema.getParent();
+ }
+ if (schema instanceof Schema && vdb.getImportedModels().contains(((Schema)schema).getName())) {
+ throw new TeiidProcessingException(QueryPlugin.Event.TEIID31098, QueryPlugin.Util.getString("ValidationVisitor.invalid_alter", uuid)); //$NON-NLS-1$
+ }
if (getMetadataRepository(target, vdb) != null) {
getMetadataRepository(target, vdb).setProperty(vdbName, vdbVersion, target, key, strVal);
}
Modified: trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -557,6 +557,7 @@
TEIID31094,
TEIID31095,
TEIID31096,
- TEIID31097
+ TEIID31097,
+ TEIID31098, //alter imported
}
}
Modified: trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadata.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadata.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadata.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -26,6 +26,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Properties;
+import java.util.Set;
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.core.TeiidComponentException;
@@ -513,5 +514,10 @@
public QueryMetadataInterface getSessionMetadata() {
return null;
}
+
+ @Override
+ public Set<String> getImportedModels() {
+ return Collections.emptySet();
+ }
}
Modified: trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadataWrapper.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadataWrapper.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadataWrapper.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -25,6 +25,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Properties;
+import java.util.Set;
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.core.TeiidComponentException;
@@ -372,5 +373,10 @@
public QueryMetadataInterface getSessionMetadata() {
return actualMetadata.getSessionMetadata();
}
+
+ @Override
+ public Set<String> getImportedModels() {
+ return actualMetadata.getImportedModels();
+ }
}
Modified: trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -331,7 +331,7 @@
}
String referenceTableName = fk.getReferenceTableName();
- if (referenceTableName == null && fk.getPrimaryKey() == null){
+ if (referenceTableName == null){
log(report, model, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31091, t.getName()));
continue;
}
Modified: trunk/engine/src/main/java/org/teiid/query/metadata/QueryMetadataInterface.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/metadata/QueryMetadataInterface.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/engine/src/main/java/org/teiid/query/metadata/QueryMetadataInterface.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -25,6 +25,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Properties;
+import java.util.Set;
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.core.TeiidComponentException;
@@ -643,4 +644,6 @@
boolean hasProcedure(String name) throws TeiidComponentException;
QueryMetadataInterface getSessionMetadata();
+
+ Set<String> getImportedModels();
}
Modified: trunk/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -34,6 +34,7 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import org.jboss.vfs.VirtualFile;
import org.teiid.adminapi.impl.VDBMetaData;
@@ -1086,4 +1087,12 @@
tm.procedureCache = this.procedureCache;
return tm;
}
+
+ @Override
+ public Set<String> getImportedModels() {
+ if (this.vdbMetaData == null) {
+ return Collections.emptySet();
+ }
+ return this.vdbMetaData.getImportedModels();
+ }
}
\ No newline at end of file
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/SourceCapabilities.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/SourceCapabilities.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/SourceCapabilities.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -286,11 +286,6 @@
* @since 5.0
*/
QUERY_FUNCTIONS_IN_GROUP_BY,
- /**
- * Support indicates connector can accept queries with searched CASE WHEN <criteria> ... END
- *
- * @since 4.2
- */
BATCHED_UPDATES,
BULK_UPDATE,
/**
Modified: trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -1330,6 +1330,7 @@
try {
QueryResolver.validateProjectedSymbols(obj.getTarget(), getMetadata(), obj.getDefinition());
Validator.validate(obj.getDefinition(), getMetadata(), this);
+ validateAlterTarget(obj);
} catch (QueryValidatorException e) {
handleValidationError(e.getMessage(), obj.getDefinition());
} catch (TeiidComponentException e) {
@@ -1337,9 +1338,16 @@
}
}
+ private void validateAlterTarget(Alter<?> obj) {
+ if (getMetadata().getImportedModels().contains(obj.getTarget().getSchema())) {
+ handleValidationError(QueryPlugin.Util.getString("ValidationVisitor.invalid_alter", obj.getTarget()), obj.getTarget()); //$NON-NLS-1$
+ }
+ }
+
@Override
public void visit(AlterProcedure obj) {
GroupSymbol gs = obj.getTarget();
+ validateAlterTarget(obj);
try {
if (!gs.isProcedure() || !getMetadata().isVirtualModel(getMetadata().getModelID(gs.getMetadataID()))) {
handleValidationError(QueryPlugin.Util.getString("ValidationVisitor.not_a_procedure", gs), gs); //$NON-NLS-1$
@@ -1402,6 +1410,7 @@
@Override
public void visit(AlterTrigger obj) {
+ validateAlterTarget(obj);
validateGroupSupportsUpdate(obj.getTarget());
try {
if (obj.getDefinition() != null) {
Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties
===================================================================
--- trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-05-23 21:51:53 UTC (rev 4137)
@@ -187,6 +187,7 @@
ValidationVisitor.union_insert = Select into is not allowed under a set operation: {0}.
ValidationVisitor.multisource_insert = A multi-source table, {0}, cannot be used in an INSERT with query expression or SELECT INTO statement.
ValidationVisitor.invalid_encoding = Invalid encoding: {0}.
+ValidationVisitor.invalid_alter=Cannot alter an object {0} from an imported model.
TEIID30376=The specified change set {0} against an inherently updatable view does not map to a key preserving group.
TEIID30239=Inserts with query expressions cannot be performed against a partitioned UNION view {0}.
TEIID30241=Could not determine INSERT target for a partitioned UNION view {0} with values {1}.
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidExtension.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidExtension.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidExtension.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -122,7 +122,6 @@
// teiid level admin api operation handlers
new GetTranslator().register(teiidSubsystem);
new ListTranslators().register(teiidSubsystem);
- new MergeVDBs().register(teiidSubsystem);
new ListVDBs().register(teiidSubsystem);
new GetVDB().register(teiidSubsystem);
new CacheTypes().register(teiidSubsystem);
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -629,65 +629,6 @@
}
}
-class MergeVDBs extends BaseOperationHandler<VDBRepository>{
-
- protected MergeVDBs() {
- super("merge-vdbs"); //$NON-NLS-1$
- }
-
- @Override
- protected VDBRepository getService(OperationContext context, PathAddress pathAddress, ModelNode operation) throws OperationFailedException {
- ServiceController<?> sc = context.getServiceRegistry(false).getRequiredService(TeiidServiceNames.VDB_REPO);
- return VDBRepository.class.cast(sc.getValue());
- }
-
- @Override
- protected void executeOperation(OperationContext context, VDBRepository repo, ModelNode operation) throws OperationFailedException {
- if (!operation.hasDefined(OperationsConstants.SOURCE_VDBNAME)) {
- throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString(OperationsConstants.SOURCE_VDBNAME+MISSING)));
- }
- if (!operation.hasDefined(OperationsConstants.SOURCE_VDBVERSION)) {
- throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString(OperationsConstants.SOURCE_VDBVERSION+MISSING)));
- }
-
- if (!operation.hasDefined(OperationsConstants.TARGET_VDBNAME)) {
- throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString(OperationsConstants.TARGET_VDBNAME+MISSING)));
- }
- if (!operation.hasDefined(OperationsConstants.TARGET_VDBVERSION)) {
- throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString(OperationsConstants.TARGET_VDBVERSION+MISSING)));
- }
-
- String sourceVDBName = operation.get(OperationsConstants.SOURCE_VDBNAME).asString();
- int sourceVDBversion = operation.get(OperationsConstants.SOURCE_VDBVERSION).asInt();
- String targetVDBName = operation.get(OperationsConstants.TARGET_VDBNAME).asString();
- int targetVDBversion = operation.get(OperationsConstants.TARGET_VDBVERSION).asInt();
- try {
- repo.mergeVDBs(sourceVDBName, sourceVDBversion, targetVDBName, targetVDBversion);
- } catch (AdminException e) {
- throw new OperationFailedException(new ModelNode().set(e.getMessage()));
- }
- }
-
- protected void describeParameters(ModelNode operationNode, ResourceBundle bundle) {
- operationNode.get(REQUEST_PROPERTIES, OperationsConstants.SOURCE_VDBNAME, TYPE).set(ModelType.STRING);
- operationNode.get(REQUEST_PROPERTIES, OperationsConstants.SOURCE_VDBNAME, REQUIRED).set(true);
- operationNode.get(REQUEST_PROPERTIES, OperationsConstants.SOURCE_VDBNAME, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.SOURCE_VDBNAME));
-
- operationNode.get(REQUEST_PROPERTIES, OperationsConstants.SOURCE_VDBVERSION, TYPE).set(ModelType.STRING);
- operationNode.get(REQUEST_PROPERTIES, OperationsConstants.SOURCE_VDBVERSION, REQUIRED).set(true);
- operationNode.get(REQUEST_PROPERTIES, OperationsConstants.SOURCE_VDBVERSION, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.SOURCE_VDBVERSION));
-
- operationNode.get(REQUEST_PROPERTIES, OperationsConstants.TARGET_VDBNAME, TYPE).set(ModelType.STRING);
- operationNode.get(REQUEST_PROPERTIES, OperationsConstants.TARGET_VDBNAME, REQUIRED).set(true);
- operationNode.get(REQUEST_PROPERTIES, OperationsConstants.TARGET_VDBNAME, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.TARGET_VDBNAME));
-
- operationNode.get(REQUEST_PROPERTIES, OperationsConstants.TARGET_VDBVERSION, TYPE).set(ModelType.STRING);
- operationNode.get(REQUEST_PROPERTIES, OperationsConstants.TARGET_VDBVERSION, REQUIRED).set(true);
- operationNode.get(REQUEST_PROPERTIES, OperationsConstants.TARGET_VDBVERSION, DESCRIPTION).set(getParameterDescription(bundle, OperationsConstants.TARGET_VDBVERSION));
- operationNode.get(REPLY_PROPERTIES).setEmptyObject();
- }
-}
-
class ExecuteQuery extends TeiidOperationHandler{
protected ExecuteQuery() {
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -37,6 +37,7 @@
public static ServiceName SYSTEM_VDB = ServiceName.JBOSS.append("teiid", "system.vdb");//$NON-NLS-1$ //$NON-NLS-2$
public static ServiceName AUTHORIZATION_VALIDATOR = ServiceName.JBOSS.append("teiid", "authorization-validator");//$NON-NLS-1$ //$NON-NLS-2$
private static ServiceName VDB_SVC_BASE = ServiceName.JBOSS.append("teiid", "vdb"); //$NON-NLS-1$ //$NON-NLS-2$
+ private static ServiceName VDB_FINISHED_SVC_BASE = ServiceName.JBOSS.append("teiid", "vdb-finished"); //$NON-NLS-1$ //$NON-NLS-2$
public static ServiceName OBJECT_SERIALIZER = ServiceName.JBOSS.append("teiid", "object-serializer"); //$NON-NLS-1$ //$NON-NLS-2$
public static ServiceName CACHE_RESULTSET = ServiceName.JBOSS.append("teiid", "cache", "resultset"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
public static ServiceName CACHE_PREPAREDPLAN = ServiceName.JBOSS.append("teiid", "cache", "prepared-plan"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -53,6 +54,10 @@
return VDB_SVC_BASE.append(vdbName, String.valueOf(version));
}
+ public static ServiceName vdbFinishedServiceName(String vdbName, int version) {
+ return VDB_FINISHED_SVC_BASE.append(vdbName, String.valueOf(version));
+ }
+
public static ServiceName executorServiceName(String poolName) {
return ServiceName.JBOSS.append("thread", "executor", poolName); //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -50,10 +50,11 @@
import org.jboss.msc.service.ServiceController.State;
import org.teiid.adminapi.Model;
import org.teiid.adminapi.Translator;
+import org.teiid.adminapi.VDBImport;
import org.teiid.adminapi.impl.ModelMetaData;
-import org.teiid.adminapi.impl.ModelMetaData.ValidationError;
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.adminapi.impl.VDBTranslatorMetaData;
+import org.teiid.adminapi.impl.ModelMetaData.ValidationError;
import org.teiid.common.buffer.BufferManager;
import org.teiid.deployers.UDFMetaData;
import org.teiid.deployers.VDBRepository;
@@ -170,6 +171,10 @@
}
});
+ for (VDBImport vdbImport : deployment.getVDBImports()) {
+ vdbService.addDependency(TeiidServiceNames.vdbFinishedServiceName(vdbImport.getName(), vdbImport.getVersion()));
+ }
+
// adding the translator services is redundant, however if one is removed then it is an issue.
for (Model model:deployment.getModels()) {
List<String> sourceNames = model.getSourceNames();
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBParserDeployer.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBParserDeployer.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBParserDeployer.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -142,8 +142,6 @@
}
try {
- vdb.setUrl(file.toURL());
-
// build the metadata store
if (imf != null) {
imf.addEntriesPlusVisibilities(file, vdb);
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -37,6 +37,9 @@
import javax.xml.stream.XMLStreamException;
import org.jboss.msc.service.Service;
+import org.jboss.msc.service.ServiceBuilder;
+import org.jboss.msc.service.ServiceContainer;
+import org.jboss.msc.service.ServiceController;
import org.jboss.msc.service.StartContext;
import org.jboss.msc.service.StartException;
import org.jboss.msc.service.StopContext;
@@ -125,7 +128,7 @@
}
createConnectorManagers(cmr, repo, this.vdb);
-
+ final ServiceBuilder<Void> vdbService = addVDBFinishedService(context);
this.vdbListener = new VDBLifeCycleListener() {
@Override
public void added(String name, int version, CompositeVDB vdb) {
@@ -151,6 +154,7 @@
}
}
vdbInstance.addAttchment(GlobalTableStore.class, gts);
+ vdbService.install();
}
};
@@ -192,6 +196,32 @@
}
}
+ private ServiceBuilder<Void> addVDBFinishedService(StartContext context) {
+ ServiceContainer serviceContainer = context.getController().getServiceContainer();
+ final ServiceController<?> controller = serviceContainer.getService(TeiidServiceNames.vdbFinishedServiceName(vdb.getName(), vdb.getVersion()));
+ if (controller != null) {
+ controller.setMode(ServiceController.Mode.REMOVE);
+ }
+ return serviceContainer.addService(TeiidServiceNames.vdbFinishedServiceName(vdb.getName(), vdb.getVersion()), new Service<Void>() {
+ @Override
+ public Void getValue() throws IllegalStateException,
+ IllegalArgumentException {
+ return null;
+ }
+
+ @Override
+ public void start(StartContext context)
+ throws StartException {
+
+ }
+
+ @Override
+ public void stop(StopContext context) {
+
+ }
+ });
+ }
+
@Override
public void stop(StopContext context) {
// stop object replication
@@ -202,7 +232,10 @@
getVDBRepository().removeListener(this.vdbListener);
getVDBRepository().removeVDB(this.vdb.getName(), this.vdb.getVersion());
this.vdb.setRemoved(true);
-
+ final ServiceController<?> controller = context.getController().getServiceContainer().getService(TeiidServiceNames.vdbFinishedServiceName(vdb.getName(), vdb.getVersion()));
+ if (controller != null) {
+ controller.setMode(ServiceController.Mode.REMOVE);
+ }
LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50026, this.vdb));
}
Modified: trunk/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java
===================================================================
--- trunk/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -202,13 +202,13 @@
Assert.assertEquals(SUCCESS, result.get(OUTCOME).asString());
List<String> opNames = getList(result);
- assertEquals(39, opNames.size());
+ assertEquals(38, opNames.size());
String[] ops = { "add","add-anyauthenticated-role","add-data-role","assign-datasource",
"cache-statistics","cache-types","cancel-request","change-vdb-connection-type",
"clear-cache","describe","execute-query","get-plan","get-translator","get-vdb",
"list-long-running-requests","list-requests","list-requests-per-session",
"list-requests-per-vdb","list-sessions","list-transactions","list-translators",
- "list-vdbs","mark-datasource-available","merge-vdbs","read-attribute",
+ "list-vdbs","mark-datasource-available","read-attribute",
"read-children-names","read-children-resources","read-children-types",
"read-operation-description","read-operation-names","read-rar-description",
"read-resource","read-resource-description","remove-anyauthenticated-role",
Modified: trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -27,9 +27,11 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.TreeSet;
import org.teiid.adminapi.DataPolicy;
import org.teiid.adminapi.Model;
+import org.teiid.adminapi.VDBImport;
import org.teiid.adminapi.impl.DataPolicyMetadata;
import org.teiid.adminapi.impl.ModelMetaData;
import org.teiid.adminapi.impl.VDBMetaData;
@@ -43,10 +45,12 @@
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.metadata.TransformationMetadata;
import org.teiid.query.metadata.TransformationMetadata.Resource;
+import org.teiid.runtime.RuntimePlugin;
import org.teiid.vdb.runtime.VDBKey;
-
-
+/**
+ * Represents the runtime state of a vdb that may aggregate several vdbs.
+ */
public class CompositeVDB {
private VDBMetaData vdb;
private MetadataStore store;
@@ -57,11 +61,8 @@
private ConnectorManagerRepository cmr;
private FunctionTree systemFunctions;
private boolean metadataloadFinished = false;
- private boolean modified;
+ private VDBMetaData mergedVDB;
- // used as cached item to avoid rebuilding
- private volatile VDBMetaData mergedVDB;
-
public CompositeVDB(VDBMetaData vdb, MetadataStore metadataStore, LinkedHashMap<String, Resource> visibilityMap, UDFMetaData udf, FunctionTree systemFunctions, ConnectorManagerRepository cmr, MetadataStore... additionalStores) {
this.vdb = vdb;
this.store = metadataStore;
@@ -70,53 +71,9 @@
this.systemFunctions = systemFunctions;
this.cmr = cmr;
this.additionalStores = additionalStores;
- this.mergedVDB = buildVDB();
+ this.mergedVDB = vdb;
}
- synchronized void addChild(CompositeVDB child) {
- if (this.children == null) {
- this.children = new LinkedHashMap<VDBKey, CompositeVDB>();
- }
- VDBMetaData childVDB = child.getVDB();
- this.children.put(new VDBKey(childVDB.getName(), childVDB.getVersion()), child);
- modified = true;
- update();
- }
-
- synchronized void removeChild(VDBKey child) {
- if (this.children != null) {
- this.children.remove(child);
- }
- modified = true;
- update();
- }
-
- private synchronized void update() {
- if (!this.metadataloadFinished) {
- return;
- }
- VDBMetaData newVDB = mergedVDB;
- if (modified) {
- newVDB = buildVDB();
- }
-
- MetadataStore mergedStore = getMetadataStore();
-
- for (ModelMetaData model:newVDB.getModelMetaDatas().values()) {
- MetadataRepository repo = model.getAttachment(MetadataRepository.class);
- if (repo instanceof DefaultMetadataRepository) {
- updateFromMetadataRepository(newVDB, mergedStore.getSchema(model.getName()), (DefaultMetadataRepository)repo);
- }
- }
-
- TransformationMetadata metadata = buildTransformationMetaData(newVDB, getVisibilityMap(), mergedStore, getUDF(), systemFunctions, this.additionalStores);
- newVDB.addAttchment(QueryMetadataInterface.class, metadata);
- newVDB.addAttchment(TransformationMetadata.class, metadata);
- newVDB.addAttchment(MetadataStore.class, mergedStore);
- this.mergedVDB = newVDB;
- this.modified = false;
- }
-
private static TransformationMetadata buildTransformationMetaData(VDBMetaData vdb, LinkedHashMap<String, Resource> visibilityMap, MetadataStore store, UDFMetaData udf, FunctionTree systemFunctions, MetadataStore[] additionalStores) {
Collection <FunctionTree> udfs = new ArrayList<FunctionTree>();
if (udf != null) {
@@ -144,18 +101,10 @@
return this.mergedVDB;
}
- synchronized boolean hasChildVdb(VDBKey child) {
- if (this.children != null) {
- return this.children.containsKey(child);
- }
- return false;
- }
-
- VDBMetaData buildVDB() {
-
- if (this.children == null || this.children.isEmpty()) {
+ void buildCompositeState(VDBRepository vdbRepository) throws VirtualDatabaseException {
+ if (vdb.getVDBImports().isEmpty()) {
this.vdb.addAttchment(ConnectorManagerRepository.class, this.cmr);
- return this.vdb;
+ return;
}
VDBMetaData newMergedVDB = new VDBMetaData();
@@ -169,22 +118,35 @@
newMergedVDB.setConnectionType(this.vdb.getConnectionType());
ConnectorManagerRepository mergedRepo = new ConnectorManagerRepository();
mergedRepo.getConnectorManagers().putAll(this.cmr.getConnectorManagers());
-
- for (CompositeVDB child:this.children.values()) {
+ newMergedVDB.addAttchment(ConnectorManagerRepository.class, mergedRepo);
+ this.children = new LinkedHashMap<VDBKey, CompositeVDB>();
+ newMergedVDB.setImportedModels(new TreeSet<String>(String.CASE_INSENSITIVE_ORDER));
+ for (VDBImport vdbImport : vdb.getVDBImports()) {
+ CompositeVDB importedVDB = vdbRepository.getCompositeVDB(vdbImport.getName(), vdbImport.getVersion());
+ if (importedVDB == null) {
+ throw new VirtualDatabaseException(RuntimePlugin.Event.TEIID40083, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40083, vdb.getName(), vdb.getVersion(), vdbImport.getName(), vdbImport.getVersion()));
+ }
+ VDBMetaData childVDB = importedVDB.getVDB();
+ this.children.put(new VDBKey(childVDB.getName(), childVDB.getVersion()), importedVDB);
- // add models
- for (Model m:child.getVDB().getModels()) {
- newMergedVDB.addModel((ModelMetaData)m);
+ if (vdbImport.isImportDataPolicies()) {
+ for (DataPolicy role : importedVDB.getVDB().getDataPolicies()) {
+ if (vdb.addDataPolicy((DataPolicyMetadata)role) != null) {
+ throw new VirtualDatabaseException(RuntimePlugin.Event.TEIID40084, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40084, vdb.getName(), vdb.getVersion(), vdbImport.getName(), vdbImport.getVersion(), role.getName()));
+ }
+ }
}
- for (DataPolicy p:child.getVDB().getDataPolicies()) {
- newMergedVDB.addDataPolicy((DataPolicyMetadata)p);
+ // add models
+ for (Model m:importedVDB.getVDB().getModels()) {
+ if (newMergedVDB.addModel((ModelMetaData)m) != null) {
+ throw new VirtualDatabaseException(RuntimePlugin.Event.TEIID40085, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40085, vdb.getName(), vdb.getVersion(), vdbImport.getName(), vdbImport.getVersion(), m.getName()));
+ }
+ newMergedVDB.getImportedModels().add(m.getName());
}
- mergedRepo.getConnectorManagers().putAll(child.cmr.getConnectorManagers());
+ mergedRepo.getConnectorManagers().putAll(importedVDB.cmr.getConnectorManagers());
}
-
- newMergedVDB.addAttchment(ConnectorManagerRepository.class, mergedRepo);
- return newMergedVDB;
+ this.mergedVDB = newMergedVDB;
}
private UDFMetaData getUDF() {
@@ -218,7 +180,7 @@
return mergedUDF;
}
- private synchronized LinkedHashMap<String, Resource> getVisibilityMap() {
+ private LinkedHashMap<String, Resource> getVisibilityMap() {
if (this.children == null || this.children.isEmpty()) {
return this.visibilityMap;
}
@@ -236,7 +198,7 @@
return mergedvisibilityMap;
}
- private synchronized MetadataStore getMetadataStore() {
+ private MetadataStore getMetadataStore() {
if (this.children == null || this.children.isEmpty()) {
return this.store;
}
@@ -334,10 +296,24 @@
}
public synchronized void metadataLoadFinished() {
- if (!this.metadataloadFinished) {
- this.metadataloadFinished = true;
- update();
+ if (this.metadataloadFinished) {
+ return;
}
+ this.metadataloadFinished = true;
+
+ MetadataStore mergedStore = getMetadataStore();
+
+ for (ModelMetaData model:vdb.getModelMetaDatas().values()) {
+ MetadataRepository repo = model.getAttachment(MetadataRepository.class);
+ if (repo instanceof DefaultMetadataRepository) {
+ updateFromMetadataRepository(mergedVDB, mergedStore.getSchema(model.getName()), (DefaultMetadataRepository)repo);
+ }
+ }
+
+ TransformationMetadata metadata = buildTransformationMetaData(mergedVDB, getVisibilityMap(), mergedStore, getUDF(), systemFunctions, this.additionalStores);
+ mergedVDB.addAttchment(QueryMetadataInterface.class, metadata);
+ mergedVDB.addAttchment(TransformationMetadata.class, metadata);
+ mergedVDB.addAttchment(MetadataStore.class, mergedStore);
}
}
Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -32,8 +32,6 @@
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.teiid.adminapi.AdminException;
-import org.teiid.adminapi.AdminProcessingException;
import org.teiid.adminapi.VDB;
import org.teiid.adminapi.impl.ModelMetaData;
import org.teiid.adminapi.impl.SourceMappingMetadata;
@@ -91,12 +89,17 @@
stores = new MetadataStore[] {this.systemStore, odbcStore};
}
CompositeVDB cvdb = new CompositeVDB(vdb, metadataStore, visibilityMap, udf, this.systemFunctionManager.getSystemFunctions(), cmr, stores);
- this.vdbRepo.put(vdbId(vdb), cvdb);
+ cvdb.buildCompositeState(this);
+ this.vdbRepo.put(vdbId(vdb), cvdb);
notifyAdd(vdb.getName(), vdb.getVersion(), cvdb);
}
+ CompositeVDB getCompositeVDB(String name, int version) {
+ return this.vdbRepo.get(new VDBKey(name, version));
+ }
+
public VDBMetaData getVDB(String name, int version) {
- CompositeVDB v = this.vdbRepo.get(new VDBKey(name, version));
+ CompositeVDB v = getCompositeVDB(name, version);
if (v != null) {
return v.getVDB();
}
@@ -211,48 +214,17 @@
public boolean removeVDB(String vdbName, int vdbVersion) {
VDBKey key = new VDBKey(vdbName, vdbVersion);
CompositeVDB removed = this.vdbRepo.remove(key);
- if (removed != null) {
- // if this VDB was part of another VDB; then remove them.
- for (CompositeVDB other:this.vdbRepo.values()) {
- synchronized (other) {
- if (other.hasChildVdb(key)) {
- notifyRemove(other.getVDB().getName(), other.getVDB().getVersion(), other);
-
- other.removeChild(key);
-
- notifyAdd(other.getVDB().getName(), other.getVDB().getVersion(), other);
- }
- }
- }
- notifyRemove(key.getName(), key.getVersion(), removed);
- return true;
+ if (removed == null) {
+ return false;
}
- return false;
+ notifyRemove(key.getName(), key.getVersion(), removed);
+ return true;
}
public Map<String, Datatype> getBuiltinDatatypes() {
return datatypeMap;
}
- public void mergeVDBs(String sourceVDBName, int sourceVDBVersion, String targetVDBName, int targetVDBVersion) throws AdminException{
- CompositeVDB source = this.vdbRepo.get(new VDBKey(sourceVDBName, sourceVDBVersion));
- if (source == null) {
- throw new AdminProcessingException(RuntimePlugin.Event.TEIID40037, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40037, sourceVDBName, sourceVDBVersion));
- }
-
- CompositeVDB target = this.vdbRepo.get(new VDBKey(targetVDBName, targetVDBVersion));
- if (target == null) {
- throw new AdminProcessingException(RuntimePlugin.Event.TEIID40038, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40038, sourceVDBName, sourceVDBVersion));
- }
-
- notifyRemove(targetVDBName, targetVDBVersion, target);
- // merge them
- target.addChild(source);
-
- notifyAdd(targetVDBName, targetVDBVersion, target);
- finishDeployment(targetVDBName, targetVDBVersion);
- }
-
// this is called by mc
public void start() {
if (this.odbcEnabled) {
@@ -262,10 +234,13 @@
public void finishDeployment(String name, int version) {
CompositeVDB v = this.vdbRepo.get(new VDBKey(name, version));
- if (v!= null) {
- boolean valid = false;
- v.metadataLoadFinished();
- VDBMetaData metdataAwareVDB = v.getVDB();
+ if (v == null) {
+ return;
+ }
+ boolean valid = false;
+ v.metadataLoadFinished();
+ VDBMetaData metdataAwareVDB = v.getVDB();
+ synchronized (metdataAwareVDB) {
ValidatorReport report = MetadataValidator.validate(metdataAwareVDB, metdataAwareVDB.removeAttachment(MetadataStore.class));
if (!report.hasItems()) {
@@ -286,7 +261,6 @@
else {
metdataAwareVDB.setStatus(VDB.Status.INACTIVE);
}
-
LogManager.logInfo(LogConstants.CTX_RUNTIME, (VDB.Status.ACTIVE == metdataAwareVDB.getStatus())?RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40003,name, version):RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40006,name, version));
notifyFinished(name, version, v);
}
Modified: trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -112,5 +112,8 @@
TEIID40080,
TEIID40081,
TEIID40082,
+ TEIID40083, //vdb import does not exist
+ TEIID40084, //imported role conflict
+ TEIID40085, //imported model conflict
}
}
Modified: trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties
===================================================================
--- trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2012-05-23 21:51:53 UTC (rev 4137)
@@ -96,4 +96,8 @@
TEIID40041=Invalid Session. Session may have been terminated. Re-connect and try again.
TEIID40042=Invalid Session. Session may have been terminated. Re-connect and try again.
TEIID40072=Model {0} is defined as VIRTUAL model, however it is defined with source mappings! check your vdb.xml file.
-TEIID40073=The metadata for the VDB {0}.{1} is loaded, however it is not valid. Check models for errors. Correct the metadata and re-deploy.
\ No newline at end of file
+TEIID40073=The metadata for the VDB {0}.{1} is loaded, however it is not valid. Check models for errors. Correct the metadata and re-deploy.
+
+TEIID40083={0}.{1} imports a non-existent VDB {2}.{3}
+TEIID40084={0}.{1} imports a conflicting role {4} from {2}.{3}
+TEIID40085={0}.{1} imports a conflicting model {4} from {2}.{3}
\ No newline at end of file
Modified: trunk/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java
===================================================================
--- trunk/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -28,6 +28,7 @@
import org.junit.Test;
import org.mockito.Mockito;
+import org.teiid.adminapi.impl.VDBImportMetadata;
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.core.types.DataTypeManager;
import org.teiid.dqp.internal.datamgr.ConnectorManager;
@@ -42,7 +43,6 @@
import org.teiid.query.sql.lang.Command;
import org.teiid.query.unittest.RealMetadataFactory;
import org.teiid.translator.ExecutionFactory;
-import org.teiid.vdb.runtime.VDBKey;
@SuppressWarnings("nls")
public class TestCompositeVDB {
@@ -53,23 +53,30 @@
return vdb.getAttachment(TransformationMetadata.class);
}
- private static CompositeVDB createCompositeVDB(MetadataStore metadataStore, String vdbName) {
- VDBMetaData vdbMetaData = new VDBMetaData();
- vdbMetaData.setName(vdbName); //$NON-NLS-1$
- vdbMetaData.setVersion(1);
- for (Schema schema : metadataStore.getSchemas().values()) {
- vdbMetaData.addModel(RealMetadataFactory.createModel(schema.getName(), schema.isPhysical()));
- }
+ private static CompositeVDB createCompositeVDB(MetadataStore metadataStore, String vdbName) throws VirtualDatabaseException {
+ VDBMetaData vdbMetaData = createVDBMetadata(metadataStore, vdbName);
ConnectorManagerRepository cmr = new ConnectorManagerRepository();
cmr.addConnectorManager("source", getConnectorManager("FakeTranslator", "FakeConnection", getFuncsOne()));
cmr.addConnectorManager("source2", getConnectorManager("FakeTranslator2", "FakeConnection2", getFuncsTwo()));
CompositeVDB cvdb = new CompositeVDB(vdbMetaData, metadataStore, null, null, RealMetadataFactory.SFM.getSystemFunctions(),cmr);
+ cvdb.buildCompositeState(null);
cvdb.metadataLoadFinished();
return cvdb;
}
-
+
+ private static VDBMetaData createVDBMetadata(MetadataStore metadataStore,
+ String vdbName) {
+ VDBMetaData vdbMetaData = new VDBMetaData();
+ vdbMetaData.setName(vdbName); //$NON-NLS-1$
+ vdbMetaData.setVersion(1);
+ for (Schema schema : metadataStore.getSchemas().values()) {
+ vdbMetaData.addModel(RealMetadataFactory.createModel(schema.getName(), schema.isPhysical()));
+ }
+ return vdbMetaData;
+ }
+
private static ConnectorManager getConnectorManager(String translatorName, String connectionName, List<FunctionMethod> funcs) {
final ExecutionFactory<Object, Object> ef = Mockito.mock(ExecutionFactory.class);
@@ -107,13 +114,41 @@
return funcs;
}
-
private void helpResolve(String sql) throws Exception {
TransformationMetadata metadata = createTransformationMetadata(RealMetadataFactory.exampleBQTCached().getMetadataStore(), "bqt");
Command command = QueryParser.getQueryParser().parseCommand(sql);
QueryResolver.resolveCommand(command, metadata);
}
+ @Test(expected=VirtualDatabaseException.class) public void testImportErrors() throws Exception {
+ VDBRepository repo = new VDBRepository();
+ repo.setSystemStore(RealMetadataFactory.example1Cached().getMetadataStore());
+ repo.setSystemFunctionManager(RealMetadataFactory.SFM);
+ MetadataStore metadataStore = RealMetadataFactory.exampleBQTCached().getMetadataStore();
+ VDBMetaData vdb = createVDBMetadata(metadataStore, "bqt");
+ repo.addVDB(vdb, metadataStore, null, null, new ConnectorManagerRepository());
+
+ vdb = createVDBMetadata(metadataStore, "bqt1");
+ VDBImportMetadata vdbImport = new VDBImportMetadata();
+ vdbImport.setName("foo");
+ vdb.getVDBImports().add(vdbImport);
+
+ try {
+ //foo does not exist
+ repo.addVDB(vdb, metadataStore, null, null, new ConnectorManagerRepository());
+ fail();
+ } catch (VirtualDatabaseException e) {
+
+ }
+
+ vdb = createVDBMetadata(metadataStore, "bqt1");
+ vdbImport.setName("bqt");
+ vdb.getVDBImports().add(vdbImport);
+
+ //model conflict
+ repo.addVDB(vdb, metadataStore, null, null, new ConnectorManagerRepository());
+ }
+
@Test
public void testSourceMetadataStoreFunction() throws Exception {
helpResolve("SELECT bqt1.reverse(BQT1.SmallA.INTKEY) FROM BQT1.SmallA");
@@ -144,15 +179,4 @@
helpResolve("SELECT duplicate_func(BQT1.SmallA.INTKEY) FROM BQT1.SmallA");
}
- @Test public void testRemoveChild() throws Exception {
- CompositeVDB vdb = createCompositeVDB(RealMetadataFactory.exampleBQTStore(), "bqt");
- VDBKey child = new VDBKey("foo", 1);
- vdb.removeChild(child);
- assertNotNull(vdb.getVDB());
- assertFalse(vdb.hasChildVdb(child));
- vdb.addChild(createCompositeVDB(RealMetadataFactory.exampleBusObjStore(), "foo"));
- assertTrue(vdb.hasChildVdb(child));
- assertNotNull(vdb.getVDB());
- }
-
}
Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -41,9 +41,9 @@
import org.mockito.Mockito;
import org.teiid.Replicated;
import org.teiid.Replicated.ReplicationMode;
-import org.teiid.adminapi.AdminException;
import org.teiid.adminapi.VDB;
import org.teiid.adminapi.impl.ModelMetaData;
+import org.teiid.adminapi.impl.VDBImportMetadata;
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.cache.Cache;
import org.teiid.cache.CacheConfiguration;
@@ -98,6 +98,18 @@
@SuppressWarnings({"nls"})
public class FakeServer extends ClientServiceRegistryImpl implements ConnectionProfile {
+ public static class DeployVDBParameter {
+ public Map<String, Collection<FunctionMethod>> udfs;
+ public MetadataRepository metadataRepo;
+ public List<VDBImportMetadata> vdbImports;
+
+ public DeployVDBParameter(Map<String, Collection<FunctionMethod>> udfs,
+ MetadataRepository metadataRepo) {
+ this.udfs = udfs;
+ this.metadataRepo = metadataRepo;
+ }
+ }
+
public interface ReplicatedCache<K, V> extends Cache<K, V> {
@Replicated(replicateState=ReplicationMode.PULL)
@@ -366,52 +378,45 @@
}
public void deployVDB(String vdbName, String vdbPath) throws Exception {
- IndexMetadataStore imf = VDBMetadataFactory.loadMetadata(vdbName, new File(vdbPath).toURI().toURL());
- deployVDB(vdbName, imf, null, null);
+ deployVDB(vdbName, vdbPath, new DeployVDBParameter(null, null));
}
- public void deployVDB(String vdbName, String vdbPath, MetadataRepository metadataRepo) throws Exception {
+ public void deployVDB(String vdbName, String vdbPath, DeployVDBParameter parameterObject) throws Exception {
IndexMetadataStore imf = VDBMetadataFactory.loadMetadata(vdbName, new File(vdbPath).toURI().toURL());
- deployVDB(vdbName, imf, null, metadataRepo);
+ deployVDB(vdbName, imf, parameterObject);
}
- public void deployVDB(String vdbName, String vdbPath, Map<String, Collection<FunctionMethod>> udfs) throws Exception {
- IndexMetadataStore imf = VDBMetadataFactory.loadMetadata(vdbName, new File(vdbPath).toURI().toURL());
- deployVDB(vdbName, imf, udfs, null);
- }
-
public void deployVDB(String vdbName, MetadataStore metadata) {
- deployVDB(vdbName, metadata, null, null);
+ deployVDB(vdbName, metadata, new DeployVDBParameter(null, null));
}
- public void deployVDB(String vdbName, MetadataStore metadata, Map<String, Collection<FunctionMethod>> udfs, MetadataRepository metadataRepo) {
+ public void deployVDB(String vdbName, MetadataStore metadata, DeployVDBParameter parameterObject) {
VDBMetaData vdbMetaData = new VDBMetaData();
vdbMetaData.setName(vdbName);
vdbMetaData.setStatus(VDB.Status.ACTIVE);
- for (Schema schema : repo.getSystemStore().getSchemas().values()) {
- addModel(vdbMetaData, schema);
- }
-
- for (Schema schema : repo.getODBCStore().getSchemas().values()) {
- addModel(vdbMetaData, schema);
- }
-
for (Schema schema : metadata.getSchemas().values()) {
ModelMetaData model = addModel(vdbMetaData, schema);
- if (metadataRepo != null) {
- model.addAttchment(MetadataRepository.class, metadataRepo);
+ if (parameterObject.metadataRepo != null) {
+ model.addAttchment(MetadataRepository.class, parameterObject.metadataRepo);
}
}
try {
UDFMetaData udfMetaData = null;
- if (udfs != null) {
+ if (parameterObject.udfs != null) {
udfMetaData = new UDFMetaData();
- for (Map.Entry<String, Collection<FunctionMethod>> entry : udfs.entrySet()) {
+ for (Map.Entry<String, Collection<FunctionMethod>> entry : parameterObject.udfs.entrySet()) {
udfMetaData.addFunctions(entry.getKey(), entry.getValue());
}
}
+
+ if (parameterObject.vdbImports != null) {
+ for (VDBImportMetadata vdbImport : parameterObject.vdbImports) {
+ vdbMetaData.getVDBImports().add(vdbImport);
+ }
+ }
+
this.repo.addVDB(vdbMetaData, metadata, (metadata instanceof IndexMetadataStore)?((IndexMetadataStore)metadata).getEntriesPlusVisibilities():null, udfMetaData, cmr);
this.repo.finishDeployment(vdbMetaData.getName(), vdbMetaData.getVersion());
this.repo.getVDB(vdbMetaData.getName(), vdbMetaData.getVersion()).setStatus(VDB.Status.ACTIVE);
@@ -440,11 +445,6 @@
this.repo.removeVDB(vdbName, 1);
}
- public void mergeVDBS(String sourceVDB, String targetVDB) throws AdminException {
- this.repo.mergeVDBs(sourceVDB, 1, targetVDB, 1);
- this.repo.getVDB(targetVDB, 1).setStatus(VDB.Status.ACTIVE);
- }
-
public ConnectionImpl createConnection(String embeddedURL) throws Exception {
final Properties p = new Properties();
TeiidDriver.parseURL(embeddedURL, p);
Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestLocalConnections.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestLocalConnections.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestLocalConnections.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -47,6 +47,7 @@
import org.teiid.core.util.UnitTestUtil;
import org.teiid.dqp.internal.datamgr.ConnectorManager;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
+import org.teiid.jdbc.FakeServer.DeployVDBParameter;
import org.teiid.language.Command;
import org.teiid.metadata.FunctionMethod;
import org.teiid.metadata.FunctionParameter;
@@ -163,7 +164,7 @@
FunctionMethod function = new FunctionMethod("foo", null, FunctionCategoryConstants.MISCELLANEOUS, PushDown.CANNOT_PUSHDOWN, TestLocalConnections.class.getName(), "blocking", null, new FunctionParameter("result", DataTypeManager.DefaultDataTypes.INTEGER), false, FunctionMethod.Determinism.NONDETERMINISTIC);
HashMap<String, Collection<FunctionMethod>> udfs = new HashMap<String, Collection<FunctionMethod>>();
udfs.put("test", Arrays.asList(function));
- server.deployVDB("PartsSupplier", UnitTestUtil.getTestDataPath() + "/PartsSupplier.vdb", udfs);
+ server.deployVDB("PartsSupplier", UnitTestUtil.getTestDataPath() + "/PartsSupplier.vdb", new DeployVDBParameter(udfs, null));
}
@AfterClass public static void oneTimeTearDown() {
Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestVDBMerge.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -1,9 +1,12 @@
package org.teiid.jdbc;
import java.sql.SQLException;
+import java.util.Arrays;
import org.junit.Test;
+import org.teiid.adminapi.impl.VDBImportMetadata;
import org.teiid.core.util.UnitTestUtil;
+import org.teiid.jdbc.FakeServer.DeployVDBParameter;
@SuppressWarnings("nls")
@@ -47,25 +50,18 @@
executeTest("select * from tables where schemaname='BQT1'", expectedBefore); //$NON-NLS-1$
this.internalConnection.close();
-
+
server.deployVDB(VDB2, UnitTestUtil.getTestDataPath()+"/QT_Ora9DS_1.vdb");
+
+ DeployVDBParameter param = new DeployVDBParameter(null, null);
+ VDBImportMetadata vdbImport = new VDBImportMetadata();
+ vdbImport.setName(VDB2);
+ param.vdbImports = Arrays.asList(vdbImport);
+ server.removeVDB(VDB1);
+ server.deployVDB(VDB1, UnitTestUtil.getTestDataPath()+"/QT_Ora9DS_1.vdb", param);
- server.mergeVDBS(VDB2, VDB1);
-
this.internalConnection = server.createConnection("jdbc:teiid:"+VDB1);
executeTest("select * from tables where schemaname='BQT1' order by name", expectedAfter); //$NON-NLS-1$
-
- server.undeployVDB(VDB2);
-
- // since the connection is not closed; need to behave as if still merged
- executeTest("select * from tables where schemaname='BQT1' order by name", expectedAfter); //$NON-NLS-1$
-
- // re-connect should behave as the original
- this.internalConnection.close();
- this.internalConnection = server.createConnection("jdbc:teiid:"+VDB1);
-
- executeTest("select * from tables where schemaname='BQT1'", expectedBefore); //$NON-NLS-1$
- executeTest("select * from tables where schemaname ='PartsSupplier'", expected); //$NON-NLS-1$
}
private void executeTest(String sql, String[] expected) throws SQLException{
@@ -92,7 +88,12 @@
server.deployVDB(VDB2, UnitTestUtil.getTestDataPath()+"/QT_Ora9DS_1.vdb");
- server.mergeVDBS(VDB2, "empty");
+ DeployVDBParameter param = new DeployVDBParameter(null, null);
+ VDBImportMetadata vdbImport = new VDBImportMetadata();
+ vdbImport.setName(VDB2);
+ param.vdbImports = Arrays.asList(vdbImport);
+ server.undeployVDB("empty");
+ server.deployVDB("empty", UnitTestUtil.getTestDataPath() + "/empty.vdb", param);
String[] expectedAfter = {
"VDBName[string] SchemaName[string] Name[string] Type[string] NameInSource[string] IsPhysical[boolean] SupportsUpdates[boolean] UID[string] Cardinality[integer] Description[string] IsSystem[boolean] IsMaterialized[boolean] OID[integer]",
Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViews.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViews.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViews.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -40,6 +40,7 @@
import org.teiid.core.util.UnitTestUtil;
import org.teiid.jdbc.FakeServer;
import org.teiid.jdbc.TeiidSQLException;
+import org.teiid.jdbc.FakeServer.DeployVDBParameter;
import org.teiid.metadata.FunctionMethod;
import org.teiid.metadata.FunctionParameter;
import org.teiid.metadata.FunctionMethod.Determinism;
@@ -69,7 +70,7 @@
server = new FakeServer();
HashMap<String, Collection<FunctionMethod>> udfs = new HashMap<String, Collection<FunctionMethod>>();
udfs.put("funcs", Arrays.asList(new FunctionMethod("pause", null, null, PushDown.CANNOT_PUSHDOWN, TestMatViews.class.getName(), "pause", null, new FunctionParameter("return", DataTypeManager.DefaultDataTypes.INTEGER), true, Determinism.NONDETERMINISTIC)));
- server.deployVDB(MATVIEWS, UnitTestUtil.getTestDataPath() + "/matviews.vdb", udfs);
+ server.deployVDB(MATVIEWS, UnitTestUtil.getTestDataPath() + "/matviews.vdb", new DeployVDBParameter(udfs, null));
conn = server.createConnection("jdbc:teiid:matviews");
}
Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMetadataUpdates.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMetadataUpdates.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMetadataUpdates.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -37,6 +37,7 @@
import org.mockito.stubbing.Answer;
import org.teiid.core.util.UnitTestUtil;
import org.teiid.jdbc.FakeServer;
+import org.teiid.jdbc.FakeServer.DeployVDBParameter;
import org.teiid.metadata.DefaultMetadataRepository;
import org.teiid.metadata.Procedure;
import org.teiid.metadata.Table;
@@ -50,7 +51,7 @@
@BeforeClass public static void setUp() throws Exception {
FakeServer server = new FakeServer();
- server.deployVDB(VDB, UnitTestUtil.getTestDataPath() + "/metadata.vdb", getMetadataRepo());
+ server.deployVDB(VDB, UnitTestUtil.getTestDataPath() + "/metadata.vdb", new DeployVDBParameter(null, getMetadataRepo()));
connection = server.createConnection("jdbc:teiid:" + VDB); //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestReplication.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestReplication.java 2012-05-23 17:18:52 UTC (rev 4136)
+++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestReplication.java 2012-05-23 21:51:53 UTC (rev 4137)
@@ -41,6 +41,7 @@
import org.teiid.core.util.UnitTestUtil;
import org.teiid.dqp.internal.process.DQPConfiguration;
import org.teiid.jdbc.FakeServer;
+import org.teiid.jdbc.FakeServer.DeployVDBParameter;
import org.teiid.metadata.FunctionMethod;
import org.teiid.metadata.FunctionParameter;
import org.teiid.metadata.FunctionMethod.Determinism;
@@ -145,7 +146,7 @@
server.start(new DQPConfiguration(), true);
HashMap<String, Collection<FunctionMethod>> udfs = new HashMap<String, Collection<FunctionMethod>>();
udfs.put("funcs", Arrays.asList(new FunctionMethod("pause", null, null, PushDown.CANNOT_PUSHDOWN, TestMatViews.class.getName(), "pause", null, new FunctionParameter("return", DataTypeManager.DefaultDataTypes.INTEGER), true, Determinism.NONDETERMINISTIC)));
- server.deployVDB(MATVIEWS, UnitTestUtil.getTestDataPath() + "/matviews.vdb", udfs);
+ server.deployVDB(MATVIEWS, UnitTestUtil.getTestDataPath() + "/matviews.vdb", new DeployVDBParameter(udfs, null));
return server;
}
11 years, 11 months
- 1
- 0
teiid SVN: r4136 - in branches/7.7.x: engine/src/main/java/org/teiid/dqp/service and 5 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-05-23 13:18:52 -0400 (Wed, 23 May 2012)
New Revision: 4136
Modified:
branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java
branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/ThreadReuseExecutor.java
branches/7.7.x/engine/src/main/java/org/teiid/dqp/service/SessionService.java
branches/7.7.x/engine/src/main/java/org/teiid/security/SecurityHelper.java
branches/7.7.x/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPWorkContext.java
branches/7.7.x/jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java
branches/7.7.x/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java
branches/7.7.x/runtime/src/main/java/org/teiid/transport/LogonImpl.java
Log:
TEIID-2055: Pulling in the code enhancements from trunk made by SteveH and also pulling in the ThreadReuseExecutor cleaning up of the context
Modified: branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java 2012-05-22 14:55:50 UTC (rev 4135)
+++ branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java 2012-05-23 17:18:52 UTC (rev 4136)
@@ -96,11 +96,11 @@
}
public static void setWorkContext(DQPWorkContext context) {
- CONTEXTS.set(context);
- }
-
- public static void releaseWorkContext() {
- CONTEXTS.set(null);
+ if (context == null) {
+ CONTEXTS.remove();
+ } else {
+ CONTEXTS.set(context);
+ }
}
private SessionMetadata session = new SessionMetadata();
@@ -134,6 +134,10 @@
public void setSecurityHelper(SecurityHelper securityHelper) {
this.securityHelper = securityHelper;
}
+
+ public SecurityHelper getSecurityHelper() {
+ return securityHelper;
+ }
/**
* @return
@@ -227,37 +231,21 @@
public void runInContext(final Runnable runnable) {
DQPWorkContext previous = DQPWorkContext.getWorkContext();
- Object previousSC = getSecurityContextOnThread();
- boolean associated = attachDQPWorkContext();
+ DQPWorkContext.setWorkContext(this);
+ Object previousSecurityContext = null;
+ if (securityHelper != null) {
+ previousSecurityContext = securityHelper.associateSecurityContext(this.getSecurityContext());
+ }
try {
runnable.run();
} finally {
- if (associated) {
- securityHelper.clearSecurityContext(previousSC);
+ if (securityHelper != null) {
+ securityHelper.associateSecurityContext(previousSecurityContext);
}
- DQPWorkContext.releaseWorkContext();
- if (previous != null) {
- previous.attachDQPWorkContext();
- }
+ DQPWorkContext.setWorkContext(previous);
}
}
- private Object getSecurityContextOnThread() {
- if (securityHelper != null) {
- return securityHelper.getSecurityContextOnThread();
- }
- return null;
- }
-
- private boolean attachDQPWorkContext() {
- DQPWorkContext.setWorkContext(this);
- boolean associated = false;
- if (securityHelper != null && this.getSubject() != null) {
- associated = securityHelper.associateSecurityContext(this.getSecurityContext());
- }
- return associated;
- }
-
public HashMap<String, DataPolicy> getAllowedDataPolicies() {
if (this.policies == null) {
this.policies = new HashMap<String, DataPolicy>();
Modified: branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/ThreadReuseExecutor.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/ThreadReuseExecutor.java 2012-05-22 14:55:50 UTC (rev 4135)
+++ branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/ThreadReuseExecutor.java 2012-05-23 17:18:52 UTC (rev 4136)
@@ -115,6 +115,10 @@
@Override
public void run() {
+ if (workContext.getSecurityHelper() != null) {
+ //if using the inheritable thread local security or if unassocation has been sloppy, there may a security context associated
+ workContext.getSecurityHelper().clearSecurityContext();
+ }
workContext.runInContext(r);
}
Modified: branches/7.7.x/engine/src/main/java/org/teiid/dqp/service/SessionService.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/dqp/service/SessionService.java 2012-05-22 14:55:50 UTC (rev 4135)
+++ branches/7.7.x/engine/src/main/java/org/teiid/dqp/service/SessionService.java 2012-05-23 17:18:52 UTC (rev 4136)
@@ -25,7 +25,6 @@
import java.util.Collection;
import java.util.Properties;
-import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
@@ -34,6 +33,7 @@
import org.teiid.dqp.internal.process.DQPCore;
import org.teiid.net.socket.AuthenticationType;
import org.teiid.security.Credentials;
+import org.teiid.security.SecurityHelper;
/**
@@ -148,11 +148,5 @@
String getGssSecurityDomain();
- boolean associateSubjectInContext(String securityDomain, Subject subject);
-
- Subject getSubjectInContext(String securityDomain);
-
- public void clearSubjectInContext(Object prevSecurityContext);
-
- Object getSecurityContextOnThread();
+ SecurityHelper getSecurityHelper();
}
Modified: branches/7.7.x/engine/src/main/java/org/teiid/security/SecurityHelper.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/security/SecurityHelper.java 2012-05-22 14:55:50 UTC (rev 4135)
+++ branches/7.7.x/engine/src/main/java/org/teiid/security/SecurityHelper.java 2012-05-23 17:18:52 UTC (rev 4136)
@@ -28,12 +28,10 @@
public interface SecurityHelper {
- boolean associateSecurityContext(Object context);
+ Object associateSecurityContext(Object context);
- void clearSecurityContext(Object prevContext);
+ void clearSecurityContext();
- Object getSecurityContextOnThread();
-
Object getSecurityContext(String securityDomain);
Object createSecurityContext(String securityDomain, Principal p, Object credentials, Subject subject);
Modified: branches/7.7.x/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPWorkContext.java
===================================================================
--- branches/7.7.x/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPWorkContext.java 2012-05-22 14:55:50 UTC (rev 4135)
+++ branches/7.7.x/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPWorkContext.java 2012-05-23 17:18:52 UTC (rev 4136)
@@ -110,10 +110,6 @@
return null;
}
@Override
- public Object getSecurityContextOnThread() {
- return this.mycontext;
- }
- @Override
public Object getSecurityContext(String securityDomain) {
return this.mycontext;
}
@@ -122,13 +118,14 @@
return securityDomain+"SC"; //$NON-NLS-1$
}
@Override
- public void clearSecurityContext(Object prevContext) {
- this.mycontext = prevContext;
+ public void clearSecurityContext() {
+ this.mycontext = null;
}
@Override
- public boolean associateSecurityContext(Object context) {
+ public Object associateSecurityContext(Object context) {
+ Object old = mycontext;
this.mycontext = context;
- return true;
+ return old;
}
};
Object previousSC = sc.createSecurityContext("test", null, null, null); //$NON-NLS-1$
@@ -147,13 +144,13 @@
Runnable r = new Runnable() {
@Override
public void run() {
- assertEquals(currentSC, sc.getSecurityContextOnThread());
+ assertEquals(currentSC, sc.getSecurityContext(null));
}
};
message.runInContext(r);
- assertEquals(previousSC, sc.getSecurityContextOnThread());
+ assertEquals(previousSC, sc.getSecurityContext(null));
}
Modified: branches/7.7.x/jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java
===================================================================
--- branches/7.7.x/jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java 2012-05-22 14:55:50 UTC (rev 4135)
+++ branches/7.7.x/jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java 2012-05-23 17:18:52 UTC (rev 4136)
@@ -36,29 +36,20 @@
private static final long serialVersionUID = 3598997061994110254L;
@Override
- public boolean associateSecurityContext(Object newContext) {
+ public Object associateSecurityContext(Object newContext) {
SecurityContext context = SecurityActions.getSecurityContext();
- if (context == null || (newContext != null && newContext != context)) {
+ if (newContext != context) {
SecurityActions.setSecurityContext((SecurityContext)newContext);
- return true;
}
- return false;
+ return context;
}
@Override
- public void clearSecurityContext(Object prevContext) {
+ public void clearSecurityContext() {
SecurityActions.clearSecurityContext();
- if (prevContext != null) {
- SecurityActions.setSecurityContext((SecurityContext)prevContext);
- }
}
@Override
- public Object getSecurityContextOnThread() {
- return SecurityActions.getSecurityContext();
- }
-
- @Override
public Object getSecurityContext(String securityDomain) {
SecurityContext sc = SecurityActions.getSecurityContext();
if (sc != null && sc.getSecurityDomain().equals(securityDomain)) {
Modified: branches/7.7.x/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java
===================================================================
--- branches/7.7.x/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java 2012-05-22 14:55:50 UTC (rev 4135)
+++ branches/7.7.x/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java 2012-05-23 17:18:52 UTC (rev 4136)
@@ -23,7 +23,6 @@
package org.teiid.services;
import java.io.IOException;
-import java.security.Principal;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -35,7 +34,6 @@
import java.util.TimerTask;
import java.util.concurrent.ConcurrentHashMap;
-import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.NameCallback;
@@ -423,26 +421,6 @@
this.dqp = dqp;
}
- @Override
- public boolean associateSubjectInContext(String securityDomain, Subject subject) {
- Principal principal = null;
- for(Principal p:subject.getPrincipals()) {
- principal = p;
- break;
- }
- return this.securityHelper.associateSecurityContext(this.securityHelper.createSecurityContext(securityDomain, principal, null, subject));
- }
-
- @Override
- public Subject getSubjectInContext(String securityDomain) {
- return this.securityHelper.getSubjectInContext(securityDomain);
- }
-
- @Override
- public Object getSecurityContextOnThread() {
- return this.securityHelper.getSecurityContextOnThread();
- }
-
public void setGssSecurityDomain(String domain) {
this.gssSecurityDomain = domain;
}
@@ -451,9 +429,9 @@
public String getGssSecurityDomain(){
return this.gssSecurityDomain;
}
-
+
@Override
- public void clearSubjectInContext(Object previousSC) {
- this.securityHelper.clearSecurityContext(previousSC);
- }
+ public SecurityHelper getSecurityHelper() {
+ return securityHelper;
+ }
}
Modified: branches/7.7.x/runtime/src/main/java/org/teiid/transport/LogonImpl.java
===================================================================
--- branches/7.7.x/runtime/src/main/java/org/teiid/transport/LogonImpl.java 2012-05-22 14:55:50 UTC (rev 4135)
+++ branches/7.7.x/runtime/src/main/java/org/teiid/transport/LogonImpl.java 2012-05-23 17:18:52 UTC (rev 4136)
@@ -22,6 +22,7 @@
package org.teiid.transport;
+import java.security.Principal;
import java.security.PrivilegedAction;
import java.util.Collection;
import java.util.Properties;
@@ -53,6 +54,7 @@
import org.teiid.net.socket.AuthenticationType;
import org.teiid.runtime.RuntimePlugin;
import org.teiid.security.Credentials;
+import org.teiid.security.SecurityHelper;
public class LogonImpl implements ILogon {
@@ -67,7 +69,7 @@
public LogonResult logon(Properties connProps) throws LogonException, TeiidComponentException, CommunicationException {
if (this.service.getGssSecurityDomain() != null && connProps.get(ILogon.KRB5TOKEN) != null) {
- Subject user = this.service.getSubjectInContext(this.service.getGssSecurityDomain());
+ Subject user = this.service.getSecurityHelper().getSubjectInContext(this.service.getGssSecurityDomain());
if (user == null) {
throw new LogonException(RuntimePlugin.Util.getString("krb5_user_not_found")); //$NON-NLS-1$
}
@@ -160,7 +162,7 @@
String user = connProps.getProperty(TeiidURL.CONNECTION.USER_NAME);
String password = connProps.getProperty(TeiidURL.CONNECTION.PASSWORD);
boolean assosiated = false;
- Object previousSC = null;
+ Object previous = null;
try {
String securityDomain = service.getGssSecurityDomain();
if (securityDomain == null) {
@@ -176,8 +178,16 @@
}
if (result.context.isEstablished()) {
- previousSC = service.getSecurityContextOnThread();
- assosiated = service.associateSubjectInContext(securityDomain, subject);
+ Principal principal = null;
+ for(Principal p:subject.getPrincipals()) {
+ principal = p;
+ break;
+ }
+ SecurityHelper securityHelper = service.getSecurityHelper();
+
+ Object securityContext = securityHelper.createSecurityContext(securityDomain, principal, null, subject);
+ previous = securityHelper.associateSecurityContext(securityContext);
+ assosiated = true;
}
if (!result.context.isEstablished() || !createSession) {
@@ -194,7 +204,7 @@
throw new LogonException(e, RuntimePlugin.Util.getString("krb5_login_failed")); //$NON-NLS-1$
} finally {
if (assosiated) {
- this.service.clearSubjectInContext(previousSC);
+ service.getSecurityHelper().associateSecurityContext(previous);
}
}
}
11 years, 11 months
- 1
- 0
teiid SVN: r4135 - in branches/7.7.x/connectors/connector-infinispan: src/assembly and 7 other directories.
by teiid-commits＠lists.jboss.org
Author: van.halbert
Date: 2012-05-22 10:55:50 -0400 (Tue, 22 May 2012)
New Revision: 4135
Added:
branches/7.7.x/connectors/connector-infinispan/src/main/application/
branches/7.7.x/connectors/connector-infinispan/src/main/application/META-INF/
branches/7.7.x/connectors/connector-infinispan/src/main/application/META-INF/application.xml
branches/7.7.x/connectors/connector-infinispan/src/main/application/META-INF/jboss-app.xml
branches/7.7.x/connectors/connector-infinispan/src/main/application/connector-infinispan.rar/
branches/7.7.x/connectors/connector-infinispan/src/main/application/connector-infinispan.rar/META-INF/
branches/7.7.x/connectors/connector-infinispan/src/main/application/connector-infinispan.rar/META-INF/ra.xml
branches/7.7.x/connectors/connector-infinispan/src/main/application/infinispan-ds.xml
Modified:
branches/7.7.x/connectors/connector-infinispan/pom.xml
branches/7.7.x/connectors/connector-infinispan/src/assembly/kit.xml
branches/7.7.x/connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/custom/spi/BasicManagedConnectionFactory.java
branches/7.7.x/connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanConnectionImpl.java
branches/7.7.x/connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanManagedConnectionFactory.java
Log:
TEIID-1992 updated based on refactoring of Infinispan Connection for remote connection and change to the packaging of the ear and its deployment to the repo
Modified: branches/7.7.x/connectors/connector-infinispan/pom.xml
===================================================================
--- branches/7.7.x/connectors/connector-infinispan/pom.xml 2012-05-22 14:51:03 UTC (rev 4134)
+++ branches/7.7.x/connectors/connector-infinispan/pom.xml 2012-05-22 14:55:50 UTC (rev 4135)
@@ -8,6 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-infinispan</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
+ <!-- packaging>ear</packaging-->
<name>Infinispan Connector</name>
<description>This connector reads data from a Infinispan cache</description>
<properties>
@@ -58,11 +59,14 @@
<artifactId>junit</artifactId>
<version>4.4</version>
<scope>test</scope>
- </dependency>
+ </dependency>
+
+
</dependencies>
<build>
- <plugins>
+
+ <plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
@@ -73,77 +77,192 @@
<goal>jar</goal>
</goals>
</execution>
- <execution>
- <id>deploy_jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <classifier>lib</classifier>
- </configuration>
- </execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <finalName>infinispan</finalName>
- <descriptors>
- <descriptor>src/assembly/kit.xml</descriptor>
- </descriptors>
- <outputDirectory>target/distribution</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <!-- uri>./target/connector-infinispan-${project.version}</uri-->
+ <defaultJavaBundleDir></defaultJavaBundleDir>
+ <generateApplicationXml>false</generateApplicationXml>
+ <modules>
+ <javaModule>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-core</artifactId>
+ <bundleDir>connector-infinispan.rar</bundleDir>
+ <!--includeInApplicationXml>true</includeInApplicationXml-->
+ </javaModule>
+ <javaModule>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-client-hotrod</artifactId>
+ <bundleDir>connector-infinispan.rar</bundleDir>
+ </javaModule>
+ <javaModule>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling-river</artifactId>
+ <bundleDir>connector-infinispan.rar</bundleDir>
+ </javaModule>
+ <javaModule>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling</artifactId>
+ <bundleDir>connector-infinispan.rar</bundleDir>
+ </javaModule>
+ <javaModule>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <bundleDir>connector-infinispan.rar</bundleDir>
+ </javaModule>
+ <javaModule>
+ <groupId>org.jboss.logmanager</groupId>
+ <artifactId>jboss-logmanager</artifactId>
+ <bundleDir>connector-infinispan.rar</bundleDir>
+ </javaModule>
+ <javaModule>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <bundleDir>connector-infinispan.rar</bundleDir>
+ </javaModule>
+ <jarModule>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+
+ <jarModule>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+ <jarModule>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search</artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+ <jarModule>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+ <jarModule>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+ <jarModule>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core </artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+ <jarModule>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+ <jarModule>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api </artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+ <jarModule>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+ <jarModule>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+ <jarModule>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+ <jarModule>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+ <jarModule>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+ <jarModule>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+ <jarModule>
+ <groupId>org.jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+
+ <jarModule>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+ <jarModule>
+ <groupId>org.rhq.helpers</groupId>
+ <artifactId>rhq-pluginAnnotations</artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+ <jarModule>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <artifactId>translator-object</artifactId>
+ <excluded>true</excluded>
+ </jarModule>
+ </modules>
+
+ <jboss>
+ <data-sources>
+ <data-source>infinispan-ds.xml</data-source>
+ </data-sources>
+
+ <loader-repository>
+ org.teiid.resource.adapter:loader=teiid-infinispan.ear
+ </loader-repository>
+ <loader-repository-config>
+ java2ParentDelegation=false
+ </loader-repository-config>
+
+ </jboss>
+ </configuration>
+ <executions>
+ <execution>
+ <id>deploy-ear</id>
+ <phase>install</phase>
+ <goals>
+ <goal>ear</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <defaultJavaBundleDir>lib</defaultJavaBundleDir>
- <modules>
- <rarModule>
- <bundleDir>/connector-infinispan.rar</bundleDir>
- </rarModule>
- <javaModule>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-core</artifactId>
- <includeInApplicationXml>true</includeInApplicationXml>
- </javaModule>
- <javaModule>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-client-hotrod</artifactId>
- <includeInApplicationXml>true</includeInApplicationXml>
- </javaModule>
-
- </modules>
-
- <jboss>
- <data-sources>
- <data-source>src/kit/infinispan-ds.xml</data-source>
- </data-sources>
-
- <loader-repository>
- org.teiid.resource.adapter:loader=infinispan-jca.ear
- <loader-repository-config>
- java2ParentDelegation=false
- </loader-repository-config>
- </loader-repository>
-
- </jboss>
- </configuration>
- </plugin -->
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-ear</id>
+ <phase>install</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+ <packaging>ear</packaging>
+ <artifactId>${project.artifactId}</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ <file>${project.build.directory}/${project.artifactId}-${project.version}.ear</file>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: branches/7.7.x/connectors/connector-infinispan/src/assembly/kit.xml
===================================================================
--- branches/7.7.x/connectors/connector-infinispan/src/assembly/kit.xml 2012-05-22 14:51:03 UTC (rev 4134)
+++ branches/7.7.x/connectors/connector-infinispan/src/assembly/kit.xml 2012-05-22 14:55:50 UTC (rev 4135)
@@ -9,7 +9,7 @@
in order to build a complete set of artifacts to be deployed to a JBoss AS server
-->
- <id>jca.ear</id>
+ <id>infinispan.ear</id>
<formats>
<format>dir</format>
@@ -37,7 +37,6 @@
<include>org.jboss.marshalling:jboss-marshalling</include>
<include>org.jboss.marshalling:jboss-marshalling-river</include>
-
</includes>
</dependencySet>
Added: branches/7.7.x/connectors/connector-infinispan/src/main/application/META-INF/application.xml
===================================================================
--- branches/7.7.x/connectors/connector-infinispan/src/main/application/META-INF/application.xml (rev 0)
+++ branches/7.7.x/connectors/connector-infinispan/src/main/application/META-INF/application.xml 2012-05-22 14:55:50 UTC (rev 4135)
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+ <display-name>Infinispan</display-name>
+ <module>
+ <connector>connector-infinispan.rar</connector>
+ </module>
+
+</application>
Added: branches/7.7.x/connectors/connector-infinispan/src/main/application/META-INF/jboss-app.xml
===================================================================
--- branches/7.7.x/connectors/connector-infinispan/src/main/application/META-INF/jboss-app.xml (rev 0)
+++ branches/7.7.x/connectors/connector-infinispan/src/main/application/META-INF/jboss-app.xml 2012-05-22 14:55:50 UTC (rev 4135)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-app PUBLIC
+ "-//JBoss//DTD J2EE Application 1.4//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
+<jboss-app>
+ <loader-repository>org.teiid.resource.adapter:loader=teiid-infinispan.ear<loader-repository-config>java2ParentDelegation=false</loader-repository-config>
+ </loader-repository>
+ <module>
+ <service>infinispan-ds.xml</service>
+ </module>
+</jboss-app>
\ No newline at end of file
Added: branches/7.7.x/connectors/connector-infinispan/src/main/application/connector-infinispan.rar/META-INF/ra.xml
===================================================================
--- branches/7.7.x/connectors/connector-infinispan/src/main/application/connector-infinispan.rar/META-INF/ra.xml (rev 0)
+++ branches/7.7.x/connectors/connector-infinispan/src/main/application/connector-infinispan.rar/META-INF/ra.xml 2012-05-22 14:55:50 UTC (rev 4135)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<connector version="1.5">
+
+ <vendor-name>Red Hat Middleware LLC</vendor-name>
+ <eis-type>Teiid Infinispan Connector</eis-type>
+ <resourceadapter-version>1.0</resourceadapter-version>
+ <license>
+ <description>
+ JBoss, Home of Professional Open Source.
+ Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ as indicated by the @author tags. See the copyright.txt file in the
+ distribution for a full listing of individual contributors.
+
+ This 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 software 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 software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ </description>
+ <license-required>true</license-required>
+ </license>
+ <resourceadapter>
+ <resourceadapter-class>org.teiid.resource.adapter.custom.spi.BasicResourceAdapter</resourceadapter-class>
+
+ <outbound-resourceadapter>
+ <connection-definition>
+ <managedconnectionfactory-class>org.teiid.resource.adapter.infinispan.InfinispanManagedConnectionFactory</managedconnectionfactory-class>
+
+ <config-property>
+ <description>{$display:"Infinispan Server List",$description:"Infinispan Server List",$required:"true"}</description>
+ <config-property-name>RemoteServerList</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+
+ <connectionfactory-interface>javax.resource.cci.ConnectionFactory</connectionfactory-interface>
+ <connectionfactory-impl-class>org.teiid.resource.adapter.custom.spi.WrappedConnectionFactory</connectionfactory-impl-class>
+ <connection-interface>javax.resource.cci.Connection</connection-interface>
+ <connection-impl-class>org.teiid.resource.adapter.custom.spi.WrappedConnection</connection-impl-class>
+
+ </connection-definition>
+
+ <transaction-support>NoTransaction</transaction-support>
+
+ <authentication-mechanism>
+ <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
+ <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+ </authentication-mechanism>
+ <reauthentication-support>false</reauthentication-support>
+ </outbound-resourceadapter>
+ </resourceadapter>
+</connector>
Added: branches/7.7.x/connectors/connector-infinispan/src/main/application/infinispan-ds.xml
===================================================================
--- branches/7.7.x/connectors/connector-infinispan/src/main/application/infinispan-ds.xml (rev 0)
+++ branches/7.7.x/connectors/connector-infinispan/src/main/application/infinispan-ds.xml 2012-05-22 14:55:50 UTC (rev 4135)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<connection-factories>
+
+ <no-tx-connection-factory>
+ <!-- The jndi name of the DataSource -->
+ <jndi-name>InfinispanDS</jndi-name>
+
+ <!-- The resource archive file that defines JCA connection for Coherence -->
+ <rar-name>infinispan-jca.ear#connector-infinispan.rar</rar-name>
+ <!-- connection interface; (do not change this) -->
+ <connection-definition>javax.resource.cci.ConnectionFactory</connection-definition>
+
+ <!-- Infinispan server list - host:port[;host:port...] (required)-->
+ <config-property name="RemoteServerList">localhost:11222</config-property>
+
+ <min-pool-size>0</min-pool-size>
+ <max-pool-size>20</max-pool-size>
+
+ </no-tx-connection-factory>
+
+</connection-factories>
\ No newline at end of file
Modified: branches/7.7.x/connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/custom/spi/BasicManagedConnectionFactory.java
===================================================================
--- branches/7.7.x/connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/custom/spi/BasicManagedConnectionFactory.java 2012-05-22 14:51:03 UTC (rev 4134)
+++ branches/7.7.x/connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/custom/spi/BasicManagedConnectionFactory.java 2012-05-22 14:55:50 UTC (rev 4135)
@@ -52,7 +52,7 @@
public Object createConnectionFactory(ConnectionManager cm) throws ResourceException {
this.cf = createConnectionFactory();
return this.cf;
- // return new WrappedConnectionFactory(this.cf, cm, this);
+ // return new WrappedConnectionFactory(this.cf, cm, this);
}
@Override
Modified: branches/7.7.x/connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanConnectionImpl.java
===================================================================
--- branches/7.7.x/connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanConnectionImpl.java 2012-05-22 14:51:03 UTC (rev 4134)
+++ branches/7.7.x/connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanConnectionImpl.java 2012-05-22 14:55:50 UTC (rev 4135)
@@ -1,5 +1,5 @@
/*
-sele * JBoss, Home of Professional Open Source.
+ * JBoss, Home of Professional Open Source.
* See the COPYRIGHT.txt file distributed with this work for information
* regarding copyright ownership. Some portions may be licensed
* to Red Hat, Inc. under one or more contributor license agreements.
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -33,13 +34,14 @@
import org.infinispan.client.hotrod.RemoteCache;
import org.teiid.resource.adapter.custom.spi.BasicConnection;
-import org.teiid.translator.object.ObjectCacheConnection;
+import org.teiid.translator.object.SearchCriterion;
+import org.teiid.translator.object.infinispan.InfinispanCacheConnection;
/**
* Represents an implementation of the connection to an Infinispan cache.
*/
-public class InfinispanConnectionImpl extends BasicConnection implements ObjectCacheConnection {
+public class InfinispanConnectionImpl extends BasicConnection implements InfinispanCacheConnection {
private InfinispanManagedConnectionFactory config;
@@ -72,55 +74,85 @@
public boolean isAlive() {
return (config == null ? false : config.getRemoteCacheManager().isStarted());
}
-
- public List<Object> get(List<Object> args, String cacheName, Class<?> rootNodeType) throws Exception {
+
+ @Override
+ public List<Object> get(SearchCriterion criterion, String cacheName, Class<?> rootNodeType) throws Exception {
+ List<Object> results = null;
+ if (! criterion.isRootTableInSelect() ) {
+ return Collections.EMPTY_LIST;
+ }
+
RemoteCache<Object, Object> cache = config.getRemoteCacheManager().getCache(cacheName);
- List<Object> results = null;
- if (args == null || args.size() == 0) {
+ if (criterion.getOperator() == SearchCriterion.Operator.ALL) {
Map<Object, Object> c = cache.getBulk();
results = new ArrayList<Object>();
for (Iterator it = c.keySet().iterator(); it.hasNext();) {
Object v = cache.get(it.next());
- if (v != null && v.getClass().equals(rootNodeType)) {
- addValue(v, results);
- }
- }
+ addValue(v, results, rootNodeType);
- } else {
- results = new ArrayList<Object>(args.size());
- for (Iterator<Object> it=args.iterator(); it.hasNext();) {
+ }
+
+ return results;
+ }
+
+ if (criterion.getAddCondition() != null) {
+ results = get(criterion.getAddCondition(), cacheName, rootNodeType);
+ }
+
+ if (results == null) {
+ results = new ArrayList<Object>();
+ }
+
+ if (criterion.getOperator().equals(SearchCriterion.Operator.EQUALS)) {
+
+ Object v = cache.get(criterion.getValue());
+ if (v != null) {
+ addValue(v, results, rootNodeType);
+ }
+ } else if (criterion.getOperator().equals(SearchCriterion.Operator.IN)) {
+
+ List<Object> parms = (List) criterion.getValue();
+ for (Iterator<Object> it=parms.iterator(); it.hasNext();) {
Object arg = it.next();
Object v = cache.get(arg);
- if (v != null && v.getClass().equals(rootNodeType)) {
- addValue(v, results); }
+ if (v != null) {
+ addValue(v, results, rootNodeType);
+ }
}
- }
+ }
+// else if (criterion.getOperator().equals(SearchCriterion.Operator.LIKE)) {
+// // not supported yet
+// }
+
return results;
}
- private void addValue(Object value, List<Object> results) {
- if (value.getClass().isArray()) {
- List<Object> listRows = Arrays.asList((Object[]) value);
- results.addAll(listRows);
- return;
+ private void addValue(Object value, List<Object> results, Class rootNodeType) {
+ if (value != null && value.getClass().equals(rootNodeType)) {
+
+ if (value.getClass().isArray()) {
+ List<Object> listRows = Arrays.asList((Object[]) value);
+ results.addAll(listRows);
+ return;
+ }
+
+ if (value instanceof Collection) {
+ results.addAll((Collection) value);
+ return;
+ }
+
+ if (value instanceof Map) {
+ Map<?,Object> mapRows = (Map) value;
+ results.addAll(mapRows.values());
+ return;
+ }
+
+ results.add(value);
}
-
- if (value instanceof Collection) {
- results.addAll((Collection) value);
- return;
- }
-
- if (value instanceof Map) {
- Map<?,Object> mapRows = (Map) value;
- results.addAll(mapRows.values());
- return;
- }
-
- results.add(value);
}
Modified: branches/7.7.x/connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanManagedConnectionFactory.java
===================================================================
--- branches/7.7.x/connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanManagedConnectionFactory.java 2012-05-22 14:51:03 UTC (rev 4134)
+++ branches/7.7.x/connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanManagedConnectionFactory.java 2012-05-22 14:55:50 UTC (rev 4135)
@@ -27,6 +27,7 @@
import org.teiid.resource.adapter.custom.spi.BasicConnectionFactory;
import org.teiid.resource.adapter.custom.spi.BasicManagedConnectionFactory;
+@SuppressWarnings("serial")
public class InfinispanManagedConnectionFactory extends BasicManagedConnectionFactory {
private String remoteServerList;
11 years, 11 months
- 1
- 0