teiid SVN: r4017 - branches/7.7.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-04-18 11:24:25 -0400 (Wed, 18 Apr 2012)
New Revision: 4017
Modified:
branches/7.7.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/MetadataProcessor.java
Log:
TEIID-2002 applying the fix to 7.7.1
Modified: branches/7.7.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/MetadataProcessor.java
===================================================================
--- branches/7.7.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/MetadataProcessor.java 2012-04-18 15:13:12 UTC (rev 4016)
+++ branches/7.7.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/MetadataProcessor.java 2012-04-18 15:24:25 UTC (rev 4017)
@@ -188,28 +188,28 @@
}
String sfTypeName = fieldType.value();
Column column = null;
- if(sfTypeName.equals(FieldType.STRING) || //string
- sfTypeName.equals(FieldType.COMBOBOX) || //"combobox"
- sfTypeName.equals(FieldType.REFERENCE) || //"reference"
- sfTypeName.equals(FieldType.PHONE) || //"phone"
- sfTypeName.equals(FieldType.ID) || //"id"
- sfTypeName.equals(FieldType.URL) || //"url"
- sfTypeName.equals(FieldType.EMAIL) || //"email"
- sfTypeName.equals(FieldType.ENCRYPTEDSTRING) || //"encryptedstring"
- sfTypeName.equals(FieldType.ANY_TYPE)) { //"anytype"
+ if(sfTypeName.equals(FieldType.STRING.value()) || //string
+ sfTypeName.equals(FieldType.COMBOBOX.value()) || //"combobox"
+ sfTypeName.equals(FieldType.REFERENCE.value()) || //"reference"
+ sfTypeName.equals(FieldType.PHONE.value()) || //"phone"
+ sfTypeName.equals(FieldType.ID.value()) || //"id"
+ sfTypeName.equals(FieldType.URL.value()) || //"url"
+ sfTypeName.equals(FieldType.EMAIL.value()) || //"email"
+ sfTypeName.equals(FieldType.ENCRYPTEDSTRING.value()) || //"encryptedstring"
+ sfTypeName.equals(FieldType.ANY_TYPE.value())) { //"anytype"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.STRING, table);
column.setNativeType(sfTypeName);
- if(sfTypeName.equals(FieldType.ID)) {
+ if(sfTypeName.equals(FieldType.ID.value())) {
column.setNullType(NullType.No_Nulls);
ArrayList<String> columnNames = new ArrayList<String>();
columnNames.add(field.getName());
- metadataFactory.addPrimaryKey(field.getName()+"_PK", columnNames, table);
+ metadataFactory.addPrimaryKey(field.getName()+"_PK", columnNames, table); //$NON-NLS-1$
}
}
- else if(sfTypeName.equals(FieldType.PICKLIST)) { // "picklist"
+ else if(sfTypeName.equals(FieldType.PICKLIST.value())) { // "picklist"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.STRING, table);
if(field.isRestrictedPicklist()) {
- column.setNativeType("restrictedpicklist");
+ column.setNativeType("restrictedpicklist"); //$NON-NLS-1$
} else {
column.setNativeType(sfTypeName);
}
@@ -219,71 +219,71 @@
else if(sfTypeName.equals(FieldType.MULTIPICKLIST)) { //"multipicklist"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.STRING, table);
if(field.isRestrictedPicklist()) {
- column.setNativeType("restrictedmultiselectpicklist");
+ column.setNativeType("restrictedmultiselectpicklist");//$NON-NLS-1$
} else {
column.setNativeType(sfTypeName);
}
column.setProperty(COLUMN_PICKLIST_VALUES, getPicklistValues(field));
}
- else if(sfTypeName.equals(FieldType.BASE_64)) { //"base64"
+ else if(sfTypeName.equals(FieldType.BASE_64.value())) { //"base64"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.BLOB, table);
column.setNativeType(sfTypeName);
}
- else if(sfTypeName.equals(FieldType.BOOLEAN)) { //"boolean"
+ else if(sfTypeName.equals(FieldType.BOOLEAN.value())) { //"boolean"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.BOOLEAN, table);
column.setNativeType(sfTypeName);
}
- else if(sfTypeName.equals(FieldType.CURRENCY)) { //"currency"
+ else if(sfTypeName.equals(FieldType.CURRENCY.value())) { //"currency"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.DOUBLE, table);
column.setNativeType(sfTypeName);
column.setCurrency(true);
column.setScale(field.getScale());
column.setPrecision(field.getPrecision());
}
- else if(sfTypeName.equals(FieldType.TEXTAREA)) { //"textarea"
+ else if(sfTypeName.equals(FieldType.TEXTAREA.value())) { //"textarea"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.STRING, table);
column.setNativeType(sfTypeName);
column.setSearchType(SearchType.Unsearchable);
}
- else if(sfTypeName.equals(FieldType.INT)) { //"int"
+ else if(sfTypeName.equals(FieldType.INT.value())) { //"int"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.INTEGER, table);
column.setNativeType(sfTypeName);
column.setPrecision(field.getPrecision());
}
- else if(sfTypeName.equals(FieldType.DOUBLE) || //"double"
- sfTypeName.equals(FieldType.PERCENT)) { //"percent"
+ else if(sfTypeName.equals(FieldType.DOUBLE.value()) || //"double"
+ sfTypeName.equals(FieldType.PERCENT.value())) { //"percent"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.DOUBLE, table);
column.setNativeType(sfTypeName);
column.setScale(field.getScale());
column.setPrecision(field.getPrecision());
}
- else if(sfTypeName.equals(FieldType.DATE)) { //"date"
+ else if(sfTypeName.equals(FieldType.DATE.value())) { //"date"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.DATE, table);
column.setNativeType(sfTypeName);
}
- else if(sfTypeName.equals(FieldType.DATETIME)) { //"datetime"
+ else if(sfTypeName.equals(FieldType.DATETIME.value())) { //"datetime"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.TIMESTAMP, table);
column.setNativeType(sfTypeName);
}
- else if(sfTypeName.equals(FieldType.TIME)) { //"time"
+ else if(sfTypeName.equals(FieldType.TIME.value())) { //"time"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.TIME, table);
column.setNativeType(sfTypeName);
}
- if(null == column) {
+
+ if(column == null) {
LogManager.logError(LogConstants.CTX_CONNECTOR, "Unknown type returned by SalesForce: " + sfTypeName);
continue;
- } else {
- column.setNameInSource(field.getName());
- column.setLength(field.getLength());
- if(field.isUpdateable()) {
- column.setUpdatable(true);
- hasUpdateableColumn = true;
- }
- column.setProperty(COLUMN_CALCULATED, String.valueOf(field.isCalculated()));
- column.setProperty(COLUMN_CUSTOM, String.valueOf(field.isCustom()));
- column.setProperty(COLUMN_DEFAULTED, String.valueOf(field.isDefaultedOnCreate()));
}
+ column.setNameInSource(field.getName());
+ column.setLength(field.getLength());
+ if(field.isUpdateable()) {
+ column.setUpdatable(true);
+ hasUpdateableColumn = true;
+ }
+ column.setProperty(COLUMN_CALCULATED, String.valueOf(field.isCalculated()));
+ column.setProperty(COLUMN_CUSTOM, String.valueOf(field.isCustom()));
+ column.setProperty(COLUMN_DEFAULTED, String.valueOf(field.isDefaultedOnCreate()));
}
}
12 years, 10 months
teiid SVN: r4016 - in branches/7.7.x/engine/src: test/java/org/teiid/query/optimizer and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-04-18 11:13:12 -0400 (Wed, 18 Apr 2012)
New Revision: 4016
Modified:
branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanSorts.java
branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java
Log:
TEIID-2003 fix for sort optimization error
Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanSorts.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanSorts.java 2012-04-18 15:12:02 UTC (rev 4015)
+++ branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanSorts.java 2012-04-18 15:13:12 UTC (rev 4016)
@@ -81,6 +81,7 @@
switch (node.getType()) {
case NodeConstants.Types.SORT:
parentBlocking = true;
+ boolean raisedAccess = false;
if (node.hasBooleanProperty(NodeConstants.Info.IS_DUP_REMOVAL)) {
break;
}
@@ -88,6 +89,7 @@
node.setProperty(NodeConstants.Info.IS_DUP_REMOVAL, true);
} else {
root = checkForProjectOptimization(node, root, metadata, capFinder, record);
+ raisedAccess = NodeEditor.findParent(node, NodeConstants.Types.ACCESS) != null;
}
OrderBy orderBy = (OrderBy)node.getProperty(NodeConstants.Info.SORT_ORDER);
List<SingleElementSymbol> orderColumns = orderBy.getSortKeys();
@@ -121,8 +123,10 @@
}
possibleSort.setProperty(Info.SORT_ORDER, orderBy);
}
- break;
}
+ if (raisedAccess) {
+ return root;
+ }
break;
case NodeConstants.Types.DUP_REMOVE:
if (parentBlocking) {
Modified: branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java
===================================================================
--- branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java 2012-04-18 15:12:02 UTC (rev 4015)
+++ branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java 2012-04-18 15:13:12 UTC (rev 4016)
@@ -286,6 +286,40 @@
helpPlan(sql, RealMetadataFactory.example1Cached(), null, capFinder,
new String[] {"SELECT g_0.e1 AS c_0, g_0.e2 AS c_1 FROM pm1.g1 AS g_0 ORDER BY c_0 LIMIT 1"}, ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$
}
+
+ //TODO this should trigger another view removal and thus the combination of the grouping/dup operation
+ @Test public void testGroupDupCombination1Pushdown() {
+ FakeCapabilitiesFinder capFinder = new FakeCapabilitiesFinder();
+ BasicSourceCapabilities caps = getTypicalCapabilities();
+ caps.setCapabilitySupport(Capability.QUERY_SELECT_DISTINCT, true);
+ caps.setCapabilitySupport(Capability.QUERY_FROM_INLINE_VIEWS, true);
+ caps.setCapabilitySupport(Capability.QUERY_GROUP_BY, true);
+ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$
+ capFinder.addCapabilities("pm2", caps); //$NON-NLS-1$
+ // Create query
+ String sql = "select e1, (select e1 from pm2.g1 where e2 = x.e2) as z from (select distinct e1, e2 from pm1.g1) as x group by e1, e2 order by e1"; //$NON-NLS-1$
+ ProcessorPlan plan = helpPlan(sql, RealMetadataFactory.example1Cached(), null, capFinder,
+ new String[] {"SELECT v_0.c_0, v_0.c_1 FROM (SELECT DISTINCT g_0.e1 AS c_0, g_0.e2 AS c_1 FROM pm1.g1 AS g_0) AS v_0 GROUP BY v_0.c_0, v_0.c_1"}, TestOptimizer.SHOULD_SUCCEED); //$NON-NLS-1$
+
+ checkNodeTypes(plan, new int[] {
+ 1, // Access
+ 0, // DependentAccess
+ 0, // DependentSelect
+ 1, // DependentProject
+ 0, // DupRemove
+ 0, // Grouping
+ 0, // NestedLoopJoinStrategy
+ 0, // MergeJoinStrategy
+ 0, // Null
+ 0, // PlanExecution
+ 0, // Project
+ 0, // Select
+ 0, // Sort
+ 0 // UnionAll
+ });
+ checkNodeTypes(plan, new int[] {0}, new Class[] {DupRemoveSortNode.class});
+ }
+
}
12 years, 10 months
teiid SVN: r4015 - in branches/8.0.x/engine/src: test/java/org/teiid/query/optimizer and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-04-18 11:12:02 -0400 (Wed, 18 Apr 2012)
New Revision: 4015
Modified:
branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanSorts.java
branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java
Log:
TEIID-2003 fix for sort optimization error
Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanSorts.java
===================================================================
--- branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanSorts.java 2012-04-18 14:49:13 UTC (rev 4014)
+++ branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanSorts.java 2012-04-18 15:12:02 UTC (rev 4015)
@@ -80,6 +80,7 @@
switch (node.getType()) {
case NodeConstants.Types.SORT:
parentBlocking = true;
+ boolean raisedAccess = false;
if (node.hasBooleanProperty(NodeConstants.Info.IS_DUP_REMOVAL)) {
break;
}
@@ -87,6 +88,7 @@
node.setProperty(NodeConstants.Info.IS_DUP_REMOVAL, true);
} else {
root = checkForProjectOptimization(node, root, metadata, capFinder, record);
+ raisedAccess = NodeEditor.findParent(node, NodeConstants.Types.ACCESS) != null;
}
OrderBy orderBy = (OrderBy)node.getProperty(NodeConstants.Info.SORT_ORDER);
List<Expression> orderColumns = orderBy.getSortKeys();
@@ -120,8 +122,10 @@
}
possibleSort.setProperty(Info.SORT_ORDER, orderBy);
}
- break;
}
+ if (raisedAccess) {
+ return root;
+ }
break;
case NodeConstants.Types.DUP_REMOVE:
if (parentBlocking) {
Modified: branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java
===================================================================
--- branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java 2012-04-18 14:49:13 UTC (rev 4014)
+++ branches/8.0.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java 2012-04-18 15:12:02 UTC (rev 4015)
@@ -286,6 +286,40 @@
helpPlan(sql, RealMetadataFactory.example1Cached(), null, capFinder,
new String[] {"SELECT g_0.e1 AS c_0, g_0.e2 AS c_1 FROM pm1.g1 AS g_0 ORDER BY c_0 LIMIT 1"}, ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$
}
+
+ //TODO this should trigger another view removal and thus the combination of the grouping/dup operation
+ @Test public void testGroupDupCombination1Pushdown() {
+ FakeCapabilitiesFinder capFinder = new FakeCapabilitiesFinder();
+ BasicSourceCapabilities caps = getTypicalCapabilities();
+ caps.setCapabilitySupport(Capability.QUERY_SELECT_DISTINCT, true);
+ caps.setCapabilitySupport(Capability.QUERY_FROM_INLINE_VIEWS, true);
+ caps.setCapabilitySupport(Capability.QUERY_GROUP_BY, true);
+ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$
+ capFinder.addCapabilities("pm2", caps); //$NON-NLS-1$
+ // Create query
+ String sql = "select e1, (select e1 from pm2.g1 where e2 = x.e2) as z from (select distinct e1, e2 from pm1.g1) as x group by e1, e2 order by e1"; //$NON-NLS-1$
+ ProcessorPlan plan = helpPlan(sql, RealMetadataFactory.example1Cached(), null, capFinder,
+ new String[] {"SELECT v_0.c_0, v_0.c_1 FROM (SELECT DISTINCT g_0.e1 AS c_0, g_0.e2 AS c_1 FROM pm1.g1 AS g_0) AS v_0 GROUP BY v_0.c_0, v_0.c_1"}, TestOptimizer.SHOULD_SUCCEED); //$NON-NLS-1$
+
+ checkNodeTypes(plan, new int[] {
+ 1, // Access
+ 0, // DependentAccess
+ 0, // DependentSelect
+ 1, // DependentProject
+ 0, // DupRemove
+ 0, // Grouping
+ 0, // NestedLoopJoinStrategy
+ 0, // MergeJoinStrategy
+ 0, // Null
+ 0, // PlanExecution
+ 0, // Project
+ 0, // Select
+ 0, // Sort
+ 0 // UnionAll
+ });
+ checkNodeTypes(plan, new int[] {0}, new Class[] {DupRemoveSortNode.class});
+ }
+
}
12 years, 10 months
teiid SVN: r4014 - trunk/connectors/translator-hive/.settings.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-04-18 10:49:13 -0400 (Wed, 18 Apr 2012)
New Revision: 4014
Modified:
trunk/connectors/translator-hive/.settings/
Log:
misc: adding ignores
Property changes on: trunk/connectors/translator-hive/.settings
___________________________________________________________________
Modified: svn:ignore
- org.eclipse.jdt.core.prefs
org.maven.ide.eclipse.prefs
+ org.eclipse.jdt.core.prefs
org.maven.ide.eclipse.prefs
org.eclipse.core.resources.prefs
org.eclipse.m2e.core.prefs
12 years, 10 months
teiid SVN: r4013 - branches/8.0.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-04-17 15:42:27 -0400 (Tue, 17 Apr 2012)
New Revision: 4013
Modified:
branches/8.0.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/MetadataProcessor.java
Log:
TEIID-2002: fixing the string matching to be explicit
Modified: branches/8.0.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/MetadataProcessor.java
===================================================================
--- branches/8.0.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/MetadataProcessor.java 2012-04-17 19:10:19 UTC (rev 4012)
+++ branches/8.0.x/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/MetadataProcessor.java 2012-04-17 19:42:27 UTC (rev 4013)
@@ -188,102 +188,102 @@
}
String sfTypeName = fieldType.value();
Column column = null;
- if(sfTypeName.equals(FieldType.STRING) || //string
- sfTypeName.equals(FieldType.COMBOBOX) || //"combobox"
- sfTypeName.equals(FieldType.REFERENCE) || //"reference"
- sfTypeName.equals(FieldType.PHONE) || //"phone"
- sfTypeName.equals(FieldType.ID) || //"id"
- sfTypeName.equals(FieldType.URL) || //"url"
- sfTypeName.equals(FieldType.EMAIL) || //"email"
- sfTypeName.equals(FieldType.ENCRYPTEDSTRING) || //"encryptedstring"
- sfTypeName.equals(FieldType.ANY_TYPE)) { //"anytype"
+ if(sfTypeName.equals(FieldType.STRING.value()) || //string
+ sfTypeName.equals(FieldType.COMBOBOX.value()) || //"combobox"
+ sfTypeName.equals(FieldType.REFERENCE.value()) || //"reference"
+ sfTypeName.equals(FieldType.PHONE.value()) || //"phone"
+ sfTypeName.equals(FieldType.ID.value()) || //"id"
+ sfTypeName.equals(FieldType.URL.value()) || //"url"
+ sfTypeName.equals(FieldType.EMAIL.value()) || //"email"
+ sfTypeName.equals(FieldType.ENCRYPTEDSTRING.value()) || //"encryptedstring"
+ sfTypeName.equals(FieldType.ANY_TYPE.value())) { //"anytype"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.STRING, table);
column.setNativeType(sfTypeName);
- if(sfTypeName.equals(FieldType.ID)) {
+ if(sfTypeName.equals(FieldType.ID.value())) {
column.setNullType(NullType.No_Nulls);
ArrayList<String> columnNames = new ArrayList<String>();
columnNames.add(field.getName());
- metadataFactory.addPrimaryKey(field.getName()+"_PK", columnNames, table);
+ metadataFactory.addPrimaryKey(field.getName()+"_PK", columnNames, table); //$NON-NLS-1$
}
}
- else if(sfTypeName.equals(FieldType.PICKLIST)) { // "picklist"
+ else if(sfTypeName.equals(FieldType.PICKLIST.value())) { // "picklist"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.STRING, table);
if(field.isRestrictedPicklist()) {
- column.setNativeType("restrictedpicklist");
+ column.setNativeType("restrictedpicklist"); //$NON-NLS-1$
} else {
column.setNativeType(sfTypeName);
}
column.setProperty(COLUMN_PICKLIST_VALUES, getPicklistValues(field));
}
- else if(sfTypeName.equals(FieldType.MULTIPICKLIST)) { //"multipicklist"
+ else if(sfTypeName.equals(FieldType.MULTIPICKLIST.value())) { //"multipicklist"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.STRING, table);
if(field.isRestrictedPicklist()) {
- column.setNativeType("restrictedmultiselectpicklist");
+ column.setNativeType("restrictedmultiselectpicklist");//$NON-NLS-1$
} else {
column.setNativeType(sfTypeName);
}
column.setProperty(COLUMN_PICKLIST_VALUES, getPicklistValues(field));
}
- else if(sfTypeName.equals(FieldType.BASE_64)) { //"base64"
+ else if(sfTypeName.equals(FieldType.BASE_64.value())) { //"base64"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.BLOB, table);
column.setNativeType(sfTypeName);
}
- else if(sfTypeName.equals(FieldType.BOOLEAN)) { //"boolean"
+ else if(sfTypeName.equals(FieldType.BOOLEAN.value())) { //"boolean"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.BOOLEAN, table);
column.setNativeType(sfTypeName);
}
- else if(sfTypeName.equals(FieldType.CURRENCY)) { //"currency"
+ else if(sfTypeName.equals(FieldType.CURRENCY.value())) { //"currency"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.DOUBLE, table);
column.setNativeType(sfTypeName);
column.setCurrency(true);
column.setScale(field.getScale());
column.setPrecision(field.getPrecision());
}
- else if(sfTypeName.equals(FieldType.TEXTAREA)) { //"textarea"
+ else if(sfTypeName.equals(FieldType.TEXTAREA.value())) { //"textarea"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.STRING, table);
column.setNativeType(sfTypeName);
column.setSearchType(SearchType.Unsearchable);
}
- else if(sfTypeName.equals(FieldType.INT)) { //"int"
+ else if(sfTypeName.equals(FieldType.INT.value())) { //"int"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.INTEGER, table);
column.setNativeType(sfTypeName);
column.setPrecision(field.getPrecision());
}
- else if(sfTypeName.equals(FieldType.DOUBLE) || //"double"
- sfTypeName.equals(FieldType.PERCENT)) { //"percent"
+ else if(sfTypeName.equals(FieldType.DOUBLE.value()) || //"double"
+ sfTypeName.equals(FieldType.PERCENT.value())) { //"percent"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.DOUBLE, table);
column.setNativeType(sfTypeName);
column.setScale(field.getScale());
column.setPrecision(field.getPrecision());
}
- else if(sfTypeName.equals(FieldType.DATE)) { //"date"
+ else if(sfTypeName.equals(FieldType.DATE.value())) { //"date"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.DATE, table);
column.setNativeType(sfTypeName);
}
- else if(sfTypeName.equals(FieldType.DATETIME)) { //"datetime"
+ else if(sfTypeName.equals(FieldType.DATETIME.value())) { //"datetime"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.TIMESTAMP, table);
column.setNativeType(sfTypeName);
}
- else if(sfTypeName.equals(FieldType.TIME)) { //"time"
+ else if(sfTypeName.equals(FieldType.TIME.value())) { //"time"
column = metadataFactory.addColumn(normalizedName, DataTypeManager.DefaultDataTypes.TIME, table);
column.setNativeType(sfTypeName);
}
- if(null == column) {
+
+ if(column == null) {
LogManager.logError(LogConstants.CTX_CONNECTOR, SalesForcePlugin.Util.gs(SalesForcePlugin.Event.TEIID13001, sfTypeName));
continue;
- } else {
- column.setNameInSource(field.getName());
- column.setLength(field.getLength());
- if(field.isUpdateable()) {
- column.setUpdatable(true);
- hasUpdateableColumn = true;
- }
- column.setProperty(COLUMN_CALCULATED, String.valueOf(field.isCalculated()));
- column.setProperty(COLUMN_CUSTOM, String.valueOf(field.isCustom()));
- column.setProperty(COLUMN_DEFAULTED, String.valueOf(field.isDefaultedOnCreate()));
+ }
+
+ column.setNameInSource(field.getName());
+ column.setLength(field.getLength());
+ if(field.isUpdateable()) {
+ column.setUpdatable(true);
+ hasUpdateableColumn = true;
}
-
+ column.setProperty(COLUMN_CALCULATED, String.valueOf(field.isCalculated()));
+ column.setProperty(COLUMN_CUSTOM, String.valueOf(field.isCustom()));
+ column.setProperty(COLUMN_DEFAULTED, String.valueOf(field.isDefaultedOnCreate()));
}
}
12 years, 11 months
teiid SVN: r4012 - branches/8.0.x/runtime/src/main/java/org/teiid/deployers.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-04-17 15:10:19 -0400 (Tue, 17 Apr 2012)
New Revision: 4012
Modified:
branches/8.0.x/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java
Log:
TEIID-1998 reusing the initial build
Modified: branches/8.0.x/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java
===================================================================
--- branches/8.0.x/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java 2012-04-17 18:54:37 UTC (rev 4011)
+++ branches/8.0.x/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java 2012-04-17 19:10:19 UTC (rev 4012)
@@ -58,6 +58,7 @@
private ConnectorManagerRepository cmr;
private FunctionTree systemFunctions;
private boolean metadataloadFinished = false;
+ private boolean modified;
// used as cached item to avoid rebuilding
private volatile VDBMetaData mergedVDB;
@@ -81,6 +82,7 @@
}
VDBMetaData childVDB = child.getVDB();
this.children.put(new VDBKey(childVDB.getName(), childVDB.getVersion()), child);
+ modified = true;
update();
}
@@ -88,29 +90,34 @@
if (this.children != null) {
this.children.remove(child);
}
+ modified = true;
update();
}
private synchronized void update() {
- if (this.metadataloadFinished) {
-
- VDBMetaData newVDB = buildVDB();
-
- MetadataStore mergedStore = getMetadataStore();
-
- for (ModelMetaData model:newVDB.getModelMetaDatas().values()) {
- MetadataRepository repo = model.getAttachment(MetadataRepository.class);
- if (repo instanceof DefaultMetadataRepository) {
- updateFromMetadataRepository(newVDB, mergedStore.getSchema(model.getName()), (DefaultMetadataRepository)repo);
- }
+ if (!this.metadataloadFinished) {
+ return;
+ }
+ VDBMetaData newVDB = mergedVDB;
+ if (modified) {
+ newVDB = buildVDB();
+ }
+
+ MetadataStore mergedStore = getMetadataStore();
+
+ for (ModelMetaData model:newVDB.getModelMetaDatas().values()) {
+ MetadataRepository repo = model.getAttachment(MetadataRepository.class);
+ if (repo instanceof DefaultMetadataRepository) {
+ updateFromMetadataRepository(newVDB, mergedStore.getSchema(model.getName()), (DefaultMetadataRepository)repo);
}
-
- TransformationMetadata metadata = buildTransformationMetaData(newVDB, getVisibilityMap(), mergedStore, getUDF(), systemFunctions, this.additionalStores);
- newVDB.addAttchment(QueryMetadataInterface.class, metadata);
- newVDB.addAttchment(TransformationMetadata.class, metadata);
- newVDB.addAttchment(MetadataStore.class, mergedStore);
- this.mergedVDB = newVDB;
}
+
+ TransformationMetadata metadata = buildTransformationMetaData(newVDB, getVisibilityMap(), mergedStore, getUDF(), systemFunctions, this.additionalStores);
+ newVDB.addAttchment(QueryMetadataInterface.class, metadata);
+ newVDB.addAttchment(TransformationMetadata.class, metadata);
+ newVDB.addAttchment(MetadataStore.class, mergedStore);
+ this.mergedVDB = newVDB;
+ this.modified = false;
}
private static TransformationMetadata buildTransformationMetaData(VDBMetaData vdb, LinkedHashMap<String, Resource> visibilityMap, MetadataStore store, UDFMetaData udf, FunctionTree systemFunctions, MetadataStore[] additionalStores) {
12 years, 11 months
teiid SVN: r4011 - in branches/8.0.x: runtime/src/main/java/org/teiid/deployers and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-04-17 14:54:37 -0400 (Tue, 17 Apr 2012)
New Revision: 4011
Modified:
branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
branches/8.0.x/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java
branches/8.0.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
branches/8.0.x/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java
branches/8.0.x/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java
Log:
TEIID-1998 adding an initial build to avoid ever having a null merged vdb and ensuring that getVDB cannot block
Modified: branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
===================================================================
--- branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-04-17 17:28:25 UTC (rev 4010)
+++ branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-04-17 18:54:37 UTC (rev 4011)
@@ -135,12 +135,13 @@
if (!name.equals(VDBService.this.vdb.getName()) || version != VDBService.this.vdb.getVersion()) {
return;
}
+ VDBMetaData vdbInstance = vdb.getVDB();
// add object replication to temp/matview tables
- GlobalTableStore gts = new GlobalTableStoreImpl(getBuffermanager(), vdb.getVDB().getAttachment(TransformationMetadata.class));
+ GlobalTableStore gts = new GlobalTableStoreImpl(getBuffermanager(), vdbInstance.getAttachment(TransformationMetadata.class));
if (objectReplicatorInjector.getValue() != null) {
try {
gts = objectReplicatorInjector.getValue().replicate(name + version, GlobalTableStore.class, gts, 300000);
- vdb.getVDB().addAttchment(GlobalTableStore.class, gts);
+ vdbInstance.addAttchment(GlobalTableStore.class, gts);
} catch (Exception e) {
LogManager.logError(LogConstants.CTX_RUNTIME, e, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50023, gts));
}
Modified: branches/8.0.x/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java
===================================================================
--- branches/8.0.x/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java 2012-04-17 17:28:25 UTC (rev 4010)
+++ branches/8.0.x/runtime/src/main/java/org/teiid/deployers/CompositeVDB.java 2012-04-17 18:54:37 UTC (rev 4011)
@@ -36,17 +36,7 @@
import org.teiid.core.CoreConstants;
import org.teiid.dqp.internal.datamgr.ConnectorManager;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
-import org.teiid.metadata.AbstractMetadataRecord;
-import org.teiid.metadata.Column;
-import org.teiid.metadata.ColumnStats;
-import org.teiid.metadata.DefaultMetadataRepository;
-import org.teiid.metadata.FunctionMethod;
-import org.teiid.metadata.MetadataRepository;
-import org.teiid.metadata.MetadataStore;
-import org.teiid.metadata.Procedure;
-import org.teiid.metadata.Schema;
-import org.teiid.metadata.Table;
-import org.teiid.metadata.TableStats;
+import org.teiid.metadata.*;
import org.teiid.metadata.index.IndexMetadataStore;
import org.teiid.query.function.FunctionTree;
import org.teiid.query.function.UDFSource;
@@ -70,7 +60,7 @@
private boolean metadataloadFinished = false;
// used as cached item to avoid rebuilding
- private VDBMetaData mergedVDB;
+ private volatile VDBMetaData mergedVDB;
public CompositeVDB(VDBMetaData vdb, MetadataStore metadataStore, UDFMetaData udf, FunctionTree systemFunctions, ConnectorManagerRepository cmr, MetadataStore... additionalStores) {
this.vdb = vdb;
@@ -81,7 +71,8 @@
this.udf = udf;
this.systemFunctions = systemFunctions;
this.cmr = cmr;
- this.additionalStores = additionalStores;
+ this.additionalStores = additionalStores;
+ this.mergedVDB = buildVDB();
}
synchronized void addChild(CompositeVDB child) {
@@ -90,34 +81,35 @@
}
VDBMetaData childVDB = child.getVDB();
this.children.put(new VDBKey(childVDB.getName(), childVDB.getVersion()), child);
- this.mergedVDB = null;
+ update();
}
synchronized void removeChild(VDBKey child) {
if (this.children != null) {
this.children.remove(child);
}
- this.mergedVDB = null;
+ update();
}
private synchronized void update() {
- if (this.mergedVDB == null && this.metadataloadFinished) {
+ if (this.metadataloadFinished) {
- this.mergedVDB = buildVDB();
+ VDBMetaData newVDB = buildVDB();
MetadataStore mergedStore = getMetadataStore();
- for (ModelMetaData model:this.mergedVDB.getModelMetaDatas().values()) {
+ for (ModelMetaData model:newVDB.getModelMetaDatas().values()) {
MetadataRepository repo = model.getAttachment(MetadataRepository.class);
if (repo instanceof DefaultMetadataRepository) {
- updateFromMetadataRepository(this.mergedVDB, mergedStore.getSchema(model.getName()), (DefaultMetadataRepository)repo);
+ updateFromMetadataRepository(newVDB, mergedStore.getSchema(model.getName()), (DefaultMetadataRepository)repo);
}
}
- TransformationMetadata metadata = buildTransformationMetaData(this.mergedVDB, getVisibilityMap(), mergedStore, getUDF(), systemFunctions, this.additionalStores);
- this.mergedVDB.addAttchment(QueryMetadataInterface.class, metadata);
- this.mergedVDB.addAttchment(TransformationMetadata.class, metadata);
- this.mergedVDB.addAttchment(MetadataStore.class, mergedStore);
+ TransformationMetadata metadata = buildTransformationMetaData(newVDB, getVisibilityMap(), mergedStore, getUDF(), systemFunctions, this.additionalStores);
+ newVDB.addAttchment(QueryMetadataInterface.class, metadata);
+ newVDB.addAttchment(TransformationMetadata.class, metadata);
+ newVDB.addAttchment(MetadataStore.class, mergedStore);
+ this.mergedVDB = newVDB;
}
}
@@ -144,10 +136,7 @@
return metadata;
}
- public synchronized VDBMetaData getVDB() {
- if (this.mergedVDB == null && this.metadataloadFinished) {
- update();
- }
+ public VDBMetaData getVDB() {
return this.mergedVDB;
}
@@ -340,11 +329,11 @@
metadataRepository.endLoadVdb(vdbName, vdbVersion);
}
- public void setMetaloadFinished(boolean flag) {
- this.metadataloadFinished = flag;
+ public synchronized void metadataLoadFinished() {
+ if (!this.metadataloadFinished) {
+ this.metadataloadFinished = true;
+ update();
+ }
}
- public boolean isMetadataloadFinished() {
- return this.metadataloadFinished;
- }
}
Modified: branches/8.0.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
===================================================================
--- branches/8.0.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012-04-17 17:28:25 UTC (rev 4010)
+++ branches/8.0.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012-04-17 18:54:37 UTC (rev 4011)
@@ -109,50 +109,34 @@
return vdbs;
}
- /**
- * This returns the all the VDBS that loaded and still loading or stalled due to data source unavailability.
- * @return
- */
- public List<VDBMetaData> getAllDeployedVDBs(){
- ArrayList<VDBMetaData> vdbs = new ArrayList<VDBMetaData>();
- for(CompositeVDB cVDB:this.vdbRepo.values()) {
- if (!cVDB.isMetadataloadFinished()) {
- vdbs.add(cVDB.buildVDB());
- }
- else {
- vdbs.add(cVDB.getVDB());
- }
- }
- return vdbs;
- }
-
protected VDBKey vdbId(VDBMetaData vdb) {
return new VDBKey(vdb.getName(), vdb.getVersion());
}
public VDBMetaData getVDB(String vdbName) {
int latestVersion = 0;
- for (VDBKey key:this.vdbRepo.tailMap(new VDBKey(vdbName, 0)).keySet()) {
- if(!key.getName().equalsIgnoreCase(vdbName)) {
+ VDBMetaData result = null;
+ for (Map.Entry<VDBKey, CompositeVDB> entry:this.vdbRepo.tailMap(new VDBKey(vdbName, 0)).entrySet()) {
+ if(!entry.getKey().getName().equalsIgnoreCase(vdbName)) {
break;
}
- VDBMetaData vdb = this.vdbRepo.get(key).getVDB();
+ VDBMetaData vdb = entry.getValue().getVDB();
switch (vdb.getConnectionType()) {
case ANY:
- latestVersion = Math.max(vdb.getVersion(), latestVersion);
+ if (vdb.getVersion() > latestVersion) {
+ latestVersion = vdb.getVersion();
+ result = vdb;
+ }
break;
case BY_VERSION:
if (latestVersion == 0) {
latestVersion = vdb.getVersion();
+ result = vdb;
}
break;
}
}
- if(latestVersion == 0) {
- return null;
- }
-
- return getVDB(vdbName, latestVersion);
+ return result;
}
public MetadataStore getSystemStore() {
@@ -228,12 +212,14 @@
if (removed != null) {
// if this VDB was part of another VDB; then remove them.
for (CompositeVDB other:this.vdbRepo.values()) {
- if (other.hasChildVdb(key)) {
- notifyRemove(other.getVDB().getName(), other.getVDB().getVersion(), other);
-
- other.removeChild(key);
-
- notifyAdd(other.getVDB().getName(), other.getVDB().getVersion(), other);
+ synchronized (other) {
+ if (other.hasChildVdb(key)) {
+ notifyRemove(other.getVDB().getName(), other.getVDB().getVersion(), other);
+
+ other.removeChild(key);
+
+ notifyAdd(other.getVDB().getName(), other.getVDB().getVersion(), other);
+ }
}
}
notifyRemove(key.getName(), key.getVersion(), removed);
@@ -276,7 +262,7 @@
CompositeVDB v = this.vdbRepo.get(new VDBKey(name, version));
if (v!= null) {
boolean valid = false;
- v.setMetaloadFinished(true);
+ v.metadataLoadFinished();
VDBMetaData metdataAwareVDB = v.getVDB();
ValidatorReport report = MetadataValidator.validate(metdataAwareVDB, metdataAwareVDB.removeAttachment(MetadataStore.class));
Modified: branches/8.0.x/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java
===================================================================
--- branches/8.0.x/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2012-04-17 17:28:25 UTC (rev 4010)
+++ branches/8.0.x/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2012-04-17 18:54:37 UTC (rev 4011)
@@ -119,10 +119,7 @@
}
public void resourceAdded(String resourceName, boolean translator) {
- for (VDBMetaData vdb:getVDBRepository().getAllDeployedVDBs()) {
- if (vdb == null) {
- continue;
- }
+ for (VDBMetaData vdb:getVDBRepository().getVDBs()) {
if (vdb.getStatus() == VDB.Status.ACTIVE || vdb.isPreview()) {
continue;
}
@@ -178,10 +175,7 @@
}
public void resourceRemoved(String resourceName, boolean translator) {
- for (VDBMetaData vdb:getVDBRepository().getAllDeployedVDBs()) {
- if (vdb == null) {
- continue;
- }
+ for (VDBMetaData vdb:getVDBRepository().getVDBs()) {
if (vdb.isPreview()) {
continue;
}
Modified: branches/8.0.x/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java
===================================================================
--- branches/8.0.x/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java 2012-04-17 17:28:25 UTC (rev 4010)
+++ branches/8.0.x/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java 2012-04-17 18:54:37 UTC (rev 4011)
@@ -66,7 +66,7 @@
cmr.addConnectorManager("source2", getConnectorManager("FakeTranslator2", "FakeConnection2", getFuncsTwo()));
CompositeVDB cvdb = new CompositeVDB(vdbMetaData, metadataStore, null, RealMetadataFactory.SFM.getSystemFunctions(),cmr);
- cvdb.setMetaloadFinished(true);
+ cvdb.metadataLoadFinished();
return cvdb;
}
12 years, 11 months
teiid SVN: r4010 - branches/8.0.x/documentation/javadocs.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-04-17 13:28:25 -0400 (Tue, 17 Apr 2012)
New Revision: 4010
Modified:
branches/8.0.x/documentation/javadocs/
Log:
updating ignores
Property changes on: branches/8.0.x/documentation/javadocs
___________________________________________________________________
Added: svn:ignore
+ .project
.settings
12 years, 11 months
teiid SVN: r4009 - branches/8.0.x/documentation/javadocs.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-04-17 12:08:01 -0400 (Tue, 17 Apr 2012)
New Revision: 4009
Modified:
branches/8.0.x/documentation/javadocs/pom.xml
Log:
simply removing the dependencies as many are invalid. will need a different approach or an update to this later
Modified: branches/8.0.x/documentation/javadocs/pom.xml
===================================================================
--- branches/8.0.x/documentation/javadocs/pom.xml 2012-04-17 15:21:24 UTC (rev 4008)
+++ branches/8.0.x/documentation/javadocs/pom.xml 2012-04-17 16:08:01 UTC (rev 4009)
@@ -10,421 +10,6 @@
<name>Teiid Javadocs</name>
<description>Javadocs for the Teiid project</description>
<dependencies>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-adminshell</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-cache-jbosscache</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-client-jdk15</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>salesforce-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-file</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-hive</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-jdbc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-ldap</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-loopback</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-olap</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-salesforce</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>translator-ws</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-console</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-engine</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-hibernate-dialect</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-jboss-integration</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-metadata</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-runtime</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>test-integration-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.teiid.teiid-test-integration</groupId>
- <artifactId>test-integration-db</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>1.7.2</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.94</version>
- </dependency>
- <dependency>
- <groupId>org.fusesource.jansi</groupId>
- <artifactId>jansi</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- </dependency>
- <dependency>
- <groupId>net.sf.retrotranslator</groupId>
- <artifactId>retrotranslator-runtime</artifactId>
- <version>1.2.9</version>
- </dependency>
- <dependency>
- <groupId>net.sf.retrotranslator</groupId>
- <artifactId>retrotranslator-transformer</artifactId>
- <version>1.2.9</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-security</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-policy</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>org.olap4j</groupId>
- <artifactId>olap4j</artifactId>
- <version>0.9.8.343</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${org.rhq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-plugin-api</artifactId>
- <version>${org.rhq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-native-system</artifactId>
- <version>${org.rhq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-jmx-plugin</artifactId>
- <version>${org.rhq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-util</artifactId>
- <version>${org.rhq.version}</version>
- </dependency>
- <dependency>
- <groupId>mc4j</groupId>
- <artifactId>org-mc4j-ems</artifactId>
- <version>1.2.6</version>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>jboss.jboss-embeddable-ejb3</groupId>
- <artifactId>hibernate-all</artifactId>
- <version>1.0.0.Alpha9</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-profileservice-spi</artifactId>
- <version>5.1.0.CR2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.2</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.saxon</groupId>
- <artifactId>saxonhe</artifactId>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- </dependency>
- <dependency>
- <groupId>nux</groupId>
- <artifactId>nux</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>xom</groupId>
- <artifactId>xom</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>3.5.2-Final</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- <version>2.0.6.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx</artifactId>
- <version>2.0.3.SP1</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnp-client</artifactId>
- <version>5.0.3.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.remoting</groupId>
- <artifactId>jboss-remoting</artifactId>
- <version>2.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-security-aspects</artifactId>
- <version>1.0.0.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-remoting-aspects</artifactId>
- <version>1.0.1.GA</version>
- </dependency>
- <dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4-jboss-update1</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <version>5.1.0.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-profileservice</artifactId>
- <version>5.1.0.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- </dependency>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.3-606.jdbc3</version>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.2.147</version>
- </dependency>
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>ant-contrib</artifactId>
- <version>1.0b3</version>
- </dependency>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>cpptasks</artifactId>
- <version>1.0b3</version>
- </dependency>
- <dependency>
- <groupId>org.dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>3.2-FINAL</version>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.connector.version}</version>
- </dependency>
</dependencies>
<build>
<plugins>
12 years, 11 months
