teiid SVN: r3905 - in branches/7.7.x: build/kits/jboss-container and 7 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-02-29 17:59:27 -0500 (Wed, 29 Feb 2012)
New Revision: 3905
Modified:
branches/7.7.x/api/src/main/java/org/teiid/translator/ExecutionFactory.java
branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html
branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCBaseExecution.java
branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java
branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java
branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java
branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWork.java
branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java
branches/7.7.x/engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java
branches/7.7.x/engine/src/test/java/org/teiid/dqp/service/AutoGenDataService.java
Log:
TEIID-1937 adding support for lob value copying by the engine.
Modified: branches/7.7.x/api/src/main/java/org/teiid/translator/ExecutionFactory.java
===================================================================
--- branches/7.7.x/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-02-29 16:54:17 UTC (rev 3904)
+++ branches/7.7.x/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-02-29 22:59:27 UTC (rev 3905)
@@ -108,6 +108,7 @@
private boolean requiresCriteria;
private int maxInSize = DEFAULT_MAX_IN_CRITERIA_SIZE;
private int maxDependentInPredicates = DEFAULT_MAX_IN_CRITERIA_SIZE;
+ private boolean copyLobs;
private LinkedList<FunctionMethod> pushdownFunctionMethods = new LinkedList<FunctionMethod>();
@@ -129,8 +130,17 @@
public void setImmutable(boolean arg0) {
this.immutable = arg0;
- }
+ }
+
+ @TranslatorProperty(display="Copy LOBs",description="If true, returned LOBs will be copied, rather than streamed from the source",advanced=true)
+ public boolean isCopyLobs() {
+ return copyLobs;
+ }
+ public void setCopyLobs(boolean copyLobs) {
+ this.copyLobs = copyLobs;
+ }
+
/**
* Return a connection object from the given connection factory.
*
Modified: branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html 2012-02-29 16:54:17 UTC (rev 3904)
+++ branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html 2012-02-29 22:59:27 UTC (rev 3905)
@@ -30,6 +30,7 @@
<LI><B>Salesforce Aggregates</B> - salesforce pushdown queries now support GROUP BY, HAVING, and the standard aggregate functions.
<LI><B>Comparable LOBs</B> - the system property org.teiid.comparableLobs can be set to use CLOB and BLOB values in comparison/sorting/grouping operations.
<LI><B>Padded String Comparison</B> - the system property org.teiid.padSpace can be set to effectively right pad strings to the same length for comparison.
+ <LI><B>Copy LOBs</B> - added the copyLobs property to indicate that lob values should be copied by the engine rather than being held by reference.
</UL>
<h2><a name="Compatibility">Compatibility Issues</a></h2>
Modified: branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCBaseExecution.java
===================================================================
--- branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCBaseExecution.java 2012-02-29 16:54:17 UTC (rev 3904)
+++ branches/7.7.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCBaseExecution.java 2012-02-29 22:59:27 UTC (rev 3905)
@@ -35,9 +35,9 @@
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
import org.teiid.logging.MessageLevel;
-import org.teiid.translator.TranslatorException;
import org.teiid.translator.Execution;
import org.teiid.translator.ExecutionContext;
+import org.teiid.translator.TranslatorException;
/**
Modified: branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java 2012-02-29 16:54:17 UTC (rev 3904)
+++ branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java 2012-02-29 22:59:27 UTC (rev 3905)
@@ -25,6 +25,7 @@
import java.util.List;
import org.teiid.core.TeiidComponentException;
+import org.teiid.core.types.Streamable;
import org.teiid.query.sql.symbol.Expression;
@@ -138,5 +139,8 @@
* @param additional
* @return
*/
- int reserveAdditionalBuffers(int additional);
+ int reserveAdditionalBuffers(int additional);
+
+ Streamable<?> persistLob(final Streamable<?> lob,
+ final FileStore store, byte[] bytes) throws TeiidComponentException;
}
Modified: branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java 2012-02-29 16:54:17 UTC (rev 3904)
+++ branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java 2012-02-29 22:59:27 UTC (rev 3905)
@@ -35,8 +35,9 @@
import java.util.List;
import java.util.Map;
+import javax.sql.rowset.serial.SerialBlob;
+
import org.teiid.core.TeiidComponentException;
-import org.teiid.core.types.BaseLob;
import org.teiid.core.types.BlobImpl;
import org.teiid.core.types.BlobType;
import org.teiid.core.types.ClobImpl;
@@ -190,60 +191,79 @@
byte[] bytes = new byte[1 << 14];
for (Map.Entry<String, LobHolder> entry : this.lobReferences.entrySet()) {
- entry.getValue().lob = persistLob(entry.getValue().lob, lobStore, bytes);
+ entry.getValue().lob = detachLob(entry.getValue().lob, lobStore, bytes);
}
}
- private Streamable<?> persistLob(final Streamable<?> lob, final FileStore store, byte[] bytes) throws TeiidComponentException {
+ public Streamable<?> detachLob(final Streamable<?> lob, final FileStore store, byte[] bytes) throws TeiidComponentException {
+ // if this is not attached, just return
+ if (InputStreamFactory.getStorageMode(lob) != StorageMode.OTHER) {
+ return lob;
+ }
- // if this is already saved to disk just return
- if (lob.getReference() instanceof BaseLob) {
- try {
- BaseLob baseLob = (BaseLob)lob.getReference();
- InputStreamFactory isf = baseLob.getStreamFactory();
- if (isf.getStorageMode() == StorageMode.PERSISTENT) {
+ return persistLob(lob, store, bytes, inlineLobs, maxMemoryBytes);
+ }
+
+ public static Streamable<?> persistLob(final Streamable<?> lob,
+ final FileStore store, byte[] bytes, boolean inlineLobs, int maxMemoryBytes) throws TeiidComponentException {
+ try {
+ //inline
+ long byteLength = lob.length()*(lob instanceof ClobType?2:1);
+ if (lob.getReferenceStreamId() == null || (inlineLobs
+ && (byteLength <= maxMemoryBytes))) {
+ lob.setReferenceStreamId(null);
+ if (InputStreamFactory.getStorageMode(lob) == StorageMode.MEMORY) {
return lob;
}
- } catch (SQLException e) {
- // go through regular persistence.
+
+ if (lob instanceof BlobType) {
+ BlobType b = (BlobType)lob;
+ byte[] blobBytes = b.getBytes(1, (int)byteLength);
+ b.setReference(new SerialBlob(blobBytes));
+ return b;
+ } else if (lob instanceof ClobType) {
+ ClobType c = (ClobType)lob;
+ String s = c.getSubString(1, (int)(byteLength>>>1));
+ c.setReference(ClobImpl.createClob(s.toCharArray()));
+ return c;
+ } else {
+ XMLType x = (XMLType)lob;
+ String s = x.getString();
+ x.setReference(new SQLXMLImpl(s));
+ return x;
+ }
}
- }
- long offset = store.getLength();
- int length = 0;
- Streamable<?> persistedLob;
-
- try {
+
InputStream is = null;
if (lob instanceof BlobType) {
is = new BlobInputStreamFactory((Blob)lob).getInputStream();
- }
- else if (lob instanceof ClobType) {
+ } else if (lob instanceof ClobType) {
is = new ClobInputStreamFactory((Clob)lob).getInputStream();
} else {
is = new SQLXMLInputStreamFactory((SQLXML)lob).getInputStream();
}
+
+ long offset = store.getLength();
+ Streamable<?> persistedLob;
+
OutputStream fsos = store.createOutputStream();
- length = ObjectConverterUtil.write(fsos, is, bytes, -1);
- } catch (IOException e) {
- throw new TeiidComponentException(e);
- }
-
- // re-construct the new lobs based on the file store
- final long lobOffset = offset;
- final int lobLength = length;
- InputStreamFactory isf = new InputStreamFactory() {
- @Override
- public InputStream getInputStream() throws IOException {
- return store.createInputStream(lobOffset, lobLength);
- }
+ byteLength = ObjectConverterUtil.write(fsos, is, bytes, -1);
- @Override
- public StorageMode getStorageMode() {
- return StorageMode.PERSISTENT;
- }
- };
+ // re-construct the new lobs based on the file store
+ final long lobOffset = offset;
+ final long lobLength = byteLength;
+ InputStreamFactory isf = new InputStreamFactory() {
+ @Override
+ public InputStream getInputStream() throws IOException {
+ return store.createInputStream(lobOffset, lobLength);
+ }
+
+ @Override
+ public StorageMode getStorageMode() {
+ return StorageMode.PERSISTENT;
+ }
+ };
- try {
if (lob instanceof BlobType) {
persistedLob = new BlobType(new BlobImpl(isf));
}
@@ -255,10 +275,12 @@
((XMLType)persistedLob).setEncoding(((XMLType)lob).getEncoding());
((XMLType)persistedLob).setType(((XMLType)lob).getType());
}
+ return persistedLob;
} catch (SQLException e) {
throw new TeiidComponentException(e);
- }
- return persistedLob;
+ } catch (IOException e) {
+ throw new TeiidComponentException(e);
+ }
}
public int getLobCount() {
@@ -267,6 +289,5 @@
public void remove() {
this.lobReferences.clear();
-
}
}
Modified: branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java 2012-02-29 16:54:17 UTC (rev 3904)
+++ branches/7.7.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java 2012-02-29 22:59:27 UTC (rev 3905)
@@ -48,23 +48,13 @@
import org.teiid.client.BatchSerializer;
import org.teiid.client.ResizingArrayList;
-import org.teiid.common.buffer.AutoCleanupUtil;
-import org.teiid.common.buffer.BatchManager;
-import org.teiid.common.buffer.BufferManager;
-import org.teiid.common.buffer.Cache;
-import org.teiid.common.buffer.CacheEntry;
-import org.teiid.common.buffer.CacheKey;
-import org.teiid.common.buffer.FileStore;
-import org.teiid.common.buffer.LobManager;
-import org.teiid.common.buffer.STree;
-import org.teiid.common.buffer.Serializer;
-import org.teiid.common.buffer.StorageManager;
-import org.teiid.common.buffer.TupleBuffer;
+import org.teiid.common.buffer.*;
import org.teiid.common.buffer.AutoCleanupUtil.Removable;
import org.teiid.common.buffer.LobManager.ReferenceMode;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.core.types.Streamable;
import org.teiid.core.types.DataTypeManager.WeakReferenceHashedValueCache;
import org.teiid.dqp.internal.process.DQPConfiguration;
import org.teiid.logging.LogConstants;
@@ -282,7 +272,7 @@
}
long count = readCount.incrementAndGet();
if (LogManager.isMessageToBeRecorded(LogConstants.CTX_BUFFER_MGR, MessageLevel.DETAIL)) {
- LogManager.logDetail(LogConstants.CTX_BUFFER_MGR, id, id, "reading batch", batch, "from storage, total reads:", count); //$NON-NLS-1$ //$NON-NLS-2$
+ LogManager.logDetail(LogConstants.CTX_BUFFER_MGR, id, "reading batch", batch, "from storage, total reads:", count); //$NON-NLS-1$ //$NON-NLS-2$
}
ce = cache.get(o, batch, this.ref);
if (ce == null) {
@@ -993,4 +983,10 @@
return memoryEntries.size();
}
+ @Override
+ public Streamable<?> persistLob(Streamable<?> lob, FileStore store,
+ byte[] bytes) throws TeiidComponentException {
+ return LobManager.persistLob(lob, store, bytes, inlineLobs, DataTypeManager.MAX_LOB_MEMORY_BYTES);
+ }
+
}
Modified: branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWork.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWork.java 2012-02-29 16:54:17 UTC (rev 3904)
+++ branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWork.java 2012-02-29 22:59:27 UTC (rev 3905)
@@ -45,4 +45,6 @@
boolean isDataAvailable();
+ boolean copyLobs();
+
}
\ No newline at end of file
Modified: branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java 2012-02-29 16:54:17 UTC (rev 3904)
+++ branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java 2012-02-29 22:59:27 UTC (rev 3905)
@@ -371,5 +371,10 @@
public boolean isDataAvailable() {
return this.securityContext.isDataAvailable();
}
+
+ @Override
+ public boolean copyLobs() {
+ return this.connector.isCopyLobs();
+ }
}
\ No newline at end of file
Modified: branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java 2012-02-29 16:54:17 UTC (rev 3904)
+++ branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java 2012-02-29 22:59:27 UTC (rev 3905)
@@ -87,6 +87,9 @@
private boolean[] convertToRuntimeType;
private boolean[] convertToDesiredRuntimeType;
+ private boolean[] isLob;
+ private FileStore lobStore;
+ private byte[] lobBuffer;
private Class<?>[] schema;
private int limit = -1;
@@ -116,11 +119,13 @@
this.schema = new Class[symbols.size()];
this.convertToDesiredRuntimeType = new boolean[symbols.size()];
this.convertToRuntimeType = new boolean[symbols.size()];
+ this.isLob = new boolean[symbols.size()];
for (int i = 0; i < symbols.size(); i++) {
SingleElementSymbol symbol = symbols.get(i);
this.schema[i] = symbol.getType();
this.convertToDesiredRuntimeType[i] = true;
this.convertToRuntimeType[i] = true;
+ this.isLob[i] = DataTypeManager.isLOB(this.schema[i]);
}
Assertion.isNull(workItem.getConnectorRequest(aqr.getAtomicRequestID()));
@@ -140,7 +145,7 @@
}, this, 100);
}
- private List<?> correctTypes(List<Object> row) throws TransformationException {
+ private List<?> correctTypes(List<Object> row) throws TransformationException, TeiidComponentException {
//TODO: add a proper intermediate schema
for (int i = 0; i < row.size(); i++) {
Object value = row.get(i);
@@ -148,12 +153,11 @@
continue;
}
if (convertToRuntimeType[i]) {
- boolean lob = !arm.supportsCloseWithLobs() && DataTypeManager.isLOB(value.getClass());
Object result = convertToRuntimeType(value, this.schema[i]);
if (value == result && !DataTypeManager.DefaultDataClasses.OBJECT.equals(this.schema[i])) {
convertToRuntimeType[i] = false;
} else {
- if (lob && DataTypeManager.isLOB(result.getClass()) && DataTypeManager.isLOB(this.schema[i])) {
+ if (isLob[i] && !cwi.copyLobs() && !arm.supportsCloseWithLobs() && DataTypeManager.isLOB(value.getClass())) {
explicitClose = true;
}
row.set(i, result);
@@ -163,13 +167,19 @@
if (convertToDesiredRuntimeType[i]) {
if (value != null) {
Object result = DataTypeManager.transformValue(value, value.getClass(), this.schema[i]);
- if (value == result) {
+ if (isLob[i] && cwi.copyLobs()) {
+ if (lobStore == null) {
+ lobStore = dtm.getBufferManager().createFileStore("lobs"); //$NON-NLS-1$
+ lobBuffer = new byte[1 << 14];
+ }
+ result = dtm.getBufferManager().persistLob((Streamable<?>) result, lobStore, lobBuffer);
+ } else if (value == result) {
convertToDesiredRuntimeType[i] = false;
continue;
}
row.set(i, result);
}
- } else {
+ } else if (DataTypeManager.isValueCacheEnabled()) {
row.set(i, DataTypeManager.getCanonicalValue(value));
}
}
@@ -393,6 +403,8 @@
* @see TupleSource#closeSource()
*/
public void closeSource() {
+ lobBuffer = null;
+ lobStore = null; //can still be referenced by lobs and will be cleaned-up by reference
cancelAsynch = true;
if (!explicitClose) {
fullyCloseSource();
Modified: branches/7.7.x/engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java
===================================================================
--- branches/7.7.x/engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java 2012-02-29 16:54:17 UTC (rev 3904)
+++ branches/7.7.x/engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java 2012-02-29 22:59:27 UTC (rev 3905)
@@ -24,6 +24,8 @@
import static org.junit.Assert.*;
+import java.util.List;
+
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -31,6 +33,9 @@
import org.teiid.client.RequestMessage;
import org.teiid.client.SourceWarning;
import org.teiid.common.buffer.BlockedException;
+import org.teiid.core.types.ClobType;
+import org.teiid.core.types.InputStreamFactory;
+import org.teiid.core.types.InputStreamFactory.StorageMode;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
import org.teiid.dqp.internal.datamgr.FakeTransactionService;
import org.teiid.dqp.message.AtomicRequestMessage;
@@ -45,6 +50,7 @@
import org.teiid.query.unittest.RealMetadataFactory;
import org.teiid.query.util.CommandContext;
+@SuppressWarnings("nls")
public class TestDataTierManager {
private DQPCore rm;
@@ -109,6 +115,33 @@
info = new DataTierTupleSource(request, workItem, connectorManager.registerRequest(request), dtm, limit);
}
+ @Test public void testCopyLobs() throws Exception {
+ connectorManager.copyLobs = true;
+ helpSetup("SELECT cast(stringkey as clob) from bqt1.smalla", 1);
+ for (int i = 0; i < 10;) {
+ try {
+ List<?> tuple = info.nextTuple();
+ ClobType clob = (ClobType)tuple.get(0);
+ assertEquals(StorageMode.MEMORY, InputStreamFactory.getStorageMode(clob));
+ i++;
+ } catch (BlockedException e) {
+ Thread.sleep(50);
+ }
+ }
+ connectorManager.copyLobs = false;
+ helpSetup("SELECT cast(stringkey as clob) from bqt1.smalla", 1);
+ for (int i = 0; i < 10;) {
+ try {
+ List<?> tuple = info.nextTuple();
+ ClobType clob = (ClobType)tuple.get(0);
+ assertEquals(StorageMode.OTHER, InputStreamFactory.getStorageMode(clob));
+ i++;
+ } catch (BlockedException e) {
+ Thread.sleep(50);
+ }
+ }
+ }
+
@Test public void testDataTierTupleSource() throws Exception {
helpSetup(1);
for (int i = 0; i < 10;) {
Modified: branches/7.7.x/engine/src/test/java/org/teiid/dqp/service/AutoGenDataService.java
===================================================================
--- branches/7.7.x/engine/src/test/java/org/teiid/dqp/service/AutoGenDataService.java 2012-02-29 16:54:17 UTC (rev 3904)
+++ branches/7.7.x/engine/src/test/java/org/teiid/dqp/service/AutoGenDataService.java 2012-02-29 22:59:27 UTC (rev 3905)
@@ -22,8 +22,12 @@
package org.teiid.dqp.service;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.sql.Clob;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -31,7 +35,10 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.teiid.core.TeiidComponentException;
+import org.teiid.core.types.ClobImpl;
import org.teiid.core.types.DataTypeManager;
+import org.teiid.core.types.InputStreamFactory;
+import org.teiid.core.types.Streamable;
import org.teiid.dqp.internal.datamgr.ConnectorManager;
import org.teiid.dqp.internal.datamgr.ConnectorWork;
import org.teiid.dqp.internal.datamgr.ConnectorWorkItem;
@@ -50,6 +57,7 @@
* This data service will automatically generate results when called with a query - basically
* the same as the old loopback connector.
*/
+@SuppressWarnings("nls")
public class AutoGenDataService extends ConnectorManager{
// Number of rows that will be generated for each query
@@ -62,6 +70,7 @@
private final AtomicInteger closeCount = new AtomicInteger();
private boolean useIntCounter;
public boolean addWarning;
+ public boolean copyLobs;
public AutoGenDataService() {
super("FakeConnector","FakeConnector"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -166,6 +175,11 @@
}
+ @Override
+ public boolean copyLobs() {
+ return copyLobs;
+ }
+
};
}
@@ -202,6 +216,12 @@
private static final Double DOUBLE_VAL = new Double(0.0);
private static final Character CHAR_VAL = new Character('c');
private static final Byte BYTE_VAL = new Byte((byte)0);
+ private static final Clob CLOB_VAL = new ClobImpl(new InputStreamFactory() {
+ @Override
+ public InputStream getInputStream() throws IOException {
+ return new ByteArrayInputStream("hello world".getBytes(Streamable.CHARSET));
+ }
+ }, -1);
private static final Boolean BOOLEAN_VAL = Boolean.FALSE;
private static final BigInteger BIG_INTEGER_VAL = new BigInteger("0"); //$NON-NLS-1$
private static final BigDecimal BIG_DECIMAL_VAL = new BigDecimal("0"); //$NON-NLS-1$
@@ -238,6 +258,8 @@
return TIME_VAL;
} else if(type.equals(DataTypeManager.DefaultDataClasses.TIMESTAMP)) {
return TIMESTAMP_VAL;
+ } else if(type.equals(DataTypeManager.DefaultDataClasses.CLOB)) {
+ return CLOB_VAL;
} else {
return null;
}
12 years, 2 months
- 1
- 0
teiid SVN: r3904 - in branches/7.7.x: client/src/main/resources and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-02-29 11:54:17 -0500 (Wed, 29 Feb 2012)
New Revision: 3904
Added:
branches/7.7.x/client/src/main/resources/teiid-client-settings.orig.properties
Removed:
branches/7.7.x/client/src/main/resources/teiid-client-settings.properties
Modified:
branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java
branches/7.7.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml
branches/7.7.x/documentation/client-developers-guide/src/main/docbook/en-US/content/ssl.xml
Log:
TEIID-1950 renaming the teiid-client-settings in the client to not interfere with signed jars
Modified: branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java
===================================================================
--- branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java 2012-02-29 15:56:53 UTC (rev 3903)
+++ branches/7.7.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java 2012-02-29 16:54:17 UTC (rev 3904)
@@ -33,16 +33,7 @@
import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.*;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -158,7 +149,7 @@
private Map<CachedInstance, CachedInstance> instancePool = new LinkedHashMap<CachedInstance, CachedInstance>();
//config properties
- private long synchronousTtl = 120000l;
+ private long synchronousTtl = 240000l;
private int maxCachedInstances=16;
public static synchronized SocketServerConnectionFactory getInstance() {
Copied: branches/7.7.x/client/src/main/resources/teiid-client-settings.orig.properties (from rev 3898, branches/7.7.x/client/src/main/resources/teiid-client-settings.properties)
===================================================================
--- branches/7.7.x/client/src/main/resources/teiid-client-settings.orig.properties (rev 0)
+++ branches/7.7.x/client/src/main/resources/teiid-client-settings.orig.properties 2012-02-29 16:54:17 UTC (rev 3904)
@@ -0,0 +1,129 @@
+########################################
+# Settings file for Teiid clients
+########################################
+
+########################################
+# SSL Settings
+########################################
+
+#
+# The key store type. Defaults to JKS
+#
+
+org.teiid.ssl.keyStoreType=JKS
+
+#
+# The key store algorithm, defaults to
+# the system property "ssl.TrustManagerFactory.algorithm"
+#
+
+#org.teiid.ssl.algorithm=
+
+#
+# The classpath or filesystem location of the
+# key store.
+#
+# This property is required only if performing 2-way
+# authentication that requires a specific private
+# key.
+#
+
+#org.teiid.ssl.keyStore=
+
+#
+# The key store password (not required)
+#
+
+#org.teiid.ssl.keyStorePassword=
+
+#
+# The classpath or filesystem location of the
+# trust store.
+#
+# This property is required if performing 1-way
+# authentication that requires trust not provided
+# by the system defaults.
+#
+
+#org.teiid.ssl.trustStore=
+
+#
+# The trust store password (not required)
+#
+
+#org.teiid.ssl.trustStorePassword=
+
+#
+# The cipher protocol, defaults to TLSv1
+#
+
+org.teiid.ssl.protocol=TLSv1
+
+#
+# Whether to allow anonymous SSL
+# (the TLS_DH_anon_WITH_AES_128_CBC_SHA cipher suite)
+# defaults to true
+#
+
+org.teiid.ssl.allowAnon=true
+
+########################################
+# Misc Socket Configuration
+########################################
+
+#
+# The time in milliseconds for socket timeouts.
+# A timeout during the initialization, handshake, or
+# a server ping will be treated as an error.
+#
+# Setting this value too low may cause read errors.
+#
+
+org.teiid.sockets.soTimeout=3000
+
+#
+# The max number of cached server instances
+# to reuse. A server instance is a connected
+# socket to a particular cluster member with
+# client encryption and or SSL already established.
+#
+# Caching instances helps in 2 circumstances:
+# - when Connection pooling is not being used.
+# - load-balancing performance to a cluster
+# when using Connection pooling of the DataSource.
+#
+# This value should typically be a multiple of the
+# cluster size.
+#
+# Set to 0 to disable instance caching.
+#
+
+org.teiid.sockets.maxCachedInstances=16
+
+#
+# Set the max time to live (in milliseconds) for non-execution
+# synchronous calls.
+#
+
+org.teiid.sockets.synchronousttl=240000
+
+#
+# Set the socket receive buffer size (in bytes)
+# 0 indicates that the default socket setting will be used.
+#
+
+org.teiid.sockets.receiveBufferSize=0
+
+#
+# Set the socket send buffer size (in bytes)
+# 0 indicates that the default socket setting will be used.
+#
+
+org.teiid.sockets.sendBufferSize=0
+
+#
+# Set to true to enable Nagle's algorithm to conserve bandwidth
+# by minimizing the number of segments that are sent.
+#
+
+org.teiid.sockets.conserveBandwidth=false
Property changes on: branches/7.7.x/client/src/main/resources/teiid-client-settings.orig.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: branches/7.7.x/client/src/main/resources/teiid-client-settings.properties
===================================================================
--- branches/7.7.x/client/src/main/resources/teiid-client-settings.properties 2012-02-29 15:56:53 UTC (rev 3903)
+++ branches/7.7.x/client/src/main/resources/teiid-client-settings.properties 2012-02-29 16:54:17 UTC (rev 3904)
@@ -1,129 +0,0 @@
-########################################
-# Settings file for Teiid clients
-########################################
-
-########################################
-# SSL Settings
-########################################
-
-#
-# The key store type. Defaults to JKS
-#
-
-org.teiid.ssl.keyStoreType=JKS
-
-#
-# The key store algorithm, defaults to
-# the system property "ssl.TrustManagerFactory.algorithm"
-#
-
-#org.teiid.ssl.algorithm=
-
-#
-# The classpath or filesystem location of the
-# key store.
-#
-# This property is required only if performing 2-way
-# authentication that requires a specific private
-# key.
-#
-
-#org.teiid.ssl.keyStore=
-
-#
-# The key store password (not required)
-#
-
-#org.teiid.ssl.keyStorePassword=
-
-#
-# The classpath or filesystem location of the
-# trust store.
-#
-# This property is required if performing 1-way
-# authentication that requires trust not provided
-# by the system defaults.
-#
-
-#org.teiid.ssl.trustStore=
-
-#
-# The trust store password (not required)
-#
-
-#org.teiid.ssl.trustStorePassword=
-
-#
-# The cipher protocol, defaults to TLSv1
-#
-
-org.teiid.ssl.protocol=TLSv1
-
-#
-# Whether to allow anonymous SSL
-# (the TLS_DH_anon_WITH_AES_128_CBC_SHA cipher suite)
-# defaults to true
-#
-
-org.teiid.ssl.allowAnon=true
-
-########################################
-# Misc Socket Configuration
-########################################
-
-#
-# The time in milliseconds for socket timeouts.
-# A timeout during the initialization, handshake, or
-# a server ping will be treated as an error.
-#
-# Setting this value too low may cause read errors.
-#
-
-org.teiid.sockets.soTimeout=3000
-
-#
-# The max number of cached server instances
-# to reuse. A server instance is a connected
-# socket to a particular cluster member with
-# client encryption and or SSL already established.
-#
-# Caching instances helps in 2 circumstances:
-# - when Connection pooling is not being used.
-# - load-balancing performance to a cluster
-# when using Connection pooling of the DataSource.
-#
-# This value should typically be a multiple of the
-# cluster size.
-#
-# Set to 0 to disable instance caching.
-#
-
-org.teiid.sockets.maxCachedInstances=16
-
-#
-# Set the max time to live (in milliseconds) for non-execution
-# synchronous calls.
-#
-
-org.teiid.sockets.synchronousttl=240000
-
-#
-# Set the socket receive buffer size (in bytes)
-# 0 indicates that the default socket setting will be used.
-#
-
-org.teiid.sockets.receiveBufferSize=0
-
-#
-# Set the socket send buffer size (in bytes)
-# 0 indicates that the default socket setting will be used.
-#
-
-org.teiid.sockets.sendBufferSize=0
-
-#
-# Set to true to enable Nagle's algorithm to conserve bandwidth
-# by minimizing the number of segments that are sent.
-#
-
-org.teiid.sockets.conserveBandwidth=false
Modified: branches/7.7.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml
===================================================================
--- branches/7.7.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml 2012-02-29 15:56:53 UTC (rev 3903)
+++ branches/7.7.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml 2012-02-29 16:54:17 UTC (rev 3904)
@@ -571,9 +571,9 @@
</example>
</para>
<para>Teiid by default maintians a pool of extra socket connections that are reused. For load balancing, this reduces the potential cost of switching a connection to another server instance.
- The default setting is to maintain 16 connections (see <code>org.teiid.sockets.maxCachedInstances</code> in the client jar's teiid-client-settings.properties file.
+ The default setting is to maintain 16 connections (can be set via <code>org.teiid.sockets.maxCachedInstances</code> in a teiid-client-settings.properties file).
If you're client is connecting to large numbers of Teiid instances and you're using post connection time load balancing, then consider increasing the number of cached instances.
- You may either set an analogous system property or create another version of teiid-client-settings.properties file and place it into the classpath ahead of the client jar.</para>
+ You may either set an analogous system property or create a teiid-client-settings.properties (see the teiid-client-settings.orig.properties file in the client jar) file and place it into the classpath ahead of the client jar.</para>
<note><para>Session level temporary tables, currently running transactions, session level cache entries, and PreparedPlans for a given session will not be available on other cluster members.
Therefore, it is recommended that post connection time load balancing is only used when the logical connection could have been closed, but the actual connection is reused (the typical connection pool pattern).</para></note>
</section>
Modified: branches/7.7.x/documentation/client-developers-guide/src/main/docbook/en-US/content/ssl.xml
===================================================================
--- branches/7.7.x/documentation/client-developers-guide/src/main/docbook/en-US/content/ssl.xml 2012-02-29 15:56:53 UTC (rev 3903)
+++ branches/7.7.x/documentation/client-developers-guide/src/main/docbook/en-US/content/ssl.xml 2012-02-29 16:54:17 UTC (rev 3904)
@@ -98,13 +98,13 @@
certificate keystores is not allowed.</para>
<para>In this scenario, a different set of Teiid-specific SSL properties can be set as system properties or defined inside
- the "teiid-client-settings.properties" file. The "teiid-client-settings.properties" file
- can be found inside the "teiid-&versionNumber;-client.jar" file at the root.
+ a "teiid-client-settings.properties" file. A sample "teiid-client-settings.properties" file
+ can be found inside the "teiid-&versionNumber;-client.jar" file at the root called "teiid-client-settings.orig.properties".
Extract this file, or make a copy, change the property values required for the chosen SSL mode,
and place this file in the client application's classpath before
the "teiid-&versionNumber;-client.jar" file.</para>
- <para>SSL properties and definitions inside the "teiid-client-settings.properties" are shown below.</para>
+ <para>SSL properties and definitions that can be set in a "teiid-client-settings.properties" file are shown below.</para>
<programlisting><![CDATA[########################################
# SSL Settings
12 years, 2 months
- 1
- 0
teiid SVN: r3903 - in branches/7.7.x/engine/src: main/java/org/teiid/query/processor/relational and 3 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-02-29 10:56:53 -0500 (Wed, 29 Feb 2012)
New Revision: 3903
Modified:
branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleCopyCriteria.java
branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java
branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java
branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java
branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java
branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java
branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java
branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java
Log:
TEIID-1956 fix for joining with multiple equi-join predicates against the same column
Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleCopyCriteria.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleCopyCriteria.java 2012-02-28 21:20:57 UTC (rev 3902)
+++ branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleCopyCriteria.java 2012-02-29 15:56:53 UTC (rev 3903)
@@ -34,6 +34,7 @@
import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.core.TeiidComponentException;
+import org.teiid.core.TeiidException;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
import org.teiid.query.analysis.AnalysisRecord;
@@ -44,6 +45,7 @@
import org.teiid.query.optimizer.relational.plantree.NodeConstants;
import org.teiid.query.optimizer.relational.plantree.NodeEditor;
import org.teiid.query.optimizer.relational.plantree.PlanNode;
+import org.teiid.query.rewriter.QueryRewriter;
import org.teiid.query.sql.lang.CompareCriteria;
import org.teiid.query.sql.lang.Criteria;
import org.teiid.query.sql.lang.IsNullCriteria;
@@ -137,6 +139,10 @@
return false;
}
+ if (tgtCrit instanceof IsNullCriteria && ((IsNullCriteria)tgtCrit).isNegated()) {
+ return false;
+ }
+
int endGroups = GroupsUsedByElementsVisitor.getGroups(tgtCrit).size();
if (checkForGroupReduction) {
@@ -210,17 +216,23 @@
Set<Criteria> toCopy = criteriaInfo[0];
Set<Criteria> allCriteria = criteriaInfo[1];
-
- if (!toCopy.isEmpty()) {
- Map<Expression, Expression> srcToTgt = buildElementMap(joinCrits);
-
+
+ if (joinCrits != null && !joinCrits.isEmpty()) {
List<Criteria> newJoinCrits = new LinkedList<Criteria>();
-
- changedTree |= createCriteria(false, toCopy, combinedCriteria, srcToTgt, newJoinCrits, metadata);
+
+ //we don't want to continue discovery since that could be recursive
+ Map<Expression, Expression> srcToTgt = buildElementMap(joinCrits, node.hasBooleanProperty(NodeConstants.Info.IS_COPIED)?null:newJoinCrits, combinedCriteria, metadata);
- srcToTgt = buildElementMap(allCriteria);
-
- changedTree |= createCriteria(true, joinCrits, combinedCriteria, srcToTgt, newJoinCrits, metadata);
+ changedTree |= !newJoinCrits.isEmpty();
+
+ if (!toCopy.isEmpty()) {
+
+ changedTree |= createCriteria(false, toCopy, combinedCriteria, srcToTgt, newJoinCrits, metadata);
+
+ srcToTgt = buildElementMap(allCriteria, null, null, metadata);
+
+ changedTree |= createCriteria(true, joinCrits, combinedCriteria, srcToTgt, newJoinCrits, metadata);
+ }
joinCrits.addAll(newJoinCrits);
}
@@ -345,11 +357,14 @@
* Construct a mapping of element symbol to value map based upon equality CompareCriteria in crits
*
* @param crits
+ * @param newJoinCrits
+ * @param metadata
* @return
*/
- Map<Expression, Expression> buildElementMap(Collection<Criteria> crits) {
+ Map<Expression, Expression> buildElementMap(Collection<Criteria> crits, List<Criteria> newJoinCrits, Set<Criteria> allCriteria, QueryMetadataInterface metadata) {
Map<Expression, Expression> srcToTgt = null;
- for (Criteria theCrit : crits) {
+ for (Iterator<Criteria> iter = crits.iterator(); iter.hasNext();) {
+ Criteria theCrit = iter.next();
if (theCrit instanceof IsNullCriteria) {
IsNullCriteria isNull = (IsNullCriteria)theCrit;
if (!isNull.isNegated() && isNull.getExpression() instanceof ElementSymbol) {
@@ -368,8 +383,16 @@
if (srcToTgt == null) {
srcToTgt = new HashMap<Expression, Expression>();
}
- srcToTgt.put(crit.getLeftExpression(), crit.getRightExpression());
- srcToTgt.put(crit.getRightExpression(), crit.getLeftExpression());
+ Expression oldValue = srcToTgt.put(crit.getLeftExpression(), crit.getRightExpression());
+ boolean removed = false;
+ if (checkWithinJoin(crit, newJoinCrits, allCriteria, oldValue, crit.getRightExpression(), metadata)) {
+ iter.remove();
+ removed = true;
+ }
+ oldValue = srcToTgt.put(crit.getRightExpression(), crit.getLeftExpression());
+ if (checkWithinJoin(crit, newJoinCrits, allCriteria, oldValue, crit.getLeftExpression(), metadata) && !removed) {
+ iter.remove();
+ }
}
}
if (srcToTgt == null) {
@@ -377,6 +400,34 @@
}
return srcToTgt;
}
+
+ /**
+ * @return true if the original crit can be removed
+ */
+ private boolean checkWithinJoin(CompareCriteria crit, List<Criteria> newJoinCrits, Set<Criteria> allCriteria,
+ Expression oldValue, Expression left, QueryMetadataInterface metadata) {
+ if (newJoinCrits == null || oldValue == null) {
+ return false;
+ }
+ if (oldValue.equals(left)) {
+ return true;
+ }
+ Criteria newCrit = new CompareCriteria((Expression)left.clone(), CompareCriteria.EQ, (Expression)oldValue.clone());
+ try {
+ newCrit = QueryRewriter.rewriteCriteria(newCrit, null, null, metadata);
+ } catch (TeiidException e) {
+ LogManager.logDetail(LogConstants.CTX_QUERY_PLANNER, e, "Could not remap target criteria in RuleCopyCriteria"); //$NON-NLS-1$
+ return false;
+ }
+ if (allCriteria.add(newCrit)) {
+ newJoinCrits.add(newCrit);
+ }
+ if (!GroupsUsedByElementsVisitor.getGroups(crit.getLeftExpression()).isEmpty() && !GroupsUsedByElementsVisitor.getGroups(crit.getRightExpression()).isEmpty()
+ && (GroupsUsedByElementsVisitor.getGroups(left).isEmpty() || GroupsUsedByElementsVisitor.getGroups(oldValue).isEmpty())) {
+ crit.setOptional(true); //the original has been simplified
+ }
+ return false;
+ }
public String toString() {
Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2012-02-28 21:20:57 UTC (rev 3902)
+++ branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2012-02-29 15:56:53 UTC (rev 3903)
@@ -22,11 +22,11 @@
package org.teiid.query.processor.relational;
+import java.util.AbstractList;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Set;
import org.teiid.common.buffer.IndexedTupleSource;
import org.teiid.common.buffer.STree;
@@ -51,22 +51,40 @@
* Degrades to a normal merge join if the tuples are balanced.
*
* Refined in 7.4 to use a full index if it is small enough or a repeated merge, rather than a partitioning approach (which was really just a single level index)
+ *
+ * TODO: add a tree method for insert that reuses a place list
*/
public class EnhancedSortMergeJoinStrategy extends MergeJoinStrategy {
- private final class SingleTupleSource implements TupleSource {
+ private final class SingleTupleSource extends AbstractList<Object> implements TupleSource {
boolean returned;
- List keyTuple;
+ private int[] indexes;
+ private List<?> keyTuple;
@Override
public List<?> nextTuple() throws TeiidComponentException,
TeiidProcessingException {
if (!returned) {
returned = true;
- return keyTuple;
+ return this;
}
return null;
}
+
+ @Override
+ public Object get(int index) {
+ return keyTuple.get(indexes[index]);
+ }
+
+ @Override
+ public int size() {
+ return indexes.length;
+ }
+
+ public void setValues(List<?> values) {
+ returned = false;
+ this.keyTuple = values;
+ }
@Override
public void closeSource() {
@@ -127,16 +145,17 @@
* TODO: reuse existing temp table indexes
*/
public void createIndex(SourceState state, boolean sorted) throws TeiidComponentException, TeiidProcessingException {
- int keyLength = state.getExpressionIndexes().length;
+ int[] expressionIndexes = state.getExpressionIndexes();
+ int keyLength = expressionIndexes.length;
List elements = state.getSource().getOutputElements();
//TODO: minimize reordering, or at least detect when it's not necessary
- int[] reorderedSortIndex = Arrays.copyOf(state.getExpressionIndexes(), elements.size());
- Set<Integer> used = new HashSet<Integer>();
- for (int i : state.getExpressionIndexes()) {
+ LinkedHashSet<Integer> used = new LinkedHashSet<Integer>();
+ for (int i : expressionIndexes) {
used.add(i);
}
- int j = state.getExpressionIndexes().length;
+ int[] reorderedSortIndex = Arrays.copyOf(expressionIndexes, keyLength + elements.size() - used.size());
+ int j = keyLength;
for (int i = 0; i < elements.size(); i++) {
if (!used.contains(i)) {
reorderedSortIndex[j++] = i;
@@ -166,12 +185,12 @@
//detect if sorted and distinct
List<?> originalTuple = its.nextTuple();
//remove the tuple if it has null
- for (int i : state.getExpressionIndexes()) {
+ for (int i : expressionIndexes) {
if (originalTuple.get(i) == null) {
continue outer;
}
}
- if (sortedDistinct && lastTuple != null && this.compare(lastTuple, originalTuple, state.getExpressionIndexes(), state.getExpressionIndexes()) == 0) {
+ if (sortedDistinct && lastTuple != null && this.compare(lastTuple, originalTuple, expressionIndexes, expressionIndexes) == 0) {
sortedDistinct = false;
}
lastTuple = originalTuple;
@@ -198,7 +217,7 @@
state.markDistinct(true);
}
keyTs = new SingleTupleSource();
- keyTs.keyTuple = new ArrayList<Object>(notSortedSource.getExpressionIndexes().length);
+ keyTs.indexes = this.notSortedSource.getExpressionIndexes();
tb = new TupleBrowser(this.index, keyTs, OrderBy.ASC);
}
@@ -341,9 +360,7 @@
this.joinNode.addBatchRow(outputTuple(this.leftSource.getOuterVals(), tuple));
continue;
}
- this.keyTs.keyTuple.clear();
- RelationalNode.projectTuple(this.notSortedSource.getExpressionIndexes(), this.currentTuple, this.keyTs.keyTuple, false);
- keyTs.returned = false;
+ this.keyTs.setValues(this.currentTuple);
tb.reset(keyTs);
}
if (sortedTuple == null) {
Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java 2012-02-28 21:20:57 UTC (rev 3902)
+++ branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java 2012-02-29 15:56:53 UTC (rev 3903)
@@ -380,10 +380,7 @@
}
public static <T> List<T> projectTuple(int[] indexes, List<T> tupleValues, boolean omitMissing) {
- return projectTuple(indexes, tupleValues, new ArrayList<T>(indexes.length), omitMissing);
- }
-
- public static <T> List<T> projectTuple(int[] indexes, List<T> tupleValues, List<T> projectedTuple, boolean omitMissing) {
+ List<T> projectedTuple = new ArrayList<T>(indexes.length);
for (int index : indexes) {
if (omitMissing && index == -1) {
projectedTuple.add(null);
Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2012-02-28 21:20:57 UTC (rev 3902)
+++ branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2012-02-29 15:56:53 UTC (rev 3903)
@@ -27,19 +27,7 @@
import java.sql.Date;
import java.sql.Time;
import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
+import java.util.*;
import org.teiid.api.exception.query.ExpressionEvaluationException;
import org.teiid.api.exception.query.FunctionExecutionException;
@@ -79,80 +67,12 @@
import org.teiid.query.sql.LanguageObject;
import org.teiid.query.sql.ProcedureReservedWords;
import org.teiid.query.sql.LanguageObject.Util;
-import org.teiid.query.sql.lang.AbstractSetCriteria;
-import org.teiid.query.sql.lang.ArrayTable;
-import org.teiid.query.sql.lang.BatchedUpdateCommand;
-import org.teiid.query.sql.lang.BetweenCriteria;
-import org.teiid.query.sql.lang.Command;
-import org.teiid.query.sql.lang.CompareCriteria;
-import org.teiid.query.sql.lang.CompoundCriteria;
-import org.teiid.query.sql.lang.Criteria;
-import org.teiid.query.sql.lang.Delete;
-import org.teiid.query.sql.lang.DependentSetCriteria;
-import org.teiid.query.sql.lang.ExistsCriteria;
-import org.teiid.query.sql.lang.ExpressionCriteria;
-import org.teiid.query.sql.lang.From;
-import org.teiid.query.sql.lang.FromClause;
-import org.teiid.query.sql.lang.GroupBy;
-import org.teiid.query.sql.lang.Insert;
-import org.teiid.query.sql.lang.Into;
-import org.teiid.query.sql.lang.IsNullCriteria;
-import org.teiid.query.sql.lang.JoinPredicate;
-import org.teiid.query.sql.lang.JoinType;
-import org.teiid.query.sql.lang.Limit;
-import org.teiid.query.sql.lang.MatchCriteria;
-import org.teiid.query.sql.lang.NotCriteria;
-import org.teiid.query.sql.lang.OrderBy;
-import org.teiid.query.sql.lang.OrderByItem;
-import org.teiid.query.sql.lang.ProcedureContainer;
-import org.teiid.query.sql.lang.Query;
-import org.teiid.query.sql.lang.QueryCommand;
-import org.teiid.query.sql.lang.SPParameter;
-import org.teiid.query.sql.lang.Select;
-import org.teiid.query.sql.lang.SetClause;
-import org.teiid.query.sql.lang.SetClauseList;
-import org.teiid.query.sql.lang.SetCriteria;
-import org.teiid.query.sql.lang.SetQuery;
-import org.teiid.query.sql.lang.StoredProcedure;
-import org.teiid.query.sql.lang.SubqueryCompareCriteria;
-import org.teiid.query.sql.lang.SubqueryContainer;
-import org.teiid.query.sql.lang.SubqueryFromClause;
-import org.teiid.query.sql.lang.SubquerySetCriteria;
-import org.teiid.query.sql.lang.TextTable;
-import org.teiid.query.sql.lang.TranslatableProcedureContainer;
-import org.teiid.query.sql.lang.UnaryFromClause;
-import org.teiid.query.sql.lang.Update;
-import org.teiid.query.sql.lang.WithQueryCommand;
-import org.teiid.query.sql.lang.XMLTable;
+import org.teiid.query.sql.lang.*;
import org.teiid.query.sql.lang.PredicateCriteria.Negatable;
import org.teiid.query.sql.navigator.DeepPostOrderNavigator;
import org.teiid.query.sql.navigator.PostOrderNavigator;
-import org.teiid.query.sql.proc.AssignmentStatement;
-import org.teiid.query.sql.proc.Block;
-import org.teiid.query.sql.proc.CommandStatement;
-import org.teiid.query.sql.proc.CreateUpdateProcedureCommand;
-import org.teiid.query.sql.proc.CriteriaSelector;
-import org.teiid.query.sql.proc.ExpressionStatement;
-import org.teiid.query.sql.proc.HasCriteria;
-import org.teiid.query.sql.proc.IfStatement;
-import org.teiid.query.sql.proc.LoopStatement;
-import org.teiid.query.sql.proc.Statement;
-import org.teiid.query.sql.proc.TranslateCriteria;
-import org.teiid.query.sql.proc.TriggerAction;
-import org.teiid.query.sql.proc.WhileStatement;
-import org.teiid.query.sql.symbol.AggregateSymbol;
-import org.teiid.query.sql.symbol.AliasSymbol;
-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.ExpressionSymbol;
-import org.teiid.query.sql.symbol.Function;
-import org.teiid.query.sql.symbol.GroupSymbol;
-import org.teiid.query.sql.symbol.Reference;
-import org.teiid.query.sql.symbol.ScalarSubquery;
-import org.teiid.query.sql.symbol.SearchedCaseExpression;
-import org.teiid.query.sql.symbol.SingleElementSymbol;
+import org.teiid.query.sql.proc.*;
+import org.teiid.query.sql.symbol.*;
import org.teiid.query.sql.symbol.AggregateSymbol.Type;
import org.teiid.query.sql.util.SymbolMap;
import org.teiid.query.sql.visitor.AggregateSymbolCollectorVisitor;
@@ -1420,6 +1340,17 @@
if (isNull(leftExpr) || isNull(rightExpr)) {
return UNKNOWN_CRITERIA;
}
+
+ if (leftExpr.equals(rightExpr)) {
+ switch(criteria.getOperator()) {
+ case CompareCriteria.LE:
+ case CompareCriteria.GE:
+ case CompareCriteria.EQ:
+ return getSimpliedCriteria(criteria, criteria.getLeftExpression(), true, true);
+ default:
+ return getSimpliedCriteria(criteria, criteria.getLeftExpression(), false, true);
+ }
+ }
boolean rightConstant = false;
if(EvaluatableVisitor.willBecomeConstant(rightExpr)) {
Modified: branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java
===================================================================
--- branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java 2012-02-28 21:20:57 UTC (rev 3902)
+++ branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java 2012-02-29 15:56:53 UTC (rev 3903)
@@ -286,7 +286,7 @@
TestOptimizer.helpPlan(sql, metadata,
new String[] {
- "SELECT g_0.e2, g_0.e1 FROM pm5.g1 AS g_0 WHERE g_0.e1 IN (<dependent values>)", //$NON-NLS-1$
+ "SELECT g_0.e2, g_0.e1 FROM pm5.g1 AS g_0 WHERE (g_0.e1 IN (<dependent values>)) AND (g_0.e1 IN (<dependent values>))", //$NON-NLS-1$
"SELECT g_0.e1, g_0.e2, g_0.e3, g_0.e4 FROM pm1.g1 AS g_0", //$NON-NLS-1$
"SELECT g_0.e1 FROM pm4.g1 AS g_0 WHERE g_0.e1 IN (<dependent values>)" }, TestOptimizer.getGenericFinder(false), ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$
}
Modified: branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java
===================================================================
--- branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java 2012-02-28 21:20:57 UTC (rev 3902)
+++ branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java 2012-02-29 15:56:53 UTC (rev 3903)
@@ -757,7 +757,7 @@
"SELECT table1comp.IntKey, table1comp.key1, BQT1.SmallA.StringKey FROM (SELECT t1.*, (STRINGKEY || STRINGNUM) AS key1 FROM BQT2.SmallA AS t1) AS table1comp, BQT1.SmallA WHERE table1comp.key1 = BQT1.SmallA.StringKey AND table1comp.key1 = BQT1.SmallA.StringNum", //$NON-NLS-1$
metadata,
null, capFinder,
- new String[] {"SELECT g_0.STRINGKEY, g_0.STRINGNUM, g_0.IntKey FROM BQT2.SmallA AS g_0", "SELECT g_0.StringKey, g_0.StringNum FROM BQT1.SmallA AS g_0 WHERE (g_0.StringKey IN (<dependent values>)) AND (g_0.StringNum IN (<dependent values>))"}, //$NON-NLS-1$ //$NON-NLS-2$
+ new String[] {"SELECT g_0.STRINGKEY, g_0.STRINGNUM, g_0.IntKey FROM BQT2.SmallA AS g_0", "SELECT g_0.StringKey, g_0.StringNum FROM BQT1.SmallA AS g_0 WHERE (g_0.StringNum = g_0.StringKey) AND (g_0.StringKey IN (<dependent values>)) AND (g_0.StringNum IN (<dependent values>))"}, //$NON-NLS-1$ //$NON-NLS-2$
TestOptimizer.ComparisonMode.EXACT_COMMAND_STRING );
TestOptimizer.checkNodeTypes(plan, new int[] {
Modified: branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java
===================================================================
--- branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java 2012-02-28 21:20:57 UTC (rev 3902)
+++ branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java 2012-02-29 15:56:53 UTC (rev 3903)
@@ -1038,12 +1038,12 @@
RealMetadataFactory.setCardinality("bqt2.smallb", 15662, metadata); //$NON-NLS-1$
TestOptimizer.helpPlan(
- "SELECT BQT1.SmallA.IntKey FROM BQT1.SmallB, BQT1.Smalla, bqt2.smallb where bqt2.smallb.intkey = bqt1.smallb.intkey and bqt2.smallb.intkey = bqt1.smalla.intkey", //$NON-NLS-1$
+ "SELECT BQT1.SmallA.IntKey FROM BQT1.SmallB, BQT1.Smalla, bqt2.smallb where bqt2.smallb.intkey = bqt1.smallb.intkey and bqt2.smallb.stringkey = bqt1.smalla.stringkey", //$NON-NLS-1$
metadata,
null, capFinder,
- new String[] {"SELECT g_0.intkey AS c_0 FROM BQT1.Smalla AS g_0 ORDER BY c_0",
+ new String[] {"SELECT g_0.stringkey AS c_0, g_0.intkey AS c_1 FROM bqt2.smallb AS g_0 ORDER BY c_0",
"SELECT g_0.intkey AS c_0 FROM BQT1.SmallB AS g_0 ORDER BY c_0",
- "SELECT g_0.intkey AS c_0 FROM bqt2.smallb AS g_0 ORDER BY c_0"}, //$NON-NLS-1$ //$NON-NLS-2$
+ "SELECT g_0.stringkey AS c_0, g_0.IntKey AS c_1 FROM BQT1.Smalla AS g_0 ORDER BY c_0"}, //$NON-NLS-1$ //$NON-NLS-2$
ComparisonMode.EXACT_COMMAND_STRING );
}
Modified: branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java
===================================================================
--- branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2012-02-28 21:20:57 UTC (rev 3902)
+++ branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2012-02-29 15:56:53 UTC (rev 3903)
@@ -7060,10 +7060,6 @@
helpProcess(plan, manager, expected);
}
- /**
- * Here a merge join will be used since there is at least one equi join predicate.
- * TODO: this can be optimized further
- */
@Test public void testCase6193_1() throws Exception {
// Create query
String sql = "select a.INTKEY, b.intkey from bqt1.smalla a LEFT OUTER JOIN bqt2.SMALLA b on a.intkey=b.intkey and a.intkey=5 where a.intkey <10 "; //$NON-NLS-1$
@@ -7101,12 +7097,12 @@
0, // DependentProject
0, // DupRemove
0, // Grouping
- 0, // NestedLoopJoinStrategy
- 1, // MergeJoinStrategy
+ 1, // NestedLoopJoinStrategy
+ 0, // MergeJoinStrategy
0, // Null
0, // PlanExecution
1, // Project
- 1, // Select
+ 2, // Select
0, // Sort
0 // UnionAll
});
@@ -7731,5 +7727,23 @@
helpProcess(plan, cc, hdm, expected);
}
+ @Test public void testDupCriteria() {
+ String sql = "select * from pm1.g1 a left outer join pm1.g2 b on a.e1 = b.e1 where b.e2 = a.e1"; //$NON-NLS-1$
+
+ ProcessorPlan plan = helpGetPlan(sql, RealMetadataFactory.example1Cached());
+ FakeDataManager fdm = new FakeDataManager();
+ sampleData1(fdm);
+ helpProcess(plan, fdm, new List[0]);
+ }
+
+ @Test public void testDupCriteria1() {
+ String sql = "select count(*) from pm1.g1 a left outer join pm1.g2 b on a.e1 = b.e1 where b.e1 = a.e1"; //$NON-NLS-1$
+
+ ProcessorPlan plan = helpGetPlan(sql, RealMetadataFactory.example1Cached());
+ FakeDataManager fdm = new FakeDataManager();
+ sampleData1(fdm);
+ helpProcess(plan, fdm, new List[] {Arrays.asList(11)});
+ }
+
private static final boolean DEBUG = false;
}
Modified: branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java
===================================================================
--- branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java 2012-02-28 21:20:57 UTC (rev 3902)
+++ branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java 2012-02-29 15:56:53 UTC (rev 3903)
@@ -560,7 +560,7 @@
}
@Test public void testVirtualAccessVirtualDep() throws Exception {
- String sql = "SELECT a.e0, b.e2 FROM vTest.vGroup a inner join vTest.vGroup b on (a.e0 = b.e2 and a.e1 = b.e2) where b.e0=1 and b.e1='2'"; //$NON-NLS-1$
+ String sql = "SELECT a.e0, b.e2 FROM vTest.vGroup a inner join vTest.vGroup b on (a.e0 = b.e2 and a.e1 = b.e0) where b.e0=1 and b.e1='2'"; //$NON-NLS-1$
BasicSourceCapabilities caps = TestOptimizer.getTypicalCapabilities();
caps.setFunctionSupport("convert", true); //$NON-NLS-1$
@@ -568,8 +568,8 @@
finder.addCapabilities("test", caps); //$NON-NLS-1$
ProcessorPlan plan = TestOptimizer.helpPlan(sql, TestValidator.exampleMetadata4(), null, finder,
- new String[] {"SELECT g_0.e2 AS c_0 FROM test.\"group\" AS g_0 WHERE (g_0.e0 = 1) AND (g_0.e1 = '2') ORDER BY c_0", //$NON-NLS-1$
- "SELECT g_0.e0 AS c_0, g_0.e1 AS c_1, g_0.e0 AS c_2 FROM test.\"group\" AS g_0 WHERE (g_0.e0 IN (<dependent values>)) AND (g_0.e1 IN (<dependent values>)) ORDER BY c_2, c_1"}, TestOptimizer.ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$
+ new String[] {"SELECT g_0.e0 AS c_0, g_0.e0 AS c_1 FROM test.\"group\" AS g_0 WHERE (g_0.e1 = '1') AND (g_0.e0 IN (<dependent values>)) ORDER BY c_1",
+ "SELECT g_0.e2 AS c_0 FROM test.\"group\" AS g_0 WHERE (g_0.e0 = 1) AND (g_0.e1 = '2') ORDER BY c_0"}, TestOptimizer.ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$
TestOptimizer.checkNodeTypes(plan, new int[] {
1, // Access
@@ -594,7 +594,7 @@
*
*/
@Test public void testVirtualAccessVirtualDep2() {
- String sql = "SELECT a.e0, b.e2 FROM vTest.vGroup a makenotdep inner join vTest.vGroup b on (a.e0 = b.e2 and a.e1 = b.e2) where b.e0=1 and b.e1='2'"; //$NON-NLS-1$
+ String sql = "SELECT a.e0, b.e2 FROM vTest.vGroup a makenotdep inner join vTest.vGroup b on (a.e0 = b.e2 and a.e1 = b.e0) where b.e0=1 and b.e1='2'"; //$NON-NLS-1$
BasicSourceCapabilities caps = TestOptimizer.getTypicalCapabilities();
caps.setFunctionSupport("convert", true); //$NON-NLS-1$
12 years, 2 months
- 1
- 0
teiid SVN: r3902 - in trunk: build/kits/jboss-as7/domain/configuration and 8 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-02-28 16:20:57 -0500 (Tue, 28 Feb 2012)
New Revision: 3902
Modified:
trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml
trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml
trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/main/module.xml
trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/ws/main/module.xml
trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml
trunk/jboss-integration/pom.xml
trunk/jboss-integration/src/main/java/org/teiid/jboss/RoleBasedCredentialMapIdentityLoginModule.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorAdd.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorDependencyDeployer.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDependencyDeployer.java
trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
trunk/pom.xml
trunk/test-integration/common/pom.xml
trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestReplication.java
Log:
TEIID-1955: upgrading to JBoss AS 7.1.0-Final as base
Modified: trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml
===================================================================
--- trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml 2012-02-28 19:35:14 UTC (rev 3901)
+++ trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml 2012-02-28 21:20:57 UTC (rev 3902)
@@ -6,20 +6,24 @@
<extension module="org.jboss.as.clustering.infinispan"/>
<extension module="org.jboss.as.clustering.jgroups"/>
<extension module="org.jboss.as.cmp"/>
+ <extension module="org.jboss.as.configadmin"/>
<extension module="org.jboss.as.connector"/>
<extension module="org.jboss.as.ee"/>
<extension module="org.jboss.as.ejb3"/>
<extension module="org.jboss.as.jacorb"/>
+ <extension module="org.jboss.as.jaxr"/>
<extension module="org.jboss.as.jaxrs"/>
<extension module="org.jboss.as.jdr"/>
<extension module="org.jboss.as.jmx"/>
<extension module="org.jboss.as.jpa"/>
+ <extension module="org.jboss.as.jsr77"/>
<extension module="org.jboss.as.logging"/>
<extension module="org.jboss.as.mail"/>
<extension module="org.jboss.as.messaging"/>
<extension module="org.jboss.as.modcluster"/>
<extension module="org.jboss.as.naming"/>
<extension module="org.jboss.as.osgi"/>
+ <extension module="org.jboss.as.pojo"/>
<extension module="org.jboss.as.remoting"/>
<extension module="org.jboss.as.sar"/>
<extension module="org.jboss.as.security"/>
@@ -51,6 +55,7 @@
</formatter>
<file relative-to="jboss.server.log.dir" path="server.log"/>
<suffix value=".yyyy-MM-dd"/>
+ <append value="true"/>
</periodic-rotating-file-handler>
<logger category="com.arjuna">
<level name="WARN"/>
@@ -75,12 +80,12 @@
</handlers>
</root-logger>
</subsystem>
+ <subsystem xmlns="urn:jboss:domain:configadmin:1.0"/>
<subsystem xmlns="urn:jboss:domain:datasources:1.0">
<datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" pool-name="java:jboss/datasources/ExampleDS">
+ <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
<driver>h2</driver>
- <pool></pool>
<security>
<user-name>sa</user-name>
<password>sa</password>
@@ -94,7 +99,7 @@
</datasources>
</subsystem>
<subsystem xmlns="urn:jboss:domain:ee:1.0"/>
- <subsystem xmlns="urn:jboss:domain:ejb3:1.2" >
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.2">
<session-bean>
<stateless>
<bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
@@ -119,7 +124,7 @@
</caches>
<passivation-stores>
<file-passivation-store name="file"/>
- <cluster-passivation-store name="infinispan" backing-cache="sfsb"/>
+ <cluster-passivation-store name="infinispan" cache-container="ejb"/>
</passivation-stores>
<async thread-pool-name="default"/>
<timer-service thread-pool-name="default">
@@ -127,49 +132,676 @@
</timer-service>
<remote connector-ref="remoting-connector" thread-pool-name="default"/>
<thread-pools>
- <thread-pool name="default" max-threads="10" keepalive-time="100"/>
+ <thread-pool name="default">
+ <max-threads count="10"/>
+ <keepalive-time time="100" unit="milliseconds"/>
+ </thread-pool>
</thread-pools>
- <iiop enable-by-default="true" use-qualified-name="true"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="cluster">
- <cache-container name="cluster" default-cache="default">
- <alias>ha-partition</alias>
+ <cache-container name="cluster" aliases="ha-partition" default-cache="default">
+ <transport lock-timeout="60000"/>
<replicated-cache name="default" mode="SYNC" batching="true">
<locking isolation="REPEATABLE_READ"/>
</replicated-cache>
</cache-container>
- <cache-container name="web" default-cache="repl">
- <alias>standard-session-cache</alias>
+ <cache-container name="web" aliases="standard-session-cache" default-cache="repl">
+ <transport lock-timeout="60000"/>
<replicated-cache name="repl" mode="ASYNC" batching="true">
<file-store/>
</replicated-cache>
+ <replicated-cache name="sso" mode="SYNC" batching="true"/>
<distributed-cache name="dist" mode="ASYNC" batching="true">
<file-store/>
</distributed-cache>
- <replicated-cache name="registry" mode="SYNC" batching="true"/>
- <replicated-cache name="sso" mode="SYNC" batching="true"/>
</cache-container>
- <cache-container name="sfsb" default-cache="repl">
- <alias>sfsb-cache</alias>
+ <cache-container name="ejb" aliases="sfsb sfsb-cache" default-cache="repl">
+ <transport lock-timeout="60000"/>
<replicated-cache name="repl" mode="ASYNC" batching="true">
<eviction strategy="LRU"/>
<file-store/>
</replicated-cache>
+ <!-- Clustered cache used internally by EJB subsytem for managing the client-mapping(s) of
+ the socketbinding referenced by the EJB remoting connector -->
+ <replicated-cache name="remote-connector-client-mappings" mode="SYNC" batching="true"/>
<distributed-cache name="dist" mode="ASYNC" batching="true">
<eviction strategy="LRU"/>
<file-store/>
</distributed-cache>
</cache-container>
<cache-container name="hibernate" default-cache="local-query">
+ <transport lock-timeout="60000"/>
+ <local-cache name="local-query">
+ <transaction mode="NONE"/>
+ <eviction strategy="LRU" max-entries="10000"/>
+ <expiration max-idle="100000"/>
+ </local-cache>
<invalidation-cache name="entity" mode="SYNC">
+ <transaction mode="NON_XA"/>
<eviction strategy="LRU" max-entries="10000"/>
<expiration max-idle="100000"/>
</invalidation-cache>
+ <replicated-cache name="timestamps" mode="ASYNC">
+ <transaction mode="NONE"/>
+ <eviction strategy="NONE"/>
+ </replicated-cache>
+ </cache-container>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jca:1.1">
+ <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
+ <bean-validation enabled="false"/>
+ <default-workmanager>
+ <short-running-threads>
+ <core-threads count="50"/>
+ <queue-length count="50"/>
+ <max-threads count="50"/>
+ <keepalive-time time="10" unit="seconds"/>
+ </short-running-threads>
+ <long-running-threads>
+ <core-threads count="50"/>
+ <queue-length count="50"/>
+ <max-threads count="50"/>
+ <keepalive-time time="10" unit="seconds"/>
+ </long-running-threads>
+ </default-workmanager>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jgroups:1.1" default-stack="udp">
+ <stack name="udp">
+ <transport type="UDP" socket-binding="jgroups-udp" diagnostics-socket-binding="jgroups-diagnostics"/>
+ <protocol type="PING"/>
+ <protocol type="MERGE2"/>
+ <protocol type="FD_SOCK" socket-binding="jgroups-udp-fd"/>
+ <protocol type="FD"/>
+ <protocol type="VERIFY_SUSPECT"/>
+ <protocol type="BARRIER"/>
+ <protocol type="pbcast.NAKACK"/>
+ <protocol type="UNICAST2"/>
+ <protocol type="pbcast.STABLE"/>
+ <protocol type="pbcast.GMS"/>
+ <protocol type="UFC"/>
+ <protocol type="MFC"/>
+ <protocol type="FRAG2"/>
+ </stack>
+ <stack name="tcp">
+ <transport type="TCP" socket-binding="jgroups-tcp" diagnostics-socket-binding="jgroups-diagnostics"/>
+ <protocol type="MPING" socket-binding="jgroups-mping"/>
+ <protocol type="MERGE2"/>
+ <protocol type="FD_SOCK" socket-binding="jgroups-tcp-fd"/>
+ <protocol type="FD"/>
+ <protocol type="VERIFY_SUSPECT"/>
+ <protocol type="BARRIER"/>
+ <protocol type="pbcast.NAKACK"/>
+ <protocol type="UNICAST2"/>
+ <protocol type="pbcast.STABLE"/>
+ <protocol type="pbcast.GMS"/>
+ <protocol type="UFC"/>
+ <protocol type="MFC"/>
+ <protocol type="FRAG2"/>
+ </stack>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jmx:1.1">
+ <show-model value="true"/>
+ <remoting-connector/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jpa:1.0">
+ <jpa default-datasource=""/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:mail:1.0">
+ <mail-session jndi-name="java:jboss/mail/Default">
+ <smtp-server outbound-socket-binding-ref="mail-smtp"/>
+ </mail-session>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:modcluster:1.0">
+ <mod-cluster-config advertise-socket="modcluster"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:naming:1.1"/>
+ <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="lazy">
+ <properties>
+ <!-- Specifies the beginning start level of the framework -->
+ <property name="org.osgi.framework.startlevel.beginning">1</property>
+ </properties>
+ <capabilities>
+ <!-- modules registered with the OSGi layer on startup -->
+ <capability name="javax.servlet.api:v25"/>
+ <capability name="javax.transaction.api"/>
+ <!-- bundles started in startlevel 1 -->
+ <capability name="org.apache.felix.log" startlevel="1"/>
+ <capability name="org.jboss.osgi.logging" startlevel="1"/>
+ <capability name="org.apache.felix.configadmin" startlevel="1"/>
+ <capability name="org.jboss.as.osgi.configadmin" startlevel="1"/>
+ </capabilities>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:remoting:1.1">
+ <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:security:1.1">
+ <security-domains>
+ <security-domain name="other" cache-type="default">
+ <authentication>
+ <login-module code="Remoting" flag="optional">
+ <module-option name="password-stacking" value="useFirstPass"/>
+ </login-module>
+ <login-module code="RealmUsersRoles" flag="required">
+ <module-option name="usersProperties" value="${jboss.domain.config.dir}/application-users.properties"/>
+ <module-option name="rolesProperties" value="${jboss.domain.config.dir}/application-roles.properties"/>
+ <module-option name="realm" value="ApplicationRealm"/>
+ <module-option name="password-stacking" value="useFirstPass"/>
+ </login-module>
+ </authentication>
+ </security-domain>
+ <security-domain name="jboss-web-policy" cache-type="default">
+ <authorization>
+ <policy-module code="Delegating" flag="required"/>
+ </authorization>
+ </security-domain>
+ <security-domain name="jboss-ejb-policy" cache-type="default">
+ <authorization>
+ <policy-module code="Delegating" flag="required"/>
+ </authorization>
+ </security-domain>
+ </security-domains>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
+ <subsystem xmlns="urn:jboss:domain:transactions:1.1">
+ <core-environment>
+ <process-id>
+ <uuid/>
+ </process-id>
+ </core-environment>
+ <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+ <coordinator-environment default-timeout="300"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host" native="false">
+ <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/>
+ <virtual-server name="default-host" enable-welcome-root="true">
+ <alias name="localhost"/>
+ <alias name="example.com"/>
+ </virtual-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:webservices:1.1">
+ <modify-wsdl-address>true</modify-wsdl-address>
+ <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
+ <endpoint-config name="Standard-Endpoint-Config"/>
+ <endpoint-config name="Recording-Endpoint-Config">
+ <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
+ <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
+ </pre-handler-chain>
+ </endpoint-config>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+ </profile>
+
+ <profile name="full">
+ <subsystem xmlns="urn:jboss:domain:logging:1.1">
+ <console-handler name="CONSOLE">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ </console-handler>
+ <periodic-rotating-file-handler name="FILE">
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ <file relative-to="jboss.server.log.dir" path="server.log"/>
+ <suffix value=".yyyy-MM-dd"/>
+ <append value="true"/>
+ </periodic-rotating-file-handler>
+ <logger category="com.arjuna">
+ <level name="WARN"/>
+ </logger>
+ <logger category="org.apache.tomcat.util.modeler">
+ <level name="WARN"/>
+ </logger>
+ <logger category="sun.rmi">
+ <level name="WARN"/>
+ </logger>
+ <logger category="jacorb">
+ <level name="WARN"/>
+ </logger>
+ <logger category="jacorb.config">
+ <level name="ERROR"/>
+ </logger>
+ <root-logger>
+ <level name="INFO"/>
+ <handlers>
+ <handler name="CONSOLE"/>
+ <handler name="FILE"/>
+ </handlers>
+ </root-logger>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:cmp:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:configadmin:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:datasources:1.0">
+ <datasources>
+ <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
+ <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
+ <driver>h2</driver>
+ <security>
+ <user-name>sa</user-name>
+ <password>sa</password>
+ </security>
+ </datasource>
+ <drivers>
+ <driver name="h2" module="com.h2database.h2">
+ <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+ </driver>
+ </drivers>
+ </datasources>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ee:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.2">
+ <session-bean>
+ <stateless>
+ <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+ </stateless>
+ <stateful default-access-timeout="5000" cache-ref="simple"/>
+ <singleton default-access-timeout="5000"/>
+ </session-bean>
+ <mdb>
+ <resource-adapter-ref resource-adapter-name="hornetq-ra"/>
+ <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
+ </mdb>
+ <pools>
+ <bean-instance-pools>
+ <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+ <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+ </bean-instance-pools>
+ </pools>
+ <caches>
+ <cache name="simple" aliases="NoPassivationCache"/>
+ <cache name="passivating" passivation-store-ref="file" aliases="SimpleStatefulCache"/>
+ </caches>
+ <passivation-stores>
+ <file-passivation-store name="file"/>
+ </passivation-stores>
+ <async thread-pool-name="default"/>
+ <timer-service thread-pool-name="default">
+ <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
+ </timer-service>
+ <remote connector-ref="remoting-connector" thread-pool-name="default"/>
+ <thread-pools>
+ <thread-pool name="default">
+ <max-threads count="10"/>
+ <keepalive-time time="100" unit="milliseconds"/>
+ </thread-pool>
+ </thread-pools>
+ <iiop enable-by-default="false" use-qualified-name="false"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="hibernate">
+ <cache-container name="hibernate" default-cache="local-query">
+ <local-cache name="entity">
+ <transaction mode="NON_XA"/>
+ <eviction strategy="LRU" max-entries="10000"/>
+ <expiration max-idle="100000"/>
+ </local-cache>
<local-cache name="local-query">
+ <transaction mode="NONE"/>
<eviction strategy="LRU" max-entries="10000"/>
<expiration max-idle="100000"/>
</local-cache>
+ <local-cache name="timestamps">
+ <transaction mode="NONE"/>
+ <eviction strategy="NONE"/>
+ </local-cache>
+ </cache-container>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jacorb:1.1">
+ <orb>
+ <initializers transactions="spec" security="on"/>
+ </orb>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxr:1.0">
+ <connection-factory jndi-name="java:jboss/jaxr/ConnectionFactory"/>
+ <juddi-server publish-url="http://localhost:8080/juddi/publish" query-url="http://localhost:8080/juddi/query"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jca:1.1">
+ <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
+ <bean-validation enabled="true"/>
+ <default-workmanager>
+ <short-running-threads>
+ <core-threads count="50"/>
+ <queue-length count="50"/>
+ <max-threads count="50"/>
+ <keepalive-time time="10" unit="seconds"/>
+ </short-running-threads>
+ <long-running-threads>
+ <core-threads count="50"/>
+ <queue-length count="50"/>
+ <max-threads count="50"/>
+ <keepalive-time time="10" unit="seconds"/>
+ </long-running-threads>
+ </default-workmanager>
+ <cached-connection-manager/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jmx:1.1">
+ <show-model value="true"/>
+ <remoting-connector/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jpa:1.0">
+ <jpa default-datasource=""/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:mail:1.0">
+ <mail-session jndi-name="java:jboss/mail/Default">
+ <smtp-server outbound-socket-binding-ref="mail-smtp"/>
+ </mail-session>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:messaging:1.1">
+ <hornetq-server>
+ <persistence-enabled>true</persistence-enabled>
+ <journal-file-size>102400</journal-file-size>
+ <journal-min-files>2</journal-min-files>
+
+ <connectors>
+ <netty-connector name="netty" socket-binding="messaging"/>
+ <netty-connector name="netty-throughput" socket-binding="messaging-throughput">
+ <param key="batch-delay" value="50"/>
+ </netty-connector>
+ <in-vm-connector name="in-vm" server-id="0"/>
+ </connectors>
+
+ <acceptors>
+ <netty-acceptor name="netty" socket-binding="messaging"/>
+ <netty-acceptor name="netty-throughput" socket-binding="messaging-throughput">
+ <param key="batch-delay" value="50"/>
+ <param key="direct-deliver" value="false"/>
+ </netty-acceptor>
+ <in-vm-acceptor name="in-vm" server-id="0"/>
+ </acceptors>
+
+ <security-settings>
+ <security-setting match="#">
+ <permission type="send" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>10485760</max-size-bytes>
+ <address-full-policy>BLOCK</address-full-policy>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-setting>
+ </address-settings>
+
+ <jms-connection-factories>
+ <connection-factory name="InVmConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="in-vm"/>
+ </connectors>
+ <entries>
+ <entry name="java:/ConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ <connection-factory name="RemoteConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
+ <entries>
+ <entry name="RemoteConnectionFactory"/>
+ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ <pooled-connection-factory name="hornetq-ra">
+ <transaction mode="xa"/>
+ <connectors>
+ <connector-ref connector-name="in-vm"/>
+ </connectors>
+ <entries>
+ <entry name="java:/JmsXA"/>
+ </entries>
+ </pooled-connection-factory>
+ </jms-connection-factories>
+
+ <jms-destinations>
+ <jms-queue name="testQueue">
+ <entry name="queue/test"/>
+ <entry name="java:jboss/exported/jms/queue/test"/>
+ </jms-queue>
+ <jms-topic name="testTopic">
+ <entry name="topic/test"/>
+ <entry name="java:jboss/exported/jms/topic/test"/>
+ </jms-topic>
+ </jms-destinations>
+ </hornetq-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:naming:1.1"/>
+ <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="lazy">
+ <properties>
+ <!-- Specifies the beginning start level of the framework -->
+ <property name="org.osgi.framework.startlevel.beginning">1</property>
+ </properties>
+ <capabilities>
+ <!-- modules registered with the OSGi layer on startup -->
+ <capability name="javax.servlet.api:v25"/>
+ <capability name="javax.transaction.api"/>
+ <!-- bundles started in startlevel 1 -->
+ <capability name="org.apache.felix.log" startlevel="1"/>
+ <capability name="org.jboss.osgi.logging" startlevel="1"/>
+ <capability name="org.apache.felix.configadmin" startlevel="1"/>
+ <capability name="org.jboss.as.osgi.configadmin" startlevel="1"/>
+ </capabilities>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:remoting:1.1">
+ <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:security:1.1">
+ <security-domains>
+ <security-domain name="other" cache-type="default">
+ <authentication>
+ <login-module code="Remoting" flag="optional">
+ <module-option name="password-stacking" value="useFirstPass"/>
+ </login-module>
+ <login-module code="RealmUsersRoles" flag="required">
+ <module-option name="usersProperties" value="${jboss.domain.config.dir}/application-users.properties"/>
+ <module-option name="rolesProperties" value="${jboss.domain.config.dir}/application-roles.properties"/>
+ <module-option name="realm" value="ApplicationRealm"/>
+ <module-option name="password-stacking" value="useFirstPass"/>
+ </login-module>
+ </authentication>
+ </security-domain>
+ <security-domain name="jboss-web-policy" cache-type="default">
+ <authorization>
+ <policy-module code="Delegating" flag="required"/>
+ </authorization>
+ </security-domain>
+ <security-domain name="jboss-ejb-policy" cache-type="default">
+ <authorization>
+ <policy-module code="Delegating" flag="required"/>
+ </authorization>
+ </security-domain>
+ </security-domains>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
+ <subsystem xmlns="urn:jboss:domain:transactions:1.1">
+ <core-environment>
+ <process-id>
+ <uuid/>
+ </process-id>
+ </core-environment>
+ <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+ <coordinator-environment default-timeout="300"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host" native="false">
+ <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/>
+ <virtual-server name="default-host" enable-welcome-root="true">
+ <alias name="localhost"/>
+ <alias name="example.com"/>
+ </virtual-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:webservices:1.1">
+ <modify-wsdl-address>true</modify-wsdl-address>
+ <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
+ <endpoint-config name="Standard-Endpoint-Config"/>
+ <endpoint-config name="Recording-Endpoint-Config">
+ <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
+ <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
+ </pre-handler-chain>
+ </endpoint-config>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+ </profile>
+
+ <profile name="full-ha">
+ <subsystem xmlns="urn:jboss:domain:logging:1.1">
+ <console-handler name="CONSOLE">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ </console-handler>
+ <periodic-rotating-file-handler name="FILE">
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ <file relative-to="jboss.server.log.dir" path="server.log"/>
+ <suffix value=".yyyy-MM-dd"/>
+ <append value="true"/>
+ </periodic-rotating-file-handler>
+ <logger category="com.arjuna">
+ <level name="WARN"/>
+ </logger>
+ <logger category="org.apache.tomcat.util.modeler">
+ <level name="WARN"/>
+ </logger>
+ <logger category="sun.rmi">
+ <level name="WARN"/>
+ </logger>
+ <logger category="jacorb">
+ <level name="WARN"/>
+ </logger>
+ <logger category="jacorb.config">
+ <level name="ERROR"/>
+ </logger>
+ <root-logger>
+ <level name="INFO"/>
+ <handlers>
+ <handler name="CONSOLE"/>
+ <handler name="FILE"/>
+ </handlers>
+ </root-logger>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:configadmin:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:datasources:1.0">
+ <datasources>
+ <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
+ <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
+ <driver>h2</driver>
+ <security>
+ <user-name>sa</user-name>
+ <password>sa</password>
+ </security>
+ </datasource>
+ <drivers>
+ <driver name="h2" module="com.h2database.h2">
+ <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+ </driver>
+ </drivers>
+ </datasources>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ee:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.2">
+ <session-bean>
+ <stateless>
+ <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+ </stateless>
+ <stateful default-access-timeout="5000" cache-ref="simple" clustered-cache-ref="clustered"/>
+ <singleton default-access-timeout="5000"/>
+ </session-bean>
+ <mdb>
+ <resource-adapter-ref resource-adapter-name="hornetq-ra"/>
+ <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
+ </mdb>
+ <pools>
+ <bean-instance-pools>
+ <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+ <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+ </bean-instance-pools>
+ </pools>
+ <caches>
+ <cache name="simple" aliases="NoPassivationCache"/>
+ <cache name="passivating" passivation-store-ref="file" aliases="SimpleStatefulCache"/>
+ <cache name="clustered" passivation-store-ref="infinispan" aliases="StatefulTreeCache"/>
+ </caches>
+ <passivation-stores>
+ <file-passivation-store name="file"/>
+ <cluster-passivation-store name="infinispan" cache-container="ejb"/>
+ </passivation-stores>
+ <async thread-pool-name="default"/>
+ <timer-service thread-pool-name="default">
+ <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
+ </timer-service>
+ <remote connector-ref="remoting-connector" thread-pool-name="default"/>
+ <thread-pools>
+ <thread-pool name="default">
+ <max-threads count="10"/>
+ <keepalive-time time="100" unit="milliseconds"/>
+ </thread-pool>
+ </thread-pools>
+ <iiop enable-by-default="false" use-qualified-name="false"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="cluster">
+ <cache-container name="cluster" aliases="ha-partition" default-cache="default">
+ <transport lock-timeout="60000"/>
+ <replicated-cache name="default" mode="SYNC" batching="true">
+ <locking isolation="REPEATABLE_READ"/>
+ </replicated-cache>
+ </cache-container>
+ <cache-container name="web" aliases="standard-session-cache" default-cache="repl">
+ <transport lock-timeout="60000"/>
+ <replicated-cache name="repl" mode="ASYNC" batching="true">
+ <file-store/>
+ </replicated-cache>
+ <replicated-cache name="sso" mode="SYNC" batching="true"/>
+ <distributed-cache name="dist" mode="ASYNC" batching="true">
+ <file-store/>
+ </distributed-cache>
+ </cache-container>
+ <cache-container name="ejb" aliases="sfsb sfsb-cache" default-cache="repl">
+ <transport lock-timeout="60000"/>
+ <replicated-cache name="repl" mode="ASYNC" batching="true">
+ <eviction strategy="LRU"/>
+ <file-store/>
+ </replicated-cache>
+ <!-- Clustered cache used internally by EJB subsytem for managing the client-mapping(s) of
+ the socketbinding referenced by the EJB remoting connector -->
+ <replicated-cache name="remote-connector-client-mappings" mode="SYNC" batching="true"/>
+ <distributed-cache name="dist" mode="ASYNC" batching="true">
+ <eviction strategy="LRU"/>
+ <file-store/>
+ </distributed-cache>
+ </cache-container>
+ <cache-container name="hibernate" default-cache="local-query">
+ <transport lock-timeout="60000"/>
+ <local-cache name="local-query">
+ <transaction mode="NONE"/>
+ <eviction strategy="LRU" max-entries="10000"/>
+ <expiration max-idle="100000"/>
+ </local-cache>
+ <invalidation-cache name="entity" mode="SYNC">
+ <transaction mode="NON_XA"/>
+ <eviction strategy="LRU" max-entries="10000"/>
+ <expiration max-idle="100000"/>
+ </invalidation-cache>
<replicated-cache name="timestamps" mode="ASYNC">
+ <transaction mode="NONE"/>
<eviction strategy="NONE"/>
</replicated-cache>
</cache-container>
@@ -182,28 +814,36 @@
</replicated-cache>
</cache-container>
</subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.1"/>
+ <subsystem xmlns="urn:jboss:domain:jacorb:1.1">
+ <orb>
+ <initializers transactions="spec" security="on"/>
+ </orb>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxr:1.0">
+ <connection-factory jndi-name="java:jboss/jaxr/ConnectionFactory"/>
+ <juddi-server publish-url="http://localhost:8080/juddi/publish" query-url="http://localhost:8080/juddi/query"/>
+ </subsystem>
<subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
<subsystem xmlns="urn:jboss:domain:jca:1.1">
- <archive-validation enabled="true"/>
+ <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
<bean-validation enabled="true"/>
<default-workmanager>
- <short-running-threads blocking="true">
- <core-threads count="10" per-cpu="20"/>
- <queue-length count="10" per-cpu="20"/>
- <max-threads count="10" per-cpu="20"/>
+ <short-running-threads>
+ <core-threads count="50"/>
+ <queue-length count="50"/>
+ <max-threads count="50"/>
<keepalive-time time="10" unit="seconds"/>
</short-running-threads>
- <long-running-threads blocking="true">
- <core-threads count="10" per-cpu="20"/>
- <queue-length count="10" per-cpu="20"/>
- <max-threads count="10" per-cpu="20"/>
+ <long-running-threads>
+ <core-threads count="50"/>
+ <queue-length count="50"/>
+ <max-threads count="50"/>
<keepalive-time time="10" unit="seconds"/>
</long-running-threads>
</default-workmanager>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jgroups:1.0" default-stack="udp">
+ <subsystem xmlns="urn:jboss:domain:jgroups:1.1" default-stack="udp">
<stack name="udp">
<transport type="UDP" socket-binding="jgroups-udp" diagnostics-socket-binding="jgroups-diagnostics"/>
<protocol type="PING"/>
@@ -219,8 +859,6 @@
<protocol type="UFC"/>
<protocol type="MFC"/>
<protocol type="FRAG2"/>
- <protocol type="pbcast.STATE_TRANSFER"/>
- <protocol type="pbcast.FLUSH"/>
</stack>
<stack name="tcp">
<transport type="TCP" socket-binding="jgroups-tcp" diagnostics-socket-binding="jgroups-diagnostics"/>
@@ -237,16 +875,16 @@
<protocol type="UFC"/>
<protocol type="MFC"/>
<protocol type="FRAG2"/>
- <protocol type="pbcast.STATE_TRANSFER"/>
- <protocol type="pbcast.FLUSH"/>
</stack>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jmx:1.1">
<show-model value="true"/>
+ <remoting-connector/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jpa:1.0">
- <jpa default-datasource=""/>
+ <jpa default-datasource=""/>
</subsystem>
+ <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
<subsystem xmlns="urn:jboss:domain:mail:1.0">
<mail-session jndi-name="java:jboss/mail/Default">
<smtp-server outbound-socket-binding-ref="mail-smtp"/>
@@ -254,9 +892,7 @@
</subsystem>
<subsystem xmlns="urn:jboss:domain:messaging:1.1">
<hornetq-server>
- <!-- disable messaging persistence -->
- <persistence-enabled>false</persistence-enabled>
- <!-- Default journal file size is 10Mb, reduced here to 100k for faster first boot -->
+ <persistence-enabled>true</persistence-enabled>
<journal-file-size>102400</journal-file-size>
<journal-min-files>2</journal-min-files>
@@ -293,8 +929,8 @@
<expiry-address>jms.queue.ExpiryQueue</expiry-address>
<redelivery-delay>0</redelivery-delay>
<max-size-bytes>10485760</max-size-bytes>
+ <address-full-policy>BLOCK</address-full-policy>
<message-counter-history-day-limit>10</message-counter-history-day-limit>
- <address-full-policy>BLOCK</address-full-policy>
</address-setting>
</address-settings>
@@ -313,6 +949,7 @@
</connectors>
<entries>
<entry name="RemoteConnectionFactory"/>
+ <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
</entries>
</connection-factory>
<pooled-connection-factory name="hornetq-ra">
@@ -329,9 +966,11 @@
<jms-destinations>
<jms-queue name="testQueue">
<entry name="queue/test"/>
+ <entry name="java:jboss/exported/jms/queue/test"/>
</jms-queue>
<jms-topic name="testTopic">
<entry name="topic/test"/>
+ <entry name="java:jboss/exported/jms/topic/test"/>
</jms-topic>
</jms-destinations>
</hornetq-server>
@@ -340,56 +979,53 @@
<mod-cluster-config advertise-socket="modcluster"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:naming:1.1"/>
- <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy">
- <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager">
- <property name="manager.root" value="jboss-osgi"/>
- </configuration>
+ <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="lazy">
<properties>
<!-- Specifies the beginning start level of the framework -->
<property name="org.osgi.framework.startlevel.beginning">1</property>
</properties>
<capabilities>
<!-- modules registered with the OSGi layer on startup -->
- <capability name="javax.api"/>
- <capability name="javax.servlet.api"/>
+ <capability name="javax.servlet.api:v25"/>
<capability name="javax.transaction.api"/>
- <!-- bundles installed on startup -->
- <capability name="org.apache.aries.util"/>
- <capability name="org.jboss.osgi.webconsole"/>
- <capability name="org.osgi.compendium"/>
<!-- bundles started in startlevel 1 -->
<capability name="org.apache.felix.log" startlevel="1"/>
<capability name="org.jboss.osgi.logging" startlevel="1"/>
<capability name="org.apache.felix.configadmin" startlevel="1"/>
<capability name="org.jboss.as.osgi.configadmin" startlevel="1"/>
- <!-- bundles started in startlevel 2 -->
- <capability name="org.apache.aries.jmx" startlevel="2"/>
- <capability name="org.apache.felix.eventadmin" startlevel="2"/>
- <capability name="org.apache.felix.metatype" startlevel="2"/>
- <capability name="org.apache.felix.scr" startlevel="2"/>
- <capability name="org.apache.felix.webconsole" startlevel="2"/>
- <capability name="org.jboss.netty" startlevel="2"/>
- <capability name="org.jboss.osgi.jmx" startlevel="2"/>
- <capability name="org.jboss.osgi.http" startlevel="2"/>
- <capability name="org.projectodd.stilts" startlevel="2"/>
- <!-- bundles started in startlevel 3 -->
- <capability name="org.jboss.osgi.blueprint" startlevel="3"/>
- <capability name="org.jboss.osgi.webapp" startlevel="3"/>
- <capability name="org.jboss.osgi.xerces" startlevel="3"/>
</capabilities>
</subsystem>
+ <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
<subsystem xmlns="urn:jboss:domain:remoting:1.1">
- <connector name="remoting-connector" socket-binding="remoting"/>
+ <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:resource-adapters:1.0"/>
<subsystem xmlns="urn:jboss:domain:sar:1.0"/>
<subsystem xmlns="urn:jboss:domain:security:1.1">
<security-domains>
- <security-domain name="other">
+ <security-domain name="other" cache-type="default">
<authentication>
- <login-module code="UsersRoles" flag="required"/>
+ <login-module code="Remoting" flag="optional">
+ <module-option name="password-stacking" value="useFirstPass"/>
+ </login-module>
+ <login-module code="RealmUsersRoles" flag="required">
+ <module-option name="usersProperties" value="${jboss.domain.config.dir}/application-users.properties"/>
+ <module-option name="rolesProperties" value="${jboss.domain.config.dir}/application-roles.properties"/>
+ <module-option name="realm" value="ApplicationRealm"/>
+ <module-option name="password-stacking" value="useFirstPass"/>
+ </login-module>
</authentication>
</security-domain>
+ <security-domain name="jboss-web-policy" cache-type="default">
+ <authorization>
+ <policy-module code="Delegating" flag="required"/>
+ </authorization>
+ </security-domain>
+ <security-domain name="jboss-ejb-policy" cache-type="default">
+ <authorization>
+ <policy-module code="Delegating" flag="required"/>
+ </authorization>
+ </security-domain>
<security-domain name="teiid-security" cache-type="default">
<authentication>
<login-module code="UsersRoles" flag="required">
@@ -397,7 +1033,7 @@
<module-option name="rolesProperties" value="teiid-security-roles.properties"/>
</login-module>
</authentication>
- </security-domain>
+ </security-domain>
</security-domains>
</subsystem>
<subsystem xmlns="urn:jboss:domain:teiid:1.0">
@@ -443,50 +1079,37 @@
<translator name="ws" module="org.jboss.teiid.translator.ws"/>
<translator name="salesforce" module="org.jboss.teiid.translator.salesforce"/>
<translator name="hive" module="org.jboss.teiid.translator.hive"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.0">
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:threads:1.1">
<queueless-thread-pool name="teiid-async">
- <max-threads count="2" per-cpu="2" />
+ <max-threads count="2"/>
</queueless-thread-pool>
- </subsystem>
+ </subsystem>
<subsystem xmlns="urn:jboss:domain:transactions:1.1">
<core-environment>
<process-id>
- <uuid />
+ <uuid/>
</process-id>
</core-environment>
<recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
<coordinator-environment default-timeout="300"/>
</subsystem>
- <subsystem xmlns="urn:jboss:domain:web:1.0" default-virtual-server="default-host">
+ <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host" native="false">
<connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/>
<virtual-server name="default-host" enable-welcome-root="true">
<alias name="localhost"/>
<alias name="example.com"/>
</virtual-server>
</subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.0" xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:jaxwsconfig="urn:jboss:jbossws-jaxws-config:4.0">
+ <subsystem xmlns="urn:jboss:domain:webservices:1.1">
<modify-wsdl-address>true</modify-wsdl-address>
<wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <!--
- <wsdl-port>8080</wsdl-port>
- <wsdl-secure-port>8443</wsdl-secure-port>
- -->
- <endpoint-config>
- <jaxwsconfig:config-name>Standard-Endpoint-Config</jaxwsconfig:config-name>
+ <endpoint-config name="Standard-Endpoint-Config"/>
+ <endpoint-config name="Recording-Endpoint-Config">
+ <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
+ <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
+ </pre-handler-chain>
</endpoint-config>
- <endpoint-config>
- <jaxwsconfig:config-name>Recording-Endpoint-Config</jaxwsconfig:config-name>
- <jaxwsconfig:pre-handler-chains>
- <javaee:handler-chain xmlns="http://java.sun.com/xml/ns/javaee">
- <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM</javaee:protocol-bindings>
- <javaee:handler>
- <javaee:handler-name>RecordingHandler</javaee:handler-name>
- <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class>
- </javaee:handler>
- </javaee:handler-chain>
- </jaxwsconfig:pre-handler-chains>
- </endpoint-config>
</subsystem>
<subsystem xmlns="urn:jboss:domain:weld:1.0"/>
</profile>
@@ -502,25 +1125,24 @@
<interfaces>
<interface name="management"/>
<interface name="public"/>
+ <interface name="unsecure"/>
</interfaces>
<socket-binding-groups>
<socket-binding-group name="ha-sockets" default-interface="public">
<socket-binding name="http" port="8080"/>
<socket-binding name="https" port="8443"/>
- <socket-binding name="jacorb" port="3528"/>
- <socket-binding name="jacorb-ssl" port="3529"/>
+ <socket-binding name="jacorb" interface="unsecure" port="3528"/>
+ <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
<socket-binding name="jgroups-diagnostics" port="0" multicast-address="224.0.75.75" multicast-port="7500"/>
<socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
<socket-binding name="jgroups-tcp" port="7600"/>
<socket-binding name="jgroups-tcp-fd" port="57600"/>
<socket-binding name="jgroups-udp" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
<socket-binding name="jgroups-udp-fd" port="54200"/>
- <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
- <socket-binding name="jmx-connector-server" interface="management" port="1091"/>
<socket-binding name="messaging" port="5445"/>
<socket-binding name="messaging-throughput" port="5455"/>
- <socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/>
+ <socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/>
<socket-binding name="osgi-http" interface="management" port="8090"/>
<socket-binding name="remoting" port="4447"/>
<socket-binding name="txn-recovery-environment" port="4712"/>
@@ -536,7 +1158,7 @@
<server-groups>
<server-group name="main-server-group" profile="ha">
<jvm name="default">
- <heap size="1024m" max-size="2048m"/>
+ <heap size="1024m" max-size="2048m"/>
</jvm>
<socket-binding-group ref="ha-sockets"/>
</server-group>
Modified: trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml
===================================================================
--- trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml 2012-02-28 19:35:14 UTC (rev 3901)
+++ trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml 2012-02-28 21:20:57 UTC (rev 3902)
@@ -9,6 +9,11 @@
<properties path="mgmt-users.properties" relative-to="jboss.domain.config.dir"/>
</authentication>
</security-realm>
+ <security-realm name="ApplicationRealm">
+ <authentication>
+ <properties path="application-users.properties" relative-to="jboss.domain.config.dir" />
+ </authentication>
+ </security-realm>
</security-realms>
<management-interfaces>
<native-interface security-realm="ManagementRealm">
@@ -33,11 +38,20 @@
<interface name="public">
<inet-address value="${jboss.bind.address:127.0.0.1}"/>
</interface>
+ <interface name="unsecure">
+ <!-- Used for IIOP sockets in the standarad configuration.
+ To secure JacORB you need to setup SSL -->
+ <inet-address value="127.0.0.1"/>
+ </interface>
</interfaces>
<jvms>
<jvm name="default">
<heap size="64m" max-size="256m"/>
+ <permgen size="256m" max-size="256m"/>
+ <jvm-options>
+ <option value="-server"/>
+ </jvm-options>
</jvm>
</jvms>
@@ -51,11 +65,17 @@
</jvm>
-->
</server>
- <!--
+ <!--
<server name="server-two" group="main-server-group" auto-start="true">
+ <!-- server-two avoids port conflicts by incrementing the ports in
+ the default socket-group declared in the server-group -->
<socket-bindings port-offset="150"/>
</server>
+ <server name="server-three" group="other-server-group" auto-start="false">
+ <!-- server-three avoids port conflicts by incrementing the ports in
+ the default socket-group declared in the server-group -->
+ <socket-bindings port-offset="250"/>
+ </server>
-->
-
</servers>
</host>
Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/main/module.xml
===================================================================
--- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/main/module.xml 2012-02-28 19:35:14 UTC (rev 3901)
+++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/main/module.xml 2012-02-28 21:20:57 UTC (rev 3902)
@@ -12,6 +12,6 @@
<module name="org.jboss.teiid.api" />
<module name="org.jboss.teiid.translator.salesforce.api"/>
<module name="org.jboss.ws.cxf.jbossws-cxf-client"/>
- <module name="org.springframework.spring"/>
+ <module name="org.springframework.spring" optional="true"/>
</dependencies>
</module>
\ No newline at end of file
Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/ws/main/module.xml
===================================================================
--- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/ws/main/module.xml 2012-02-28 19:35:14 UTC (rev 3901)
+++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/ws/main/module.xml 2012-02-28 21:20:57 UTC (rev 3902)
@@ -11,5 +11,6 @@
<module name="javax.resource.api"/>
<module name="org.jboss.teiid.common-core" />
<module name="org.jboss.teiid.api" />
+ <module name="org.springframework.spring" optional="true"/>
</dependencies>
</module>
Modified: trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml
===================================================================
--- trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2012-02-28 19:35:14 UTC (rev 3901)
+++ trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2012-02-28 21:20:57 UTC (rev 3902)
@@ -4,11 +4,11 @@
<extensions>
<extension module="org.jboss.as.clustering.infinispan"/>
+ <extension module="org.jboss.as.configadmin"/>
<extension module="org.jboss.as.connector"/>
<extension module="org.jboss.as.deployment-scanner"/>
<extension module="org.jboss.as.ee"/>
<extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jaxr"/>
<extension module="org.jboss.as.jaxrs"/>
<extension module="org.jboss.as.jdr"/>
<extension module="org.jboss.as.jmx"/>
@@ -36,6 +36,11 @@
<properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
</authentication>
</security-realm>
+ <security-realm name="ApplicationRealm">
+ <authentication>
+ <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
+ </authentication>
+ </security-realm>
</security-realms>
<management-interfaces>
<native-interface security-realm="ManagementRealm">
@@ -86,13 +91,12 @@
</handlers>
</root-logger>
</subsystem>
+ <subsystem xmlns="urn:jboss:domain:configadmin:1.0"/>
<subsystem xmlns="urn:jboss:domain:datasources:1.0">
<datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true"
- pool-name="ExampleDS">
+ <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
<driver>h2</driver>
- <pool></pool>
<security>
<user-name>sa</user-name>
<password>sa</password>
@@ -105,8 +109,8 @@
</drivers>
</datasources>
</subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0">
- <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments"/>
+ <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1">
+ <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:ee:1.0"/>
<subsystem xmlns="urn:jboss:domain:ejb3:1.2">
@@ -140,20 +144,26 @@
</timer-service>
<remote connector-ref="remoting-connector" thread-pool-name="default"/>
<thread-pools>
- <thread-pool name="default" max-threads="10" keepalive-time="100"/>
+ <thread-pool name="default">
+ <max-threads count="10"/>
+ <keepalive-time time="100" unit="milliseconds"/>
+ </thread-pool>
</thread-pools>
</subsystem>
<subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="hibernate">
<cache-container name="hibernate" default-cache="local-query">
<local-cache name="entity">
+ <transaction mode="NON_XA"/>
<eviction strategy="LRU" max-entries="10000"/>
<expiration max-idle="100000"/>
</local-cache>
<local-cache name="local-query">
+ <transaction mode="NONE"/>
<eviction strategy="LRU" max-entries="10000"/>
<expiration max-idle="100000"/>
</local-cache>
<local-cache name="timestamps">
+ <transaction mode="NONE"/>
<eviction strategy="NONE"/>
</local-cache>
</cache-container>
@@ -164,25 +174,21 @@
</local-cache>
</cache-container>
</subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxr:1.0">
- <connection-factory jndi-name="java:jboss/jaxr/ConnectionFactory"/>
- <juddi-server publish-url="http://localhost:8080/juddi/publish" query-url="http://localhost:8080/juddi/query"/>
- </subsystem>
<subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
<subsystem xmlns="urn:jboss:domain:jca:1.1">
- <archive-validation enabled="false"/>
+ <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
<bean-validation enabled="false"/>
<default-workmanager>
- <short-running-threads blocking="true">
- <core-threads count="10" per-cpu="20"/>
- <queue-length count="10" per-cpu="20"/>
- <max-threads count="10" per-cpu="20"/>
+ <short-running-threads>
+ <core-threads count="50"/>
+ <queue-length count="50"/>
+ <max-threads count="50"/>
<keepalive-time time="10" unit="seconds"/>
</short-running-threads>
- <long-running-threads blocking="true">
- <core-threads count="10" per-cpu="20"/>
- <queue-length count="10" per-cpu="20"/>
- <max-threads count="10" per-cpu="20"/>
+ <long-running-threads>
+ <core-threads count="50"/>
+ <queue-length count="50"/>
+ <max-threads count="50"/>
<keepalive-time time="10" unit="seconds"/>
</long-running-threads>
</default-workmanager>
@@ -190,6 +196,7 @@
<subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
<subsystem xmlns="urn:jboss:domain:jmx:1.1">
<show-model value="true"/>
+ <remoting-connector/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jpa:1.0">
<jpa default-datasource=""/>
@@ -200,47 +207,25 @@
</mail-session>
</subsystem>
<subsystem xmlns="urn:jboss:domain:naming:1.1"/>
- <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy">
- <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager">
- <property name="manager.root" value="jboss-osgi"/>
- </configuration>
+ <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="lazy">
<properties>
<!-- Specifies the beginning start level of the framework -->
<property name="org.osgi.framework.startlevel.beginning">1</property>
</properties>
<capabilities>
<!-- modules registered with the OSGi layer on startup -->
- <capability name="javax.api"/>
- <capability name="javax.servlet.api"/>
+ <capability name="javax.servlet.api:v25"/>
<capability name="javax.transaction.api"/>
- <!-- bundles installed on startup -->
- <capability name="org.apache.aries.util"/>
- <capability name="org.jboss.osgi.webconsole"/>
- <capability name="org.osgi.compendium"/>
<!-- bundles started in startlevel 1 -->
<capability name="org.apache.felix.log" startlevel="1"/>
<capability name="org.jboss.osgi.logging" startlevel="1"/>
<capability name="org.apache.felix.configadmin" startlevel="1"/>
<capability name="org.jboss.as.osgi.configadmin" startlevel="1"/>
- <!-- bundles started in startlevel 2 -->
- <capability name="org.apache.aries.jmx" startlevel="2"/>
- <capability name="org.apache.felix.eventadmin" startlevel="2"/>
- <capability name="org.apache.felix.metatype" startlevel="2"/>
- <capability name="org.apache.felix.scr" startlevel="2"/>
- <capability name="org.apache.felix.webconsole" startlevel="2"/>
- <capability name="org.jboss.netty" startlevel="2"/>
- <capability name="org.jboss.osgi.jmx" startlevel="2"/>
- <capability name="org.jboss.osgi.http" startlevel="2"/>
- <capability name="org.projectodd.stilts" startlevel="2"/>
- <!-- bundles started in startlevel 3 -->
- <capability name="org.jboss.osgi.blueprint" startlevel="3"/>
- <capability name="org.jboss.osgi.webapp" startlevel="3"/>
- <capability name="org.jboss.osgi.xerces" startlevel="3"/>
</capabilities>
</subsystem>
<subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
<subsystem xmlns="urn:jboss:domain:remoting:1.1">
- <connector name="remoting-connector" socket-binding="remoting"/>
+ <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:resource-adapters:1.0"/>
<subsystem xmlns="urn:jboss:domain:sar:1.0"/>
@@ -248,7 +233,15 @@
<security-domains>
<security-domain name="other" cache-type="default">
<authentication>
- <login-module code="UsersRoles" flag="required"/>
+ <login-module code="Remoting" flag="optional">
+ <module-option name="password-stacking" value="useFirstPass"/>
+ </login-module>
+ <login-module code="RealmUsersRoles" flag="required">
+ <module-option name="usersProperties" value="${jboss.server.config.dir}/application-users.properties"/>
+ <module-option name="rolesProperties" value="${jboss.server.config.dir}/application-roles.properties"/>
+ <module-option name="realm" value="ApplicationRealm"/>
+ <module-option name="password-stacking" value="useFirstPass"/>
+ </login-module>
</authentication>
</security-domain>
<security-domain name="jboss-web-policy" cache-type="default">
@@ -314,12 +307,12 @@
<translator name="salesforce" module="org.jboss.teiid.translator.salesforce"/>
<translator name="hive" module="org.jboss.teiid.translator.hive"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.0">
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:threads:1.1">
<queueless-thread-pool name="teiid-async">
- <max-threads count="2" per-cpu="2"/>
+ <max-threads count="2"/>
</queueless-thread-pool>
- </subsystem>
+ </subsystem>
<subsystem xmlns="urn:jboss:domain:transactions:1.1">
<core-environment>
<process-id>
@@ -329,35 +322,22 @@
<recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
<coordinator-environment default-timeout="300"/>
</subsystem>
- <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host">
+ <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host" native="false">
<connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/>
<virtual-server name="default-host" enable-welcome-root="true">
<alias name="localhost"/>
<alias name="example.com"/>
</virtual-server>
</subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.0" xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:jaxwsconfig="urn:jboss:jbossws-jaxws-config:4.0">
+ <subsystem xmlns="urn:jboss:domain:webservices:1.1">
<modify-wsdl-address>true</modify-wsdl-address>
<wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <!--
- <wsdl-port>8080</wsdl-port>
- <wsdl-secure-port>8443</wsdl-secure-port>
- -->
- <endpoint-config>
- <jaxwsconfig:config-name>Standard-Endpoint-Config</jaxwsconfig:config-name>
+ <endpoint-config name="Standard-Endpoint-Config"/>
+ <endpoint-config name="Recording-Endpoint-Config">
+ <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
+ <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
+ </pre-handler-chain>
</endpoint-config>
- <endpoint-config>
- <jaxwsconfig:config-name>Recording-Endpoint-Config</jaxwsconfig:config-name>
- <jaxwsconfig:pre-handler-chains>
- <javaee:handler-chain xmlns="http://java.sun.com/xml/ns/javaee">
- <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM</javaee:protocol-bindings>
- <javaee:handler>
- <javaee:handler-name>RecordingHandler</javaee:handler-name>
- <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class>
- </javaee:handler>
- </javaee:handler-chain>
- </jaxwsconfig:pre-handler-chains>
- </endpoint-config>
</subsystem>
<subsystem xmlns="urn:jboss:domain:weld:1.0"/>
</profile>
@@ -374,14 +354,9 @@
<socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
<socket-binding name="http" port="8080"/>
<socket-binding name="https" port="8443"/>
- <socket-binding name="jacorb" port="3528"/>
- <socket-binding name="jacorb-ssl" port="3529"/>
- <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
- <socket-binding name="jmx-connector-server" interface="management" port="1091"/>
<socket-binding name="management-native" interface="management" port="${jboss.management.native.port:9999}"/>
<socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="messaging" port="5445"/>
- <socket-binding name="messaging-throughput" port="5455"/>
+ <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
<socket-binding name="osgi-http" interface="management" port="8090"/>
<socket-binding name="remoting" port="4447"/>
<socket-binding name="txn-recovery-environment" port="4712"/>
@@ -392,5 +367,4 @@
<remote-destination host="localhost" port="25"/>
</outbound-socket-binding>
</socket-binding-group>
-
</server>
Modified: trunk/jboss-integration/pom.xml
===================================================================
--- trunk/jboss-integration/pom.xml 2012-02-28 19:35:14 UTC (rev 3901)
+++ trunk/jboss-integration/pom.xml 2012-02-28 21:20:57 UTC (rev 3902)
@@ -64,7 +64,7 @@
<artifactId>jboss-as-security</artifactId>
<scope>provided</scope>
</dependency>
-
+
<!-- This dependency is to read the ra.xml file details -->
<dependency>
<groupId>org.jboss.as</groupId>
@@ -78,11 +78,11 @@
<scope>provided</scope>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.picketbox</groupId>
<artifactId>jbosssx-client</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.jboss.as</groupId>
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/RoleBasedCredentialMapIdentityLoginModule.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/RoleBasedCredentialMapIdentityLoginModule.java 2012-02-28 19:35:14 UTC (rev 3901)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/RoleBasedCredentialMapIdentityLoginModule.java 2012-02-28 21:20:57 UTC (rev 3902)
@@ -42,9 +42,9 @@
import javax.security.auth.login.LoginException;
import org.jboss.logging.Logger;
-import org.jboss.resource.security.AbstractPasswordCredentialLoginModule;
import org.jboss.security.Base64Utils;
import org.jboss.security.SimplePrincipal;
+import org.picketbox.datasource.security.AbstractPasswordCredentialLoginModule;
/**
* A credential mapping login module that associates currently logged in
@@ -171,7 +171,6 @@
if (userRole != null && rolePassword != null) {
this.mappedRole = userRole;
PasswordCredential cred = new PasswordCredential(userRole, decode(rolePassword));
- cred.setManagedConnectionFactory(getMcf());
SecurityActions.addCredentials(this.subject, cred);
}
return super.commit();
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorAdd.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorAdd.java 2012-02-28 19:35:14 UTC (rev 3901)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorAdd.java 2012-02-28 21:20:57 UTC (rev 3902)
@@ -100,7 +100,7 @@
module = ml.loadModule(ModuleIdentifier.create(moduleName));
translatorLoader = module.getClassLoader();
} catch (ModuleLoadException e) {
- throw new OperationFailedException(e, new ModelNode().set(IntegrationPlugin.Util.getString("failed_load_module", IntegrationPlugin.Event.TEIID50007, moduleName, translatorName))); //$NON-NLS-1$
+ throw new OperationFailedException(e, new ModelNode().set(IntegrationPlugin.Util.getString("failed_load_translator_module", IntegrationPlugin.Event.TEIID50007, moduleName, translatorName))); //$NON-NLS-1$
}
}
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorDependencyDeployer.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorDependencyDeployer.java 2012-02-28 19:35:14 UTC (rev 3901)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TranslatorDependencyDeployer.java 2012-02-28 21:20:57 UTC (rev 3902)
@@ -41,12 +41,12 @@
try {
final ModuleSpecification moduleSpecification = deploymentUnit.getAttachment(Attachments.MODULE_SPECIFICATION);
final ModuleLoader moduleLoader = Module.getCallerModule().getModule(ModuleIdentifier.create("org.jboss.teiid")).getModuleLoader(); //$NON-NLS-1$
- moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.jboss.teiid.api"), false, false, false)); //$NON-NLS-1$
- moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.jboss.teiid.common-core"), false, false, false)); //$NON-NLS-1$
- moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("javax.api"), false, false, false)); //$NON-NLS-1$
- moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("javax.resource.api"), false, false, false)); //$NON-NLS-1$
- moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.apache.commons.logging"), false, false, false)); //$NON-NLS-1$
- moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.apache.log4j"), false, false, false)); //$NON-NLS-1$
+ moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.jboss.teiid.api"), false, false, false, false)); //$NON-NLS-1$
+ moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.jboss.teiid.common-core"), false, false, false, false)); //$NON-NLS-1$
+ moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("javax.api"), false, false, false, false)); //$NON-NLS-1$
+ moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("javax.resource.api"), false, false, false, false)); //$NON-NLS-1$
+ moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.apache.commons.logging"), false, false, false, false)); //$NON-NLS-1$
+ moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.apache.log4j"), false, false, false, false)); //$NON-NLS-1$
} catch (ModuleLoadException e) {
throw new DeploymentUnitProcessingException(e);
}
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDependencyDeployer.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDependencyDeployer.java 2012-02-28 19:35:14 UTC (rev 3901)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDependencyDeployer.java 2012-02-28 21:20:57 UTC (rev 3902)
@@ -88,9 +88,9 @@
try {
final ModuleSpecification moduleSpecification = deploymentUnit.getAttachment(Attachments.MODULE_SPECIFICATION);
final ModuleLoader moduleLoader = Module.getCallerModule().getModule(ModuleIdentifier.create("org.jboss.teiid")).getModuleLoader(); //$NON-NLS-1$
- moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.jboss.teiid.api"), false, false, false)); //$NON-NLS-1$
- moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.jboss.teiid.common-core"), false, false, false)); //$NON-NLS-1$
- moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("javax.api"), false, false, false)); //$NON-NLS-1$
+ moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.jboss.teiid.api"), false, false, false, false)); //$NON-NLS-1$
+ moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.jboss.teiid.common-core"), false, false, false, false)); //$NON-NLS-1$
+ moduleSpecification.addLocalDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("javax.api"), false, false, false, false)); //$NON-NLS-1$
} catch (ModuleLoadException e) {
throw new DeploymentUnitProcessingException(IntegrationPlugin.Event.TEIID50018.name(), e);
}
Modified: trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
===================================================================
--- trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2012-02-28 19:35:14 UTC (rev 3901)
+++ trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2012-02-28 21:20:57 UTC (rev 3902)
@@ -90,6 +90,8 @@
duplicate_source_name={3} Source names are not unique for model {0} in {1}.{2}
source_name_mismatch={3} There are different sources with the name {0} in {1}.{2}
TEIID50043=Invalid metadata file found at {0}; delete this file and restart server.
+failed_load_module= Failed to load module {0}
+failed_load_translator_module= {0} Failed to load module {1} for translator {2}
# subsystem description
teiid.add = Add the Teiid Subsystem
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-02-28 19:35:14 UTC (rev 3901)
+++ trunk/pom.xml 2012-02-28 21:20:57 UTC (rev 3902)
@@ -15,23 +15,22 @@
<properties>
<ant.version>1.7.0</ant.version>
<site.url>http://www.jboss.org/teiid</site.url>
- <jbossas-version>7.1.0.CR1b</jbossas-version>
- <version.org.jboss.jboss-common-core>2.2.17.GA</version.org.jboss.jboss-common-core>
- <version.org.jboss.staxmapper>1.0.0.Final</version.org.jboss.staxmapper>
+ <jbossas-version>7.1.0.Final</jbossas-version>
+ <version.org.jboss.common-core>2.2.17.GA</version.org.jboss.common-core>
+ <version.org.jboss.staxmapper>1.1.0.Final</version.org.jboss.staxmapper>
<version.org.jboss.jboss-dmr>1.1.1.Final</version.org.jboss.jboss-dmr>
- <version.org.jboss.msc.jboss-msc>1.0.1.GA</version.org.jboss.msc.jboss-msc>
- <version.org.jboss.modules.jboss-modules>1.1.0.CR6</version.org.jboss.modules.jboss-modules>
- <version.org.jboss.jboss-vfs>3.1.0.CR1</version.org.jboss.jboss-vfs>
- <version.org.picketbox>4.0.6.Beta2</version.org.picketbox>
- <version.org.jboss.logging.jboss-logging>3.1.0.CR2</version.org.jboss.logging.jboss-logging>
- <version.org.jboss.logging.jboss-logging-tools>1.0.0.CR5</version.org.jboss.logging.jboss-logging-tools>
+ <version.org.jboss.msc.jboss-msc>1.0.2.GA</version.org.jboss.msc.jboss-msc>
+ <version.org.jboss.modules.jboss-modules>1.1.1.GA</version.org.jboss.modules.jboss-modules>
+ <version.org.jboss.jboss-vfs>3.1.0.Final</version.org.jboss.jboss-vfs>
+ <version.org.picketbox>4.0.6.final</version.org.picketbox>
<version.org.picketbox.jbosssx-client>3.0.0.CR2</version.org.picketbox.jbosssx-client>
+ <version.org.jboss.logging.jboss-logging>3.1.0.GA</version.org.jboss.logging.jboss-logging>
<version.org.jboss.arquillian.core>1.0.0.CR7</version.org.jboss.arquillian.core>
- <version.javax.enterprise.cdi-api>1.0-SP4</version.javax.enterprise.cdi-api>
- <version.org.jboss.netty>3.2.5.Final</version.org.jboss.netty>
+ <version.javax.enterprise>1.0-SP4</version.javax.enterprise>
+ <version.org.jboss.netty>3.2.6.Final</version.org.jboss.netty>
<version.net.sourceforge.saxon>9.2.1.5</version.net.sourceforge.saxon>
<version.json-simple>1.1</version.json-simple>
- <version.org.jgroups>3.0.1.Final</version.org.jgroups>
+ <version.org.jgroups>3.0.5.Final</version.org.jgroups>
<version.connector-api>1.5</version.connector-api>
<version.jta>1.1</version.jta>
<version.sun.jaxb>2.2</version.sun.jaxb>
@@ -376,7 +375,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
- <version>${version.org.jboss.jboss-common-core}</version>
+ <version>${version.org.jboss.common-core}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
@@ -399,12 +398,13 @@
<artifactId>staxmapper</artifactId>
<version>${version.org.jboss.staxmapper}</version>
</dependency>
+ <!--
<dependency>
<groupId>org.picketbox</groupId>
<artifactId>jbosssx-client</artifactId>
<version>${version.org.picketbox.jbosssx-client}</version>
</dependency>
-
+ -->
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-dmr</artifactId>
@@ -569,11 +569,13 @@
<artifactId>json-simple</artifactId>
<version>${version.json-simple}</version>
</dependency>
+ <!--
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<version>${version.javax.enterprise.cdi-api}</version>
</dependency>
+ -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
Modified: trunk/test-integration/common/pom.xml
===================================================================
--- trunk/test-integration/common/pom.xml 2012-02-28 19:35:14 UTC (rev 3901)
+++ trunk/test-integration/common/pom.xml 2012-02-28 21:20:57 UTC (rev 3902)
@@ -39,11 +39,13 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <!--
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
+ -->
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-clustering-jgroups</artifactId>
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-02-28 19:35:14 UTC (rev 3901)
+++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestReplication.java 2012-02-28 21:20:57 UTC (rev 3902)
@@ -32,6 +32,7 @@
import java.util.HashMap;
import org.jboss.as.clustering.jgroups.ChannelFactory;
+import org.jboss.as.server.ServerEnvironment;
import org.jgroups.Channel;
import org.jgroups.JChannel;
import org.junit.BeforeClass;
@@ -133,6 +134,11 @@
public Channel createChannel(String id) throws Exception {
return new JChannel(this.getClass().getClassLoader().getResource("tcp.xml"));
}
+
+ @Override
+ public ServerEnvironment getServerEnvironment() {
+ return null;
+ }
});
server.setReplicator(jor);
12 years, 2 months
- 1
- 0
teiid SVN: r3900 - in branches/7.7.x/metadata/src: test/java/org/teiid/metadata/index and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-02-28 00:06:11 -0500 (Tue, 28 Feb 2012)
New Revision: 3900
Added:
branches/7.7.x/metadata/src/test/resources/ora.vdb
Modified:
branches/7.7.x/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java
branches/7.7.x/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java
branches/7.7.x/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java
Log:
TEIID-1954 correcting associating index records from index metadata
Modified: branches/7.7.x/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java
===================================================================
--- branches/7.7.x/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java 2012-02-28 05:01:51 UTC (rev 3899)
+++ branches/7.7.x/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java 2012-02-28 05:06:11 UTC (rev 3900)
@@ -376,8 +376,11 @@
loadColumnSetRecords(columnSetRecordImpl, uuidColumnMap);
columnSetRecordImpl.setParent(tableRecord);
}
- tableRecord.setIndexes(getByParent(tableRecord.getUUID(), MetadataConstants.RECORD_TYPE.INDEX, KeyRecord.class, false));
- for (KeyRecord columnSetRecordImpl : tableRecord.getIndexes()) {
+ List<KeyRecord> indexRecords = tableRecord.getIndexes();
+ for (int i = 0; i < indexRecords.size(); i++) {
+ indexRecords.set(i, (KeyRecord) getRecordByType(indexRecords.get(i).getUUID(), MetadataConstants.RECORD_TYPE.INDEX));
+ }
+ for (KeyRecord columnSetRecordImpl : indexRecords) {
loadColumnSetRecords(columnSetRecordImpl, uuidColumnMap);
columnSetRecordImpl.setParent(tableRecord);
}
Modified: branches/7.7.x/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java
===================================================================
--- branches/7.7.x/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java 2012-02-28 05:01:51 UTC (rev 3899)
+++ branches/7.7.x/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java 2012-02-28 05:06:11 UTC (rev 3900)
@@ -44,6 +44,7 @@
import org.teiid.metadata.BaseColumn.NullType;
import org.teiid.metadata.Column.SearchType;
import org.teiid.metadata.Datatype.Variety;
+import org.teiid.metadata.KeyRecord.Type;
/**
@@ -422,7 +423,16 @@
table.setPrimaryKey(pk);
}
- tokenIndex+=4; //skip reading uuids for associated records
+ List<String> indexes = getStrings(tokens.get(++tokenIndex), getListDelimiter(indexVersion));
+ if (!indexes.isEmpty()) {
+ table.setIndexes(new ArrayList<KeyRecord>(indexes.size()));
+ for (String string : indexes) {
+ KeyRecord index = new KeyRecord(Type.Index);
+ index.setUUID(string);
+ table.getIndexes().add(index);
+ }
+ }
+ tokenIndex+=3; //skip reading uuids for associated records
if(includeMaterializationFlag(indexVersion)) {
// The next token are the UUIDs for the materialized table ID
Modified: branches/7.7.x/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java
===================================================================
--- branches/7.7.x/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java 2012-02-28 05:01:51 UTC (rev 3899)
+++ branches/7.7.x/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java 2012-02-28 05:06:11 UTC (rev 3900)
@@ -59,6 +59,12 @@
assertNotNull(pk);
}
+ @Test public void testIndex() throws Exception {
+ TransformationMetadata tm = VDBMetadataFactory.getVDBMetadata(UnitTestUtil.getTestDataPath() + "/ora.vdb");
+ Collection indexes = tm.getIndexesInGroup(tm.getGroupID("ORACLE_BQT.SMALLA"));
+ assertEquals(1, indexes.size());
+ }
+
@Test public void testSchemaLoad() throws Exception {
TransformationMetadata tm = VDBMetadataFactory.getVDBMetadata(UnitTestUtil.getTestDataPath() + "/Test.vdb");
Added: branches/7.7.x/metadata/src/test/resources/ora.vdb
===================================================================
(Binary files differ)
Property changes on: branches/7.7.x/metadata/src/test/resources/ora.vdb
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
12 years, 2 months
- 1
- 0
teiid SVN: r3899 - branches/7.7.x/build/kits/jboss-container.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-02-28 00:01:51 -0500 (Tue, 28 Feb 2012)
New Revision: 3899
Modified:
branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html
Log:
update for the 7.7 release
Modified: branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html 2012-02-27 15:23:31 UTC (rev 3898)
+++ branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html 2012-02-28 05:01:51 UTC (rev 3899)
@@ -226,7 +226,125 @@
<h2><a name="Details">Detailed Release Notes</a></h2>
Detailed Release Notes - Teiid - Version ${project.version}
-
+
+<h2> Bug
+</h2>
+<ul>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1465'>TEIID-1465</a>] - Join between char and varchar
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1820'>TEIID-1820</a>] - like_regex only matches full string patterns
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1852'>TEIID-1852</a>] - Misc. Salesforce Translator Issues
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1863'>TEIID-1863</a>] - Default Salesforce URL in teiid-connector-salesforce.rar needs update to SF v22
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1864'>TEIID-1864</a>] - TIMESTAMPADD of SQL_TSI_FRAC_SECOND fails for Sybase 15 with JConnect 6.0.5 driver
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1867'>TEIID-1867</a>] - Duplicate metadata for multisource models
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1868'>TEIID-1868</a>] - Internal Materialized View - Load/Refresh and Assertion Failed
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1869'>TEIID-1869</a>] - Simple capabilities with PostgreSQL 8.3 using decodeinteger causes comm failure
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1870'>TEIID-1870</a>] - Querying random number from DB2 v97 does not push down to source
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1871'>TEIID-1871</a>] - Teiid is handling MySQL5.0 returning DAYNAME as a blob
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1872'>TEIID-1872</a>] - Implicit temp table creation fails with insert and explicit columns
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1873'>TEIID-1873</a>] - Security documentation does not provide adequate information to integrate additional domains for authentication
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1876'>TEIID-1876</a>] - Netezza translator using INTNNOT when it should use INT4NOT
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1878'>TEIID-1878</a>] - Problem with accessing custom generated materialized views
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1879'>TEIID-1879</a>] - Teradata Query Testing - Unhandled exception causing SOCKET CLOSED condition
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1882'>TEIID-1882</a>] - EOFException with 7.6 client against a 7.4 server
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1883'>TEIID-1883</a>] - Query timeout is superceded by synch ttl
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1884'>TEIID-1884</a>] - COMMAND Logging incorrectly reporting END USER COMMAND record count in EDS for forward only resultsets
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1893'>TEIID-1893</a>] - TeiidException when executing SELECT subquery with more than 2 UNIONs
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1895'>TEIID-1895</a>] - Properly escape the column references for Excel based data
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1896'>TEIID-1896</a>] - incorrect xml generated from jsontoxml with nested arrays
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1899'>TEIID-1899</a>] - Getting Assertion when running Inner Merge Join query with SELECT COUNT(*) on top
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1904'>TEIID-1904</a>] - Prepared statement for SOURCE_NAME in multi-source mode throws exception Message:Unable to evaluate
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1907'>TEIID-1907</a>] - SQLStringVisitor should create call visitNode on Select
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1912'>TEIID-1912</a>] - large dependent join query produces IOException against PostgreSQL database
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1915'>TEIID-1915</a>] - XMLTableNode streaming processing can hang
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1920'>TEIID-1920</a>] - Dynamic sql using a non-literal requires a keyword
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1921'>TEIID-1921</a>] - Error with embedded Teiid DataSource and transactions
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1922'>TEIID-1922</a>] - BaseDelegateTranslator's start method is being called before the delegate execution factory is set.
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1927'>TEIID-1927</a>] - BLOB/CLOB errors while using teiid 7.6 JDBC
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1929'>TEIID-1929</a>] - inline view support implies column/table alias support
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1931'>TEIID-1931</a>] - buffer setting maxStorageObjectSize is not factored into maxMemoryBlocks
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1933'>TEIID-1933</a>] - 0 size CLOBs in teiid cause unexpected problems
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1934'>TEIID-1934</a>] - Problem connecting to Teiid 7.7 Beta1
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1935'>TEIID-1935</a>] - TransformationMetadata.getXMLSchemas relative paths fail on windows
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1938'>TEIID-1938</a>] - inline lob setting is ignored
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1939'>TEIID-1939</a>] - MultiSource metadata error with TempMetadataIDs
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1946'>TEIID-1946</a>] - After changing model to replace primary key with a unique key, the deployment of the vdb errors saying PrimaryKey does not exist
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1949'>TEIID-1949</a>] - AssertionError with Teiid order by over pushed group by
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1951'>TEIID-1951</a>] - CommandLogging is refers to the old MMx connectorBindingName, when it should refer to it a translator
+</li>
+</ul>
+
+<h2> Enhancement
+</h2>
+<ul>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1903'>TEIID-1903</a>] - Additional aggregates and grouping should be supported by salesforce
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1932'>TEIID-1932</a>] - Add comparable lob logic to 7.7
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1936'>TEIID-1936</a>] - Make it straight-forward for translators to cache their metadata
+</li>
+</ul>
+
+<h2> Quality Risk
+</h2>
+<ul>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1829'>TEIID-1829</a>] - Clarify source warnings
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1874'>TEIID-1874</a>] - Add metadata validation for dynamic vdb imported metadata
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1908'>TEIID-1908</a>] - Add standard type names to DatabaseMetadata.getTypeInfo
+</li>
+</ul>
+
+<h2> Task
+</h2>
+<ul>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1862'>TEIID-1862</a>] - add regression test for nested selects using UNION ALL and multiple aliases of the same column.
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1902'>TEIID-1902</a>] - Update extension metadata property keys
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1926'>TEIID-1926</a>] - Add optional teiid through-put performance tests
+</li>
+</ul>
+
<h2><a name="Documentation">Documentation and Help</a></h2>
The <a href="http://www.jboss.org/teiid/">Teiid community project</a> is hosted on jboss.org.
12 years, 2 months
- 1
- 0
teiid SVN: r3898 - in branches/7.7.x: adminshell and 38 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-02-27 10:23:31 -0500 (Mon, 27 Feb 2012)
New Revision: 3898
Modified:
branches/7.7.x/adminshell/pom.xml
branches/7.7.x/api/pom.xml
branches/7.7.x/build/pom.xml
branches/7.7.x/cache-jbosscache/pom.xml
branches/7.7.x/client-jdk15/pom.xml
branches/7.7.x/client/pom.xml
branches/7.7.x/common-core/pom.xml
branches/7.7.x/connectors/connector-file/pom.xml
branches/7.7.x/connectors/connector-ldap/pom.xml
branches/7.7.x/connectors/connector-salesforce/pom.xml
branches/7.7.x/connectors/connector-ws/pom.xml
branches/7.7.x/connectors/pom.xml
branches/7.7.x/connectors/salesforce-api/pom.xml
branches/7.7.x/connectors/sandbox/pom.xml
branches/7.7.x/connectors/sandbox/translator-yahoo/pom.xml
branches/7.7.x/connectors/translator-file/pom.xml
branches/7.7.x/connectors/translator-hive/pom.xml
branches/7.7.x/connectors/translator-jdbc/pom.xml
branches/7.7.x/connectors/translator-ldap/pom.xml
branches/7.7.x/connectors/translator-loopback/pom.xml
branches/7.7.x/connectors/translator-olap/pom.xml
branches/7.7.x/connectors/translator-salesforce/pom.xml
branches/7.7.x/connectors/translator-ws/pom.xml
branches/7.7.x/console/pom.xml
branches/7.7.x/documentation/admin-guide/pom.xml
branches/7.7.x/documentation/caching-guide/pom.xml
branches/7.7.x/documentation/client-developers-guide/pom.xml
branches/7.7.x/documentation/developer-guide/pom.xml
branches/7.7.x/documentation/pom.xml
branches/7.7.x/documentation/quick-start-example/pom.xml
branches/7.7.x/documentation/reference/pom.xml
branches/7.7.x/engine/pom.xml
branches/7.7.x/hibernate-dialect/pom.xml
branches/7.7.x/jboss-integration/pom.xml
branches/7.7.x/metadata/pom.xml
branches/7.7.x/pom.xml
branches/7.7.x/runtime/pom.xml
branches/7.7.x/test-integration/common/pom.xml
branches/7.7.x/test-integration/db/pom.xml
branches/7.7.x/test-integration/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: branches/7.7.x/adminshell/pom.xml
===================================================================
--- branches/7.7.x/adminshell/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/adminshell/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: branches/7.7.x/api/pom.xml
===================================================================
--- branches/7.7.x/api/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/api/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: branches/7.7.x/build/pom.xml
===================================================================
--- branches/7.7.x/build/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/build/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: branches/7.7.x/cache-jbosscache/pom.xml
===================================================================
--- branches/7.7.x/cache-jbosscache/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/cache-jbosscache/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-cache-jbosscache</artifactId>
Modified: branches/7.7.x/client/pom.xml
===================================================================
--- branches/7.7.x/client/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/client/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: branches/7.7.x/client-jdk15/pom.xml
===================================================================
--- branches/7.7.x/client-jdk15/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/client-jdk15/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: branches/7.7.x/common-core/pom.xml
===================================================================
--- branches/7.7.x/common-core/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/common-core/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: branches/7.7.x/connectors/connector-file/pom.xml
===================================================================
--- branches/7.7.x/connectors/connector-file/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/connectors/connector-file/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: branches/7.7.x/connectors/connector-ldap/pom.xml
===================================================================
--- branches/7.7.x/connectors/connector-ldap/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/connectors/connector-ldap/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: branches/7.7.x/connectors/connector-salesforce/pom.xml
===================================================================
--- branches/7.7.x/connectors/connector-salesforce/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/connectors/connector-salesforce/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: branches/7.7.x/connectors/connector-ws/pom.xml
===================================================================
--- branches/7.7.x/connectors/connector-ws/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/connectors/connector-ws/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: branches/7.7.x/connectors/pom.xml
===================================================================
--- branches/7.7.x/connectors/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/connectors/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.7.x/connectors/salesforce-api/pom.xml
===================================================================
--- branches/7.7.x/connectors/salesforce-api/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/connectors/salesforce-api/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: branches/7.7.x/connectors/sandbox/pom.xml
===================================================================
--- branches/7.7.x/connectors/sandbox/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/connectors/sandbox/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: branches/7.7.x/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- branches/7.7.x/connectors/sandbox/translator-yahoo/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/connectors/sandbox/translator-yahoo/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: branches/7.7.x/connectors/translator-file/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-file/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/connectors/translator-file/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: branches/7.7.x/connectors/translator-hive/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-hive/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/connectors/translator-hive/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-hive</artifactId>
Modified: branches/7.7.x/connectors/translator-jdbc/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-jdbc/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/connectors/translator-jdbc/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: branches/7.7.x/connectors/translator-ldap/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-ldap/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/connectors/translator-ldap/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: branches/7.7.x/connectors/translator-loopback/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-loopback/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/connectors/translator-loopback/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: branches/7.7.x/connectors/translator-olap/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-olap/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/connectors/translator-olap/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-olap</artifactId>
Modified: branches/7.7.x/connectors/translator-salesforce/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-salesforce/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/connectors/translator-salesforce/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: branches/7.7.x/connectors/translator-ws/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-ws/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/connectors/translator-ws/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: branches/7.7.x/console/pom.xml
===================================================================
--- branches/7.7.x/console/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/console/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.7.x/documentation/admin-guide/pom.xml
===================================================================
--- branches/7.7.x/documentation/admin-guide/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/documentation/admin-guide/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>admin-guide</artifactId>
Modified: branches/7.7.x/documentation/caching-guide/pom.xml
===================================================================
--- branches/7.7.x/documentation/caching-guide/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/documentation/caching-guide/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>caching-guide</artifactId>
Modified: branches/7.7.x/documentation/client-developers-guide/pom.xml
===================================================================
--- branches/7.7.x/documentation/client-developers-guide/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/documentation/client-developers-guide/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>client-developers-guide</artifactId>
Modified: branches/7.7.x/documentation/developer-guide/pom.xml
===================================================================
--- branches/7.7.x/documentation/developer-guide/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/documentation/developer-guide/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>developer-guide</artifactId>
Modified: branches/7.7.x/documentation/pom.xml
===================================================================
--- branches/7.7.x/documentation/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/documentation/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.7.x/documentation/quick-start-example/pom.xml
===================================================================
--- branches/7.7.x/documentation/quick-start-example/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/documentation/quick-start-example/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>quick-start-example</artifactId>
Modified: branches/7.7.x/documentation/reference/pom.xml
===================================================================
--- branches/7.7.x/documentation/reference/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/documentation/reference/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>reference</artifactId>
Modified: branches/7.7.x/engine/pom.xml
===================================================================
--- branches/7.7.x/engine/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/engine/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: branches/7.7.x/hibernate-dialect/pom.xml
===================================================================
--- branches/7.7.x/hibernate-dialect/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/hibernate-dialect/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: branches/7.7.x/jboss-integration/pom.xml
===================================================================
--- branches/7.7.x/jboss-integration/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/jboss-integration/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.7.x/metadata/pom.xml
===================================================================
--- branches/7.7.x/metadata/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/metadata/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: branches/7.7.x/pom.xml
===================================================================
--- branches/7.7.x/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -5,16 +5,16 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
<site.url>http://www.jboss.org/teiid</site.url>
</properties>
<scm>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-7.7.0.Final</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-7.7.0.Final</developerConnection>
- <url>http://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-7.7.0.Final</url>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/branches/7.7.x</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/branches/7.7.x</developerConnection>
+ <url>http://anonsvn.jboss.org/repos/teiid/trunk</url>
</scm>
<licenses>
<license>
Modified: branches/7.7.x/runtime/pom.xml
===================================================================
--- branches/7.7.x/runtime/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/runtime/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.7.x/test-integration/common/pom.xml
===================================================================
--- branches/7.7.x/test-integration/common/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/test-integration/common/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: branches/7.7.x/test-integration/db/pom.xml
===================================================================
--- branches/7.7.x/test-integration/db/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/test-integration/db/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.7.x/test-integration/pom.xml
===================================================================
--- branches/7.7.x/test-integration/pom.xml 2012-02-27 15:22:49 UTC (rev 3897)
+++ branches/7.7.x/test-integration/pom.xml 2012-02-27 15:23:31 UTC (rev 3898)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.Final</version>
+ <version>7.7.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
12 years, 2 months
- 1
- 0
teiid SVN: r3897 - tags.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-02-27 10:22:49 -0500 (Mon, 27 Feb 2012)
New Revision: 3897
Added:
tags/teiid-parent-7.7.0.Final/
Log:
[maven-release-plugin] copy for tag teiid-parent-7.7.0.Final
12 years, 2 months
- 1
- 0
teiid SVN: r3896 - in branches/7.7.x: adminshell and 38 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-02-27 10:22:31 -0500 (Mon, 27 Feb 2012)
New Revision: 3896
Modified:
branches/7.7.x/adminshell/pom.xml
branches/7.7.x/api/pom.xml
branches/7.7.x/build/pom.xml
branches/7.7.x/cache-jbosscache/pom.xml
branches/7.7.x/client-jdk15/pom.xml
branches/7.7.x/client/pom.xml
branches/7.7.x/common-core/pom.xml
branches/7.7.x/connectors/connector-file/pom.xml
branches/7.7.x/connectors/connector-ldap/pom.xml
branches/7.7.x/connectors/connector-salesforce/pom.xml
branches/7.7.x/connectors/connector-ws/pom.xml
branches/7.7.x/connectors/pom.xml
branches/7.7.x/connectors/salesforce-api/pom.xml
branches/7.7.x/connectors/sandbox/pom.xml
branches/7.7.x/connectors/sandbox/translator-yahoo/pom.xml
branches/7.7.x/connectors/translator-file/pom.xml
branches/7.7.x/connectors/translator-hive/pom.xml
branches/7.7.x/connectors/translator-jdbc/pom.xml
branches/7.7.x/connectors/translator-ldap/pom.xml
branches/7.7.x/connectors/translator-loopback/pom.xml
branches/7.7.x/connectors/translator-olap/pom.xml
branches/7.7.x/connectors/translator-salesforce/pom.xml
branches/7.7.x/connectors/translator-ws/pom.xml
branches/7.7.x/console/pom.xml
branches/7.7.x/documentation/admin-guide/pom.xml
branches/7.7.x/documentation/caching-guide/pom.xml
branches/7.7.x/documentation/client-developers-guide/pom.xml
branches/7.7.x/documentation/developer-guide/pom.xml
branches/7.7.x/documentation/pom.xml
branches/7.7.x/documentation/quick-start-example/pom.xml
branches/7.7.x/documentation/reference/pom.xml
branches/7.7.x/engine/pom.xml
branches/7.7.x/hibernate-dialect/pom.xml
branches/7.7.x/jboss-integration/pom.xml
branches/7.7.x/metadata/pom.xml
branches/7.7.x/pom.xml
branches/7.7.x/runtime/pom.xml
branches/7.7.x/test-integration/common/pom.xml
branches/7.7.x/test-integration/db/pom.xml
branches/7.7.x/test-integration/pom.xml
Log:
[maven-release-plugin] prepare release teiid-parent-7.7.0.Final
Modified: branches/7.7.x/adminshell/pom.xml
===================================================================
--- branches/7.7.x/adminshell/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/adminshell/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: branches/7.7.x/api/pom.xml
===================================================================
--- branches/7.7.x/api/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/api/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: branches/7.7.x/build/pom.xml
===================================================================
--- branches/7.7.x/build/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/build/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: branches/7.7.x/cache-jbosscache/pom.xml
===================================================================
--- branches/7.7.x/cache-jbosscache/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/cache-jbosscache/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-cache-jbosscache</artifactId>
Modified: branches/7.7.x/client/pom.xml
===================================================================
--- branches/7.7.x/client/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/client/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: branches/7.7.x/client-jdk15/pom.xml
===================================================================
--- branches/7.7.x/client-jdk15/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/client-jdk15/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: branches/7.7.x/common-core/pom.xml
===================================================================
--- branches/7.7.x/common-core/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/common-core/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: branches/7.7.x/connectors/connector-file/pom.xml
===================================================================
--- branches/7.7.x/connectors/connector-file/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/connectors/connector-file/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: branches/7.7.x/connectors/connector-ldap/pom.xml
===================================================================
--- branches/7.7.x/connectors/connector-ldap/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/connectors/connector-ldap/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: branches/7.7.x/connectors/connector-salesforce/pom.xml
===================================================================
--- branches/7.7.x/connectors/connector-salesforce/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/connectors/connector-salesforce/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: branches/7.7.x/connectors/connector-ws/pom.xml
===================================================================
--- branches/7.7.x/connectors/connector-ws/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/connectors/connector-ws/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: branches/7.7.x/connectors/pom.xml
===================================================================
--- branches/7.7.x/connectors/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/connectors/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.7.x/connectors/salesforce-api/pom.xml
===================================================================
--- branches/7.7.x/connectors/salesforce-api/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/connectors/salesforce-api/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: branches/7.7.x/connectors/sandbox/pom.xml
===================================================================
--- branches/7.7.x/connectors/sandbox/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/connectors/sandbox/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: branches/7.7.x/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- branches/7.7.x/connectors/sandbox/translator-yahoo/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/connectors/sandbox/translator-yahoo/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: branches/7.7.x/connectors/translator-file/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-file/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/connectors/translator-file/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: branches/7.7.x/connectors/translator-hive/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-hive/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/connectors/translator-hive/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-hive</artifactId>
Modified: branches/7.7.x/connectors/translator-jdbc/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-jdbc/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/connectors/translator-jdbc/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: branches/7.7.x/connectors/translator-ldap/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-ldap/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/connectors/translator-ldap/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: branches/7.7.x/connectors/translator-loopback/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-loopback/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/connectors/translator-loopback/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: branches/7.7.x/connectors/translator-olap/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-olap/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/connectors/translator-olap/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-olap</artifactId>
Modified: branches/7.7.x/connectors/translator-salesforce/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-salesforce/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/connectors/translator-salesforce/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: branches/7.7.x/connectors/translator-ws/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-ws/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/connectors/translator-ws/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: branches/7.7.x/console/pom.xml
===================================================================
--- branches/7.7.x/console/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/console/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.7.x/documentation/admin-guide/pom.xml
===================================================================
--- branches/7.7.x/documentation/admin-guide/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/documentation/admin-guide/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>admin-guide</artifactId>
Modified: branches/7.7.x/documentation/caching-guide/pom.xml
===================================================================
--- branches/7.7.x/documentation/caching-guide/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/documentation/caching-guide/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>caching-guide</artifactId>
Modified: branches/7.7.x/documentation/client-developers-guide/pom.xml
===================================================================
--- branches/7.7.x/documentation/client-developers-guide/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/documentation/client-developers-guide/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>client-developers-guide</artifactId>
Modified: branches/7.7.x/documentation/developer-guide/pom.xml
===================================================================
--- branches/7.7.x/documentation/developer-guide/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/documentation/developer-guide/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>developer-guide</artifactId>
Modified: branches/7.7.x/documentation/pom.xml
===================================================================
--- branches/7.7.x/documentation/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/documentation/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.7.x/documentation/quick-start-example/pom.xml
===================================================================
--- branches/7.7.x/documentation/quick-start-example/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/documentation/quick-start-example/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>quick-start-example</artifactId>
Modified: branches/7.7.x/documentation/reference/pom.xml
===================================================================
--- branches/7.7.x/documentation/reference/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/documentation/reference/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>reference</artifactId>
Modified: branches/7.7.x/engine/pom.xml
===================================================================
--- branches/7.7.x/engine/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/engine/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: branches/7.7.x/hibernate-dialect/pom.xml
===================================================================
--- branches/7.7.x/hibernate-dialect/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/hibernate-dialect/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: branches/7.7.x/jboss-integration/pom.xml
===================================================================
--- branches/7.7.x/jboss-integration/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/jboss-integration/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.7.x/metadata/pom.xml
===================================================================
--- branches/7.7.x/metadata/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/metadata/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: branches/7.7.x/pom.xml
===================================================================
--- branches/7.7.x/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -5,16 +5,16 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
<site.url>http://www.jboss.org/teiid</site.url>
</properties>
<scm>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/branches/7.7.x</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/branches/7.7.x</developerConnection>
- <url>http://anonsvn.jboss.org/repos/teiid/trunk</url>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-7.7.0.Final</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-7.7.0.Final</developerConnection>
+ <url>http://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-7.7.0.Final</url>
</scm>
<licenses>
<license>
Modified: branches/7.7.x/runtime/pom.xml
===================================================================
--- branches/7.7.x/runtime/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/runtime/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.7.x/test-integration/common/pom.xml
===================================================================
--- branches/7.7.x/test-integration/common/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/test-integration/common/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: branches/7.7.x/test-integration/db/pom.xml
===================================================================
--- branches/7.7.x/test-integration/db/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/test-integration/db/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.7.x/test-integration/pom.xml
===================================================================
--- branches/7.7.x/test-integration/pom.xml 2012-02-27 14:39:52 UTC (rev 3895)
+++ branches/7.7.x/test-integration/pom.xml 2012-02-27 15:22:31 UTC (rev 3896)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.0.CR2-SNAPSHOT</version>
+ <version>7.7.0.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
12 years, 2 months
- 1
- 0
teiid SVN: r3895 - in branches/7.7.x: documentation/reference/src/main/docbook/en-US/content and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-02-27 09:39:52 -0500 (Mon, 27 Feb 2012)
New Revision: 3895
Modified:
branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobType.java
branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobType.java
branches/7.7.x/documentation/reference/src/main/docbook/en-US/content/translators.xml
Log:
TEIID-1937 adding checks for lob length and adding a note about large mysql result sets
Modified: branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobType.java
===================================================================
--- branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobType.java 2012-02-23 21:04:48 UTC (rev 3894)
+++ branches/7.7.x/common-core/src/main/java/org/teiid/core/types/BlobType.java 2012-02-27 14:39:52 UTC (rev 3895)
@@ -151,7 +151,7 @@
try {
writeBinary(out, getBinaryStream(), (int)length);
} catch (SQLException e) {
- throw new IOException();
+ throw new IOException(e);
}
}
@@ -164,7 +164,10 @@
}
};
try {
- ObjectConverterUtil.write(os, is, length, false);
+ int bytes = ObjectConverterUtil.write(os, is, length, false);
+ if (bytes != length) {
+ throw new IOException("Expected length " + length + " but was " + bytes); //$NON-NLS-1$ //$NON-NLS-2$
+ }
} finally {
is.close();
}
Modified: branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobType.java
===================================================================
--- branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobType.java 2012-02-23 21:04:48 UTC (rev 3894)
+++ branches/7.7.x/common-core/src/main/java/org/teiid/core/types/ClobType.java 2012-02-27 14:39:52 UTC (rev 3895)
@@ -240,7 +240,7 @@
@Override
public void write(char[] cbuf, int off, int len) throws IOException {
for (int i = off; i < len; i++) {
- out.writeShort(cbuf[i]);
+ out.writeChar(cbuf[i]);
}
}
@@ -259,7 +259,10 @@
throw new IOException(e);
}
try {
- ObjectConverterUtil.write(w, r, (int)length, false);
+ int chars = ObjectConverterUtil.write(w, r, (int)length, false);
+ if (length != chars) {
+ throw new IOException("Expected length " + length + " but was " + chars + " for " + this.reference); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
} finally {
r.close();
}
Modified: branches/7.7.x/documentation/reference/src/main/docbook/en-US/content/translators.xml
===================================================================
--- branches/7.7.x/documentation/reference/src/main/docbook/en-US/content/translators.xml 2012-02-23 21:04:48 UTC (rev 3894)
+++ branches/7.7.x/documentation/reference/src/main/docbook/en-US/content/translators.xml 2012-02-27 14:39:52 UTC (rev 3895)
@@ -120,6 +120,12 @@
Values less than 1 indicate to use only one in predicate per dependent value pushed (which matches the pre-7.4 behavior).</entry>
<entry>-1</entry>
</row>
+ <row>
+ <entry>CopyLobs</entry>
+ <entry>If true, then returned lobs (clob, blob, sql/xml) will be copied by the engine in a memory safe manner.
+ Use this option if the source does not support memory safe lobs or you want to disconnect lobs from the source connection.</entry>
+ <entry>false</entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -330,6 +336,7 @@
<programlisting>set SESSION sql_mode = 'ANSI'</programlisting>
<para>If retrieving timestamp values, you should set zeroDateTimeBehavior=convertToNull on the URL, otherwise MySQL or Teiid may throw an exception
retriieving '0000-00-00 00:00:00'</para>
+ <para>If retrieving large result sets, you should consider setting useCursorFetch=true on the URL, otherwise MySQL will fully fetch result sets into memory on the Teiid instance.</para>
</listitem>
<listitem>
<para>
12 years, 2 months
- 1
- 0