April 2011 - teiid-commits - Jboss List Archives

teiid SVN: r3075 - in trunk: engine/src/main/java/org/teiid/dqp/internal/process and 1 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-04-07 11:22:24 -0400 (Thu, 07 Apr 2011) New Revision: 3075 Modified: trunk/api/src/main/java/org/teiid/CommandContext.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java Log: TEIID-1550 exposing the subject through the commandcontext for use by udfs Modified: trunk/api/src/main/java/org/teiid/CommandContext.java =================================================================== --- trunk/api/src/main/java/org/teiid/CommandContext.java 2011-04-07 11:39:30 UTC (rev 3074) +++ trunk/api/src/main/java/org/teiid/CommandContext.java 2011-04-07 15:22:24 UTC (rev 3075) @@ -25,6 +25,8 @@ import java.util.Properties; import java.util.TimeZone; +import javax.security.auth.Subject; + /** * Context information for the currently executing command. * Can be used as an argument to UDFs. @@ -48,5 +50,7 @@ int getProcessorBatchSize(); TimeZone getServerTimeZone(); + + Subject getSubject(); } Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2011-04-07 11:39:30 UTC (rev 3074) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2011-04-07 15:22:24 UTC (rev 3075) @@ -313,6 +313,7 @@ context.setPreparedPlanCache(planCache); context.setResultSetCacheEnabled(this.resultSetCacheEnabled); context.setUserRequestSourceConcurrency(this.userRequestConcurrency); + context.setSubject(workContext.getSubject()); } @Override Modified: trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java 2011-04-07 11:39:30 UTC (rev 3074) +++ trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java 2011-04-07 15:22:24 UTC (rev 3075) @@ -29,6 +29,8 @@ import java.util.Set; import java.util.TimeZone; +import javax.security.auth.Subject; + import org.teiid.api.exception.query.QueryProcessingException; import org.teiid.common.buffer.BufferManager; import org.teiid.core.TeiidComponentException; @@ -111,7 +113,7 @@ private boolean resultSetCacheEnabled = true; private int userRequestSourceConcurrency; - + private Subject subject; } private GlobalState globalState = new GlobalState(); @@ -522,4 +524,13 @@ this.globalState.userRequestSourceConcurrency = userRequestSourceConcurrency; } + @Override + public Subject getSubject() { + return this.globalState.subject; + } + + public void setSubject(Subject subject) { + this.globalState.subject = subject; + } + }

13 years, 9 months

1
0
0 / 0

teiid SVN: r3074 - in trunk/engine/src: test/java/org/teiid/query/processor and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-04-07 07:39:30 -0400 (Thu, 07 Apr 2011) New Revision: 3074 Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAssignOutputElements.java trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java Log: TEIID-1549 fixing unrelated aggregate order by Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAssignOutputElements.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAssignOutputElements.java 2011-04-06 20:55:56 UTC (rev 3073) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAssignOutputElements.java 2011-04-07 11:39:30 UTC (rev 3074) @@ -498,6 +498,10 @@ if(aggExpr != null) { AggregateSymbolCollectorVisitor.getAggregates(aggExpr, requiredSymbols, requiredSymbols); } + OrderBy orderBy = agg.getOrderBy(); + if(orderBy != null) { + AggregateSymbolCollectorVisitor.getAggregates(orderBy, requiredSymbols, requiredSymbols); + } } } Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java 2011-04-06 20:55:56 UTC (rev 3073) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java 2011-04-07 11:39:30 UTC (rev 3074) @@ -270,6 +270,33 @@ helpProcess(plan, hdm, expected); } + @Test public void testTextAggOrderByUnrelated() throws Exception { + FakeCapabilitiesFinder capFinder = new FakeCapabilitiesFinder(); + FakeMetadataFacade metadata = FakeMetadataFactory.example1Cached(); + + BasicSourceCapabilities caps = getTypicalCapabilities(); + caps.setCapabilitySupport(Capability.QUERY_SUBQUERIES_SCALAR, false); + caps.setCapabilitySupport(Capability.QUERY_AGGREGATES, true); + caps.setCapabilitySupport(Capability.QUERY_AGGREGATES_MAX, true); + capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ + + ProcessorPlan plan = helpPlan("select convert(to_chars(textagg(for pm1.g1.e1 header order by e2), 'UTF-8'), string) as x from pm1.g1", metadata, null, capFinder, //$NON-NLS-1$ + new String[] { "SELECT g_0.e1, g_0.e2 FROM pm1.g1 AS g_0" }, ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$ + + HardcodedDataManager hdm = new HardcodedDataManager(); + hdm.addData("SELECT g_0.e1, g_0.e2 FROM pm1.g1 AS g_0", new List[] {Arrays.asList("z", 2), Arrays.asList("b", 1)}); + hdm.setBlockOnce(true); + + String nl = System.getProperty("line.separator"); + ArrayList list = new ArrayList(); + list.add("\"e1\""+nl+"\"b\""+nl+"\"z\""+nl); + List[] expected = new List[] { + list, + }; + + helpProcess(plan, hdm, expected); + } + @Test(expected=TeiidProcessingException.class) public void testTextTableInvalidData() throws Exception { String sql = "select count(*) from texttable(? COLUMNS PARTNAME string) x"; //$NON-NLS-1$

13 years, 9 months

1
0
0 / 0

teiid SVN: r3073 - in trunk: test-integration/db/src/test/java/org/teiid/adminapi/jboss and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2011-04-06 16:55:56 -0400 (Wed, 06 Apr 2011) New Revision: 3073 Modified: trunk/jboss-integration/src/main/java/org/teiid/templates/connector/XaJdbcConnectorTemplateInfo.java trunk/test-integration/db/src/test/java/org/teiid/adminapi/jboss/TestConnectorBindings.java Log: TEIID-1548: fixing the mis-spelled property name Modified: trunk/jboss-integration/src/main/java/org/teiid/templates/connector/XaJdbcConnectorTemplateInfo.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/templates/connector/XaJdbcConnectorTemplateInfo.java 2011-04-06 19:35:38 UTC (rev 3072) +++ trunk/jboss-integration/src/main/java/org/teiid/templates/connector/XaJdbcConnectorTemplateInfo.java 2011-04-06 20:55:56 UTC (rev 3073) @@ -47,7 +47,7 @@ static final String SERVER_NAME = "ServerName";//$NON-NLS-1$ static final String PORT_NUMBER = "PortNumber";//$NON-NLS-1$ static final String DATABASE_NAME = "DatabaseName";//$NON-NLS-1$ - static final String ADDITIONAL_DS_PROPS = "addtional-ds-properties";//$NON-NLS-1$ + static final String ADDITIONAL_DS_PROPS = "additional-ds-properties";//$NON-NLS-1$ static final String[] EXTENDED_DS_PROPERTIES = {SERVER_NAME, PORT_NUMBER,DATABASE_NAME}; Modified: trunk/test-integration/db/src/test/java/org/teiid/adminapi/jboss/TestConnectorBindings.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/adminapi/jboss/TestConnectorBindings.java 2011-04-06 19:35:38 UTC (rev 3072) +++ trunk/test-integration/db/src/test/java/org/teiid/adminapi/jboss/TestConnectorBindings.java 2011-04-06 20:55:56 UTC (rev 3073) @@ -363,7 +363,7 @@ p.setProperty("DatabaseName", "txntest"); p.setProperty("PortNumber", "3306"); p.setProperty("ServerName", "localhost"); - p.setProperty("addtional-ds-properties", "foo=bar, t= x"); + p.setProperty("additional-ds-properties", "foo=bar, t= x"); p.setProperty("user-name", "rareddy"); p.setProperty("password", "mm"); p.setProperty("xa-datasource-class", "com.mysql.jdbc.jdbc2.optional.MysqlXADataSource"); @@ -376,7 +376,7 @@ Properties p = new Properties(); p.setProperty("connection-url", "jdbc:mysql://localhost:3306/txntest"); - p.setProperty("addtional-connection-properties", "foo=bar, t= x"); + p.setProperty("additional-connection-properties", "foo=bar, t= x"); p.setProperty("user-name", "rareddy"); p.setProperty("password", "mm"); p.setProperty("driver-class", "com.mysql.jdbc.Driver");

13 years, 9 months

1
0
0 / 0

teiid SVN: r3072 - in trunk: adminshell and 36 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-04-06 15:35:38 -0400 (Wed, 06 Apr 2011) New Revision: 3072 Modified: trunk/adminshell/pom.xml trunk/api/pom.xml trunk/build/pom.xml trunk/cache-jbosscache/pom.xml trunk/client/pom.xml trunk/common-core/pom.xml trunk/connectors/connector-file/pom.xml trunk/connectors/connector-ldap/pom.xml trunk/connectors/connector-salesforce/pom.xml trunk/connectors/connector-ws/pom.xml trunk/connectors/pom.xml trunk/connectors/salesforce-api/pom.xml trunk/connectors/sandbox/pom.xml trunk/connectors/sandbox/translator-yahoo/pom.xml trunk/connectors/translator-file/pom.xml trunk/connectors/translator-jdbc/pom.xml trunk/connectors/translator-ldap/pom.xml trunk/connectors/translator-loopback/pom.xml trunk/connectors/translator-olap/pom.xml trunk/connectors/translator-salesforce/pom.xml trunk/connectors/translator-ws/pom.xml trunk/console/pom.xml trunk/documentation/admin-guide/pom.xml trunk/documentation/caching-guide/pom.xml trunk/documentation/client-developers-guide/pom.xml trunk/documentation/developer-guide/pom.xml trunk/documentation/pom.xml trunk/documentation/quick-start-example/pom.xml trunk/documentation/reference/pom.xml trunk/engine/pom.xml trunk/hibernate-dialect/pom.xml trunk/jboss-integration/pom.xml trunk/metadata/pom.xml trunk/pom.xml trunk/runtime/pom.xml trunk/test-integration/common/pom.xml trunk/test-integration/db/pom.xml trunk/test-integration/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/adminshell/pom.xml =================================================================== --- trunk/adminshell/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/adminshell/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-adminshell</artifactId> Modified: trunk/api/pom.xml =================================================================== --- trunk/api/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/api/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-api</artifactId> Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/build/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid</artifactId> Modified: trunk/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/cache-jbosscache/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-cache-jbosscache</artifactId> Modified: trunk/client/pom.xml =================================================================== --- trunk/client/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/client/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client</artifactId> Modified: trunk/common-core/pom.xml =================================================================== --- trunk/common-core/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/common-core/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-common-core</artifactId> Modified: trunk/connectors/connector-file/pom.xml =================================================================== --- trunk/connectors/connector-file/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/connectors/connector-file/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-file</artifactId> Modified: trunk/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/connectors/connector-ldap/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/connectors/connector-salesforce/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> Modified: trunk/connectors/connector-ws/pom.xml =================================================================== --- trunk/connectors/connector-ws/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/connectors/connector-ws/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ws</artifactId> Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/connectors/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/connectors/salesforce-api/pom.xml =================================================================== --- trunk/connectors/salesforce-api/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/connectors/salesforce-api/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> Modified: trunk/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/connectors/sandbox/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid.connectors</groupId> Modified: trunk/connectors/sandbox/translator-yahoo/pom.xml =================================================================== --- trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-yahoo</artifactId> Modified: trunk/connectors/translator-file/pom.xml =================================================================== --- trunk/connectors/translator-file/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/connectors/translator-file/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-file</artifactId> Modified: trunk/connectors/translator-jdbc/pom.xml =================================================================== --- trunk/connectors/translator-jdbc/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/connectors/translator-jdbc/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-jdbc</artifactId> Modified: trunk/connectors/translator-ldap/pom.xml =================================================================== --- trunk/connectors/translator-ldap/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/connectors/translator-ldap/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ldap</artifactId> Modified: trunk/connectors/translator-loopback/pom.xml =================================================================== --- trunk/connectors/translator-loopback/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/connectors/translator-loopback/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-loopback</artifactId> Modified: trunk/connectors/translator-olap/pom.xml =================================================================== --- trunk/connectors/translator-olap/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/connectors/translator-olap/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-olap</artifactId> Modified: trunk/connectors/translator-salesforce/pom.xml =================================================================== --- trunk/connectors/translator-salesforce/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/connectors/translator-salesforce/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-salesforce</artifactId> Modified: trunk/connectors/translator-ws/pom.xml =================================================================== --- trunk/connectors/translator-ws/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/connectors/translator-ws/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ws</artifactId> Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/console/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/documentation/admin-guide/pom.xml =================================================================== --- trunk/documentation/admin-guide/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/documentation/admin-guide/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> Modified: trunk/documentation/caching-guide/pom.xml =================================================================== --- trunk/documentation/caching-guide/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/documentation/caching-guide/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>caching-guide</artifactId> Modified: trunk/documentation/client-developers-guide/pom.xml =================================================================== --- trunk/documentation/client-developers-guide/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/documentation/client-developers-guide/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>client-developers-guide</artifactId> Modified: trunk/documentation/developer-guide/pom.xml =================================================================== --- trunk/documentation/developer-guide/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/documentation/developer-guide/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>developer-guide</artifactId> Modified: trunk/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/documentation/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/documentation/quick-start-example/pom.xml =================================================================== --- trunk/documentation/quick-start-example/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/documentation/quick-start-example/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>quick-start-example</artifactId> Modified: trunk/documentation/reference/pom.xml =================================================================== --- trunk/documentation/reference/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/documentation/reference/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> Modified: trunk/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/engine/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-engine</artifactId> Modified: trunk/hibernate-dialect/pom.xml =================================================================== --- trunk/hibernate-dialect/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/hibernate-dialect/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-hibernate-dialect</artifactId> Modified: trunk/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/jboss-integration/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/metadata/pom.xml =================================================================== --- trunk/metadata/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/metadata/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-metadata</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -5,15 +5,15 @@ <artifactId>teiid-parent</artifactId> <packaging>pom</packaging> <name>Teiid</name> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</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.4.0.Beta2</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-7.4.0.Beta2</developerConnection> + <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection> </scm> <licenses> <license> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/runtime/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/test-integration/common/pom.xml =================================================================== --- trunk/test-integration/common/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/test-integration/common/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-integration-common</artifactId> Modified: trunk/test-integration/db/pom.xml =================================================================== --- trunk/test-integration/db/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/test-integration/db/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -9,7 +9,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) +++ trunk/test-integration/pom.xml 2011-04-06 19:35:38 UTC (rev 3072) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-test-integration</artifactId>

13 years, 9 months

1
0
0 / 0

teiid SVN: r3071 - in tags: teiid-parent-7.4.0.Beta2 and 37 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-04-06 15:34:31 -0400 (Wed, 06 Apr 2011) New Revision: 3071 Added: tags/teiid-parent-7.4.0.Beta2/ tags/teiid-parent-7.4.0.Beta2/adminshell/pom.xml tags/teiid-parent-7.4.0.Beta2/api/pom.xml tags/teiid-parent-7.4.0.Beta2/build/pom.xml tags/teiid-parent-7.4.0.Beta2/cache-jbosscache/pom.xml tags/teiid-parent-7.4.0.Beta2/client/pom.xml tags/teiid-parent-7.4.0.Beta2/common-core/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/connector-file/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/connector-ldap/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/connector-salesforce/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/connector-ws/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/salesforce-api/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/sandbox/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/sandbox/translator-yahoo/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/translator-file/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/translator-jdbc/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/translator-ldap/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/translator-loopback/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/translator-olap/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/translator-salesforce/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/translator-ws/pom.xml tags/teiid-parent-7.4.0.Beta2/console/pom.xml tags/teiid-parent-7.4.0.Beta2/documentation/admin-guide/pom.xml tags/teiid-parent-7.4.0.Beta2/documentation/caching-guide/pom.xml tags/teiid-parent-7.4.0.Beta2/documentation/client-developers-guide/pom.xml tags/teiid-parent-7.4.0.Beta2/documentation/developer-guide/pom.xml tags/teiid-parent-7.4.0.Beta2/documentation/pom.xml tags/teiid-parent-7.4.0.Beta2/documentation/quick-start-example/pom.xml tags/teiid-parent-7.4.0.Beta2/documentation/reference/pom.xml tags/teiid-parent-7.4.0.Beta2/engine/pom.xml tags/teiid-parent-7.4.0.Beta2/hibernate-dialect/pom.xml tags/teiid-parent-7.4.0.Beta2/jboss-integration/pom.xml tags/teiid-parent-7.4.0.Beta2/metadata/pom.xml tags/teiid-parent-7.4.0.Beta2/pom.xml tags/teiid-parent-7.4.0.Beta2/runtime/pom.xml tags/teiid-parent-7.4.0.Beta2/test-integration/common/pom.xml tags/teiid-parent-7.4.0.Beta2/test-integration/db/pom.xml tags/teiid-parent-7.4.0.Beta2/test-integration/pom.xml Removed: tags/teiid-parent-7.4.0.Beta2/adminshell/pom.xml tags/teiid-parent-7.4.0.Beta2/api/pom.xml tags/teiid-parent-7.4.0.Beta2/build/pom.xml tags/teiid-parent-7.4.0.Beta2/cache-jbosscache/pom.xml tags/teiid-parent-7.4.0.Beta2/client/pom.xml tags/teiid-parent-7.4.0.Beta2/common-core/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/connector-file/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/connector-ldap/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/connector-salesforce/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/connector-ws/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/salesforce-api/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/sandbox/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/sandbox/translator-yahoo/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/translator-file/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/translator-jdbc/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/translator-ldap/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/translator-loopback/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/translator-olap/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/translator-salesforce/pom.xml tags/teiid-parent-7.4.0.Beta2/connectors/translator-ws/pom.xml tags/teiid-parent-7.4.0.Beta2/console/pom.xml tags/teiid-parent-7.4.0.Beta2/documentation/admin-guide/pom.xml tags/teiid-parent-7.4.0.Beta2/documentation/caching-guide/pom.xml tags/teiid-parent-7.4.0.Beta2/documentation/client-developers-guide/pom.xml tags/teiid-parent-7.4.0.Beta2/documentation/developer-guide/pom.xml tags/teiid-parent-7.4.0.Beta2/documentation/pom.xml tags/teiid-parent-7.4.0.Beta2/documentation/quick-start-example/pom.xml tags/teiid-parent-7.4.0.Beta2/documentation/reference/pom.xml tags/teiid-parent-7.4.0.Beta2/engine/pom.xml tags/teiid-parent-7.4.0.Beta2/hibernate-dialect/pom.xml tags/teiid-parent-7.4.0.Beta2/jboss-integration/pom.xml tags/teiid-parent-7.4.0.Beta2/metadata/pom.xml tags/teiid-parent-7.4.0.Beta2/pom.xml tags/teiid-parent-7.4.0.Beta2/runtime/pom.xml tags/teiid-parent-7.4.0.Beta2/test-integration/common/pom.xml tags/teiid-parent-7.4.0.Beta2/test-integration/db/pom.xml tags/teiid-parent-7.4.0.Beta2/test-integration/pom.xml Log: [maven-release-plugin] copy for tag teiid-parent-7.4.0.Beta2 Deleted: tags/teiid-parent-7.4.0.Beta2/adminshell/pom.xml =================================================================== --- trunk/adminshell/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/adminshell/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-adminshell</artifactId> - <name>Adminshell</name> - <description>Adminshell for Teiid</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> - </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>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - <version>0.9.94</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.fusesource.jansi</groupId> - <artifactId>jansi</artifactId> - <version>1.2.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.2</version> - <scope>compile</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/adminshell/pom.xml (from rev 3070, trunk/adminshell/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/adminshell/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/adminshell/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-adminshell</artifactId> + <name>Adminshell</name> + <description>Adminshell for Teiid</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </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>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + <version>0.9.94</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.fusesource.jansi</groupId> + <artifactId>jansi</artifactId> + <version>1.2.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.2</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/api/pom.xml =================================================================== --- trunk/api/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/api/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-api</artifactId> - <name>Teiid Translator API</name> - <description>API for creating Translators and other common extenders in Teiid</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - - </dependencies> -</project> Copied: tags/teiid-parent-7.4.0.Beta2/api/pom.xml (from rev 3070, trunk/api/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/api/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/api/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-api</artifactId> + <name>Teiid Translator API</name> + <description>API for creating Translators and other common extenders in Teiid</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + + </dependencies> +</project> Deleted: tags/teiid-parent-7.4.0.Beta2/build/pom.xml =================================================================== --- trunk/build/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/build/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,93 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid</artifactId> - <name>Build</name> - <description>Teiid Build</description> - <build> - <outputDirectory>target/kits</outputDirectory> - <resources> - <resource> - <directory>kits</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - <include>**/*.sh</include> - <include>**/*.bat</include> - <include>**/*.html</include> - </includes> - </resource> - <resource> - <directory>kits</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - <exclude>**/*.sh</exclude> - <exclude>**/*.bat</exclude> - <exclude>**/*.html</exclude> - </excludes> - </resource> - </resources> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - - <configuration> - <descriptors> - <descriptor>assembly/client-jar.xml</descriptor> - <descriptor>assembly/jboss-container/dist.xml</descriptor> - <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor> - </descriptors> - </configuration> - - <executions> - <execution> - <id>create-assemblies</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> -  - <id>release</id> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>assembly/src.xml</descriptor> - <descriptor>assembly/docs.xml</descriptor> - <descriptor>assembly/client-jar.xml</descriptor> - <descriptor>assembly/jboss-container/dist.xml</descriptor> - <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/build/pom.xml (from rev 3070, trunk/build/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/build/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/build/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,93 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid</artifactId> + <name>Build</name> + <description>Teiid Build</description> + <build> + <outputDirectory>target/kits</outputDirectory> + <resources> + <resource> + <directory>kits</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + <include>**/*.sh</include> + <include>**/*.bat</include> + <include>**/*.html</include> + </includes> + </resource> + <resource> + <directory>kits</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + <exclude>**/*.sh</exclude> + <exclude>**/*.bat</exclude> + <exclude>**/*.html</exclude> + </excludes> + </resource> + </resources> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + + <configuration> + <descriptors> + <descriptor>assembly/client-jar.xml</descriptor> + <descriptor>assembly/jboss-container/dist.xml</descriptor> + <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor> + </descriptors> + </configuration> + + <executions> + <execution> + <id>create-assemblies</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <profile> +  + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>assembly/src.xml</descriptor> + <descriptor>assembly/docs.xml</descriptor> + <descriptor>assembly/client-jar.xml</descriptor> + <descriptor>assembly/jboss-container/dist.xml</descriptor> + <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/cache-jbosscache/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-cache-jbosscache</artifactId> - <name>JBoss Cache</name> - <description>JBossCache provider.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/cache-jbosscache/pom.xml (from rev 3070, trunk/cache-jbosscache/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/cache-jbosscache/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/cache-jbosscache/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-cache-jbosscache</artifactId> + <name>JBoss Cache</name> + <description>JBossCache provider.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/client/pom.xml =================================================================== --- trunk/client/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/client/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-client</artifactId> - <name>Client</name> - <description>Contains the packages related to communication, administrative api, - sessioning and transport level messaging.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/client/pom.xml (from rev 3070, trunk/client/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/client/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/client/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-client</artifactId> + <name>Client</name> + <description>Contains the packages related to communication, administrative api, + sessioning and transport level messaging.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/common-core/pom.xml =================================================================== --- trunk/common-core/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/common-core/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-common-core</artifactId> - <name>Common Core</name> - <description>Core shared library</description> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>process-resources</phase> - <configuration> - <tasks> - <tstamp /> - <replace dir="${project.build.outputDirectory}" token="@build-date@" value="${DSTAMP}"> - <include name="**/*.properties" /> - </replace> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/common-core/pom.xml (from rev 3070, trunk/common-core/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/common-core/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/common-core/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-common-core</artifactId> + <name>Common Core</name> + <description>Core shared library</description> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>process-resources</phase> + <configuration> + <tasks> + <tstamp /> + <replace dir="${project.build.outputDirectory}" token="@build-date@" value="${DSTAMP}"> + <include name="**/*.properties" /> + </replace> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/connectors/connector-file/pom.xml =================================================================== --- trunk/connectors/connector-file/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/connectors/connector-file/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>connector-file</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>File Connector</name> - <packaging>rar</packaging> - <description>This connector reads data from files.</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>build_jar</id> - <phase>process-classes</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>deploy_jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>lib</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/connectors/connector-file/pom.xml (from rev 3070, trunk/connectors/connector-file/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/connectors/connector-file/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/connectors/connector-file/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>connector-file</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>File Connector</name> + <packaging>rar</packaging> + <description>This connector reads data from files.</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>build_jar</id> + <phase>process-classes</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + <execution> + <id>deploy_jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>lib</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/connectors/connector-ldap/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,57 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>connector-ldap</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>LDAP Connector</name> - <description>LDAP Connector</description> - <packaging>rar</packaging> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>build_jar</id> - <phase>process-classes</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>deploy_jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>lib</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/connectors/connector-ldap/pom.xml (from rev 3070, trunk/connectors/connector-ldap/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/connectors/connector-ldap/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/connectors/connector-ldap/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,57 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>connector-ldap</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>LDAP Connector</name> + <description>LDAP Connector</description> + <packaging>rar</packaging> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>build_jar</id> + <phase>process-classes</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + <execution> + <id>deploy_jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>lib</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/connectors/connector-salesforce/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>connector-salesforce</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Salesforce Connector</name> - <packaging>rar</packaging> - <description>Integrates the query engine with Salesforce.com.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>salesforce-api</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>translator-salesforce</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>build_jar</id> - <phase>process-classes</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>deploy_jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>lib</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/connectors/connector-salesforce/pom.xml (from rev 3070, trunk/connectors/connector-salesforce/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/connectors/connector-salesforce/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/connectors/connector-salesforce/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>connector-salesforce</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Salesforce Connector</name> + <packaging>rar</packaging> + <description>Integrates the query engine with Salesforce.com.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>salesforce-api</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-salesforce</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>build_jar</id> + <phase>process-classes</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + <execution> + <id>deploy_jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>lib</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/connectors/connector-ws/pom.xml =================================================================== --- trunk/connectors/connector-ws/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/connectors/connector-ws/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>connector-ws</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Web Service Connector</name> - <packaging>rar</packaging> - <description>This connector reads data from Web Services</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>2.2.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> - <version>2.2.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-security</artifactId> - <version>2.2.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-policy</artifactId> - <version>2.2.2</version> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>build_jar</id> - <phase>process-classes</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>deploy_jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>lib</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Beta2/connectors/connector-ws/pom.xml (from rev 3070, trunk/connectors/connector-ws/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/connectors/connector-ws/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/connectors/connector-ws/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>connector-ws</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Web Service Connector</name> + <packaging>rar</packaging> + <description>This connector reads data from Web Services</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + <version>2.2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + <version>2.2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-security</artifactId> + <version>2.2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-policy</artifactId> + <version>2.2.2</version> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>build_jar</id> + <phase>process-classes</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + <execution> + <id>deploy_jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>lib</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Beta2/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/connectors/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid</groupId> - <artifactId>connectors</artifactId> - <packaging>pom</packaging> - <name>Connectors</name> - <description>This project is aggregator for all the supported connectors.</description> - <dependencies> - -  - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-metadata</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-metadata</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - -  - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> - - <modules> - <module>translator-jdbc</module> - <module>translator-ldap</module> - <module>translator-loopback</module> - <module>translator-file</module> - <module>translator-salesforce</module> - <module>connector-file</module> - <module>connector-salesforce</module> - <module>connector-ldap</module> - <module>salesforce-api</module> - <module>connector-ws</module> - <module>sandbox</module> - <module>translator-ws</module> - <module>translator-olap</module> - </modules> -</project> Copied: tags/teiid-parent-7.4.0.Beta2/connectors/pom.xml (from rev 3070, trunk/connectors/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/connectors/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/connectors/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid</groupId> + <artifactId>connectors</artifactId> + <packaging>pom</packaging> + <name>Connectors</name> + <description>This project is aggregator for all the supported connectors.</description> + <dependencies> + +  + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-metadata</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-metadata</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + +  + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + <modules> + <module>translator-jdbc</module> + <module>translator-ldap</module> + <module>translator-loopback</module> + <module>translator-file</module> + <module>translator-salesforce</module> + <module>connector-file</module> + <module>connector-salesforce</module> + <module>connector-ldap</module> + <module>salesforce-api</module> + <module>connector-ws</module> + <module>sandbox</module> + <module>translator-ws</module> + <module>translator-olap</module> + </modules> +</project> Deleted: tags/teiid-parent-7.4.0.Beta2/connectors/salesforce-api/pom.xml =================================================================== --- trunk/connectors/salesforce-api/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/connectors/salesforce-api/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,14 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>salesforce-api</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Salesforce API</name> - <description>The java API for the Salesforce.com partner web service API</description> - <dependencies> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/connectors/salesforce-api/pom.xml (from rev 3070, trunk/connectors/salesforce-api/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/connectors/salesforce-api/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/connectors/salesforce-api/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,14 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>salesforce-api</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Salesforce API</name> + <description>The java API for the Salesforce.com partner web service API</description> + <dependencies> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/connectors/sandbox/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>sandbox</artifactId> - <packaging>pom</packaging> - <name>Sandbox</name> - <description>Experimental connectors in progress</description> - <modules> - <module>translator-yahoo</module> - </modules> -</project> Copied: tags/teiid-parent-7.4.0.Beta2/connectors/sandbox/pom.xml (from rev 3070, trunk/connectors/sandbox/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/connectors/sandbox/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/connectors/sandbox/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>sandbox</artifactId> + <packaging>pom</packaging> + <name>Sandbox</name> + <description>Experimental connectors in progress</description> + <modules> + <module>translator-yahoo</module> + </modules> +</project> Deleted: tags/teiid-parent-7.4.0.Beta2/connectors/sandbox/translator-yahoo/pom.xml =================================================================== --- trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/connectors/sandbox/translator-yahoo/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>sandbox</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-yahoo</artifactId> - <groupId>org.jboss.teiid.connectors.sandbox</groupId> - <name>Yahoo Translator</name> - <description>Test translator used to query ticker symbols from Yahoo website</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Beta2/connectors/sandbox/translator-yahoo/pom.xml (from rev 3070, trunk/connectors/sandbox/translator-yahoo/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/connectors/sandbox/translator-yahoo/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/connectors/sandbox/translator-yahoo/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>sandbox</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-yahoo</artifactId> + <groupId>org.jboss.teiid.connectors.sandbox</groupId> + <name>Yahoo Translator</name> + <description>Test translator used to query ticker symbols from Yahoo website</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Beta2/connectors/translator-file/pom.xml =================================================================== --- trunk/connectors/translator-file/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/connectors/translator-file/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-file</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>File Translator</name> - <description>This translator provides access to the file system.</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Beta2/connectors/translator-file/pom.xml (from rev 3070, trunk/connectors/translator-file/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/connectors/translator-file/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/connectors/translator-file/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-file</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>File Translator</name> + <description>This translator provides access to the file system.</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Beta2/connectors/translator-jdbc/pom.xml =================================================================== --- trunk/connectors/translator-jdbc/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/connectors/translator-jdbc/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-jdbc</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>JDBC Translator</name> - - <description>This project contains translators for a JDBC source. Currently this is an aggregator for all the JDBC translators relational databases.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> - -</project> Copied: tags/teiid-parent-7.4.0.Beta2/connectors/translator-jdbc/pom.xml (from rev 3070, trunk/connectors/translator-jdbc/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/connectors/translator-jdbc/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/connectors/translator-jdbc/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-jdbc</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>JDBC Translator</name> + + <description>This project contains translators for a JDBC source. Currently this is an aggregator for all the JDBC translators relational databases.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> + +</project> Deleted: tags/teiid-parent-7.4.0.Beta2/connectors/translator-ldap/pom.xml =================================================================== --- trunk/connectors/translator-ldap/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/connectors/translator-ldap/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,52 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-ldap</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>LDAP Translator</name> - <description>LDAP Translator</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Beta2/connectors/translator-ldap/pom.xml (from rev 3070, trunk/connectors/translator-ldap/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/connectors/translator-ldap/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/connectors/translator-ldap/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,52 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-ldap</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>LDAP Translator</name> + <description>LDAP Translator</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Beta2/connectors/translator-loopback/pom.xml =================================================================== --- trunk/connectors/translator-loopback/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/connectors/translator-loopback/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-loopback</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Loopback Translator</name> - <description>Loopback Translator</description> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Beta2/connectors/translator-loopback/pom.xml (from rev 3070, trunk/connectors/translator-loopback/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/connectors/translator-loopback/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/connectors/translator-loopback/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-loopback</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Loopback Translator</name> + <description>Loopback Translator</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Beta2/connectors/translator-olap/pom.xml =================================================================== --- trunk/connectors/translator-olap/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/connectors/translator-olap/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-olap</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>OLAP Translator</name> - <description>This translator provides access to Query Analysis Cubes</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.olap4j</groupId> - <artifactId>olap4j</artifactId> - <version>0.9.8.343</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> - -</project> Copied: tags/teiid-parent-7.4.0.Beta2/connectors/translator-olap/pom.xml (from rev 3070, trunk/connectors/translator-olap/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/connectors/translator-olap/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/connectors/translator-olap/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-olap</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>OLAP Translator</name> + <description>This translator provides access to Query Analysis Cubes</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.olap4j</groupId> + <artifactId>olap4j</artifactId> + <version>0.9.8.343</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> + +</project> Deleted: tags/teiid-parent-7.4.0.Beta2/connectors/translator-salesforce/pom.xml =================================================================== --- trunk/connectors/translator-salesforce/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/connectors/translator-salesforce/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-salesforce</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Salesforce Translator</name> - <description>Integrates the query engine with Salesforce.com.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>salesforce-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Beta2/connectors/translator-salesforce/pom.xml (from rev 3070, trunk/connectors/translator-salesforce/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/connectors/translator-salesforce/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/connectors/translator-salesforce/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-salesforce</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Salesforce Translator</name> + <description>Integrates the query engine with Salesforce.com.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>salesforce-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Beta2/connectors/translator-ws/pom.xml =================================================================== --- trunk/connectors/translator-ws/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/connectors/translator-ws/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>connectors</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>translator-ws</artifactId> - <groupId>org.jboss.teiid.connectors</groupId> - <name>Web service Translator</name> - <description>This translator provides access to Web Services.</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.xml</exclude> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - </build> - -</project> Copied: tags/teiid-parent-7.4.0.Beta2/connectors/translator-ws/pom.xml (from rev 3070, trunk/connectors/translator-ws/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/connectors/translator-ws/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/connectors/translator-ws/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-ws</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Web service Translator</name> + <description>This translator provides access to Web Services.</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> + +</project> Deleted: tags/teiid-parent-7.4.0.Beta2/console/pom.xml =================================================================== --- trunk/console/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/console/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,175 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-console</artifactId> - <name>Console</name> - <description>This project is for the RHQ plugin that supports the TEIID Console </description> - - <properties> -  - <org.jboss.jopr.as5.version>1.2.0.GA</org.jboss.jopr.as5.version> - <jopr.jboss.as5.plugin.version>1.4.0.B01</jopr.jboss.as5.plugin.version> - <org.rhq.version>1.3.0.GA</org.rhq.version> - <apache.ant.version>1.7.0</apache.ant.version> - <teiid.version>${project.version}</teiid.version> - - - </properties> - - <dependencies> -  - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-core-domain</artifactId> - <version>${org.rhq.version}</version> - <scope>provided</scope> -  - </dependency> - - - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-core-plugin-api</artifactId> - <version>${org.rhq.version}</version> - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-core-native-system</artifactId> - <version>${org.rhq.version}</version> - <scope>provided</scope>  - </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> - <scope>provided</scope>  - </dependency> - - -  - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>hibernate-all</artifactId> - <version>1.0.0.Alpha9</version> - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.jopr</groupId> - <artifactId>jopr-embedded-jbas5</artifactId> - <type>war</type> - <version>${org.jboss.jopr.as5.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.integration</groupId> - <artifactId>jboss-profileservice-spi</artifactId> - <version>5.1.0.CR2</version> - </dependency> - - <dependency> - <groupId>org.jboss.on</groupId> - <artifactId>jopr-jboss-as-5-plugin</artifactId> - <version>${jopr.jboss.as5.plugin.version}</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> - - - </dependencies> - - - - <build> - <outputDirectory>target/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - </resources> - </build> - - -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/console/pom.xml (from rev 3070, trunk/console/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/console/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/console/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,175 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-console</artifactId> + <name>Console</name> + <description>This project is for the RHQ plugin that supports the TEIID Console </description> + + <properties> +  + <org.jboss.jopr.as5.version>1.2.0.GA</org.jboss.jopr.as5.version> + <jopr.jboss.as5.plugin.version>1.4.0.B01</jopr.jboss.as5.plugin.version> + <org.rhq.version>1.3.0.GA</org.rhq.version> + <apache.ant.version>1.7.0</apache.ant.version> + <teiid.version>${project.version}</teiid.version> + + + </properties> + + <dependencies> +  + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-domain</artifactId> + <version>${org.rhq.version}</version> + <scope>provided</scope> +  + </dependency> + + + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-plugin-api</artifactId> + <version>${org.rhq.version}</version> + <scope>provided</scope>  + </dependency> + + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-native-system</artifactId> + <version>${org.rhq.version}</version> + <scope>provided</scope>  + </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> + <scope>provided</scope>  + </dependency> + + +  + <dependency> + <groupId>jboss.jboss-embeddable-ejb3</groupId> + <artifactId>hibernate-all</artifactId> + <version>1.0.0.Alpha9</version> + <scope>provided</scope>  + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.jopr</groupId> + <artifactId>jopr-embedded-jbas5</artifactId> + <type>war</type> + <version>${org.jboss.jopr.as5.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <version>5.1.0.CR2</version> + </dependency> + + <dependency> + <groupId>org.jboss.on</groupId> + <artifactId>jopr-jboss-as-5-plugin</artifactId> + <version>${jopr.jboss.as5.plugin.version}</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> + + + </dependencies> + + + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + </resources> + </build> + + +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/documentation/admin-guide/pom.xml =================================================================== --- trunk/documentation/admin-guide/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/documentation/admin-guide/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,77 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.jboss.teiid</groupId> - <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>admin-guide</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Admin Guide</name> - <description>The Teiid Admin manual</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>admin_guide.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_admin_guide.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Beta2/documentation/admin-guide/pom.xml (from rev 3070, trunk/documentation/admin-guide/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/documentation/admin-guide/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/documentation/admin-guide/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,77 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <groupId>org.jboss.teiid</groupId> + <artifactId>documentation</artifactId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>admin-guide</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Admin Guide</name> + <description>The Teiid Admin manual</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>admin_guide.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_admin_guide.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Beta2/documentation/caching-guide/pom.xml =================================================================== --- trunk/documentation/caching-guide/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/documentation/caching-guide/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,77 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.jboss.teiid</groupId> - <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>caching-guide</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Teiid Caching Guide</name> - <description>The Teiid Caching Guide</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>main.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_caching_guide.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/documentation/caching-guide/pom.xml (from rev 3070, trunk/documentation/caching-guide/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/documentation/caching-guide/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/documentation/caching-guide/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,77 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <groupId>org.jboss.teiid</groupId> + <artifactId>documentation</artifactId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>caching-guide</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Teiid Caching Guide</name> + <description>The Teiid Caching Guide</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>main.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_caching_guide.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/documentation/client-developers-guide/pom.xml =================================================================== --- trunk/documentation/client-developers-guide/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/documentation/client-developers-guide/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,77 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.jboss.teiid</groupId> - <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>client-developers-guide</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Teiid Client Developers Guide</name> - <description>The Client Developers Guide</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>main.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_client_developers_guide.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/documentation/client-developers-guide/pom.xml (from rev 3070, trunk/documentation/client-developers-guide/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/documentation/client-developers-guide/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/documentation/client-developers-guide/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,77 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <groupId>org.jboss.teiid</groupId> + <artifactId>documentation</artifactId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>client-developers-guide</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Teiid Client Developers Guide</name> + <description>The Client Developers Guide</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>main.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_client_developers_guide.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/documentation/developer-guide/pom.xml =================================================================== --- trunk/documentation/developer-guide/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/documentation/developer-guide/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,77 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.jboss.teiid</groupId> - <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>developer-guide</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Developer's Guide</name> - <description>The Teiid Developer's Guide</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>Developer_Guide.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_developer_guide.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Beta2/documentation/developer-guide/pom.xml (from rev 3070, trunk/documentation/developer-guide/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/documentation/developer-guide/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/documentation/developer-guide/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,77 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <groupId>org.jboss.teiid</groupId> + <artifactId>documentation</artifactId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>developer-guide</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Developer's Guide</name> + <description>The Teiid Developer's Guide</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>Developer_Guide.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_developer_guide.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Beta2/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/documentation/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,21 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid</groupId> - <artifactId>documentation</artifactId> - <packaging>pom</packaging> - <name>Documents</name> - <description>Teiid Documentation Aggregator</description> - <modules> - <module>admin-guide</module> - <module>reference</module> - <module>developer-guide</module> - <module>quick-start-example</module> - <module>client-developers-guide</module> - <module>caching-guide</module> - </modules> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/documentation/pom.xml (from rev 3070, trunk/documentation/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/documentation/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/documentation/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,21 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid</groupId> + <artifactId>documentation</artifactId> + <packaging>pom</packaging> + <name>Documents</name> + <description>Teiid Documentation Aggregator</description> + <modules> + <module>admin-guide</module> + <module>reference</module> + <module>developer-guide</module> + <module>quick-start-example</module> + <module>client-developers-guide</module> + <module>caching-guide</module> + </modules> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/documentation/quick-start-example/pom.xml =================================================================== --- trunk/documentation/quick-start-example/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/documentation/quick-start-example/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,77 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.jboss.teiid</groupId> - <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>quick-start-example</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Quick Start Guide</name> - <description>The Teiid Quick Start guide</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>quick_start_example.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_quick_start_example.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> Copied: tags/teiid-parent-7.4.0.Beta2/documentation/quick-start-example/pom.xml (from rev 3070, trunk/documentation/quick-start-example/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/documentation/quick-start-example/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/documentation/quick-start-example/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,77 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <groupId>org.jboss.teiid</groupId> + <artifactId>documentation</artifactId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>quick-start-example</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Quick Start Guide</name> + <description>The Teiid Quick Start guide</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>quick_start_example.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_quick_start_example.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> Deleted: tags/teiid-parent-7.4.0.Beta2/documentation/reference/pom.xml =================================================================== --- trunk/documentation/reference/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/documentation/reference/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,77 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.jboss.teiid</groupId> - <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>reference</artifactId> - <groupId>org.jboss.teiid.documentation</groupId> - <packaging>jdocbook</packaging> - <name>Teiid Reference</name> - <description>The Teiid reference manual</description> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook</artifactId> - <version>1.74.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>Reference.xml</sourceDocumentName> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> - <finalName>teiid_reference.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xmlTransformerType>saxon</xmlTransformerType> - <docbookVersion>1.72.0</docbookVersion> - <xincludeSupported>true</xincludeSupported> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>false</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/documentation/reference/pom.xml (from rev 3070, trunk/documentation/reference/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/documentation/reference/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/documentation/reference/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,77 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <groupId>org.jboss.teiid</groupId> + <artifactId>documentation</artifactId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>reference</artifactId> + <groupId>org.jboss.teiid.documentation</groupId> + <packaging>jdocbook</packaging> + <name>Teiid Reference</name> + <description>The Teiid reference manual</description> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook</artifactId> + <version>1.74.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>Reference.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>teiid_reference.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xmlTransformerType>saxon</xmlTransformerType> + <docbookVersion>1.72.0</docbookVersion> + <xincludeSupported>true</xincludeSupported> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>false</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/engine/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-engine</artifactId> - <name>Engine</name> - <description>Relational, procedural, and xml core engine.</description> - - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <version>2.4</version> - <executions> - <execution> - <id>javacc</id> - <goals> - <goal>javacc</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>net.sourceforge.saxon</groupId> - <artifactId>saxon</artifactId> - </dependency> - - <dependency> - <groupId>net.sourceforge.saxon</groupId> - <classifier>dom</classifier> - <artifactId>saxon</artifactId> - </dependency> - - <dependency> - <groupId>com.googlecode.json-simple</groupId> - <artifactId>json-simple</artifactId> - </dependency> - - </dependencies> - -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/engine/pom.xml (from rev 3070, trunk/engine/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/engine/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/engine/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-engine</artifactId> + <name>Engine</name> + <description>Relational, procedural, and xml core engine.</description> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <id>javacc</id> + <goals> + <goal>javacc</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs-spi</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + </dependency> + + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <classifier>dom</classifier> + <artifactId>saxon</artifactId> + </dependency> + + <dependency> + <groupId>com.googlecode.json-simple</groupId> + <artifactId>json-simple</artifactId> + </dependency> + + </dependencies> + +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/hibernate-dialect/pom.xml =================================================================== --- trunk/hibernate-dialect/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/hibernate-dialect/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,18 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-hibernate-dialect</artifactId> - <name>Hibernate Dialect</name> - <description>Teiid Hibernate Dialect</description> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.5.2-Final</version> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/hibernate-dialect/pom.xml (from rev 3070, trunk/hibernate-dialect/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/hibernate-dialect/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/hibernate-dialect/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,18 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-hibernate-dialect</artifactId> + <name>Hibernate Dialect</name> + <description>Teiid Hibernate Dialect</description> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.5.2-Final</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/jboss-integration/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,146 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-jboss-integration</artifactId> - <name>teiid-jboss-integration</name> - <description>JBoss specific integration layer for teiid</description> - - <dependencies> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-runtime</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-cache-jbosscache</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-reflect</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.integration</groupId> - <artifactId>jboss-profileservice-spi</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-connector</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-aop-mc-int</artifactId> - <version>2.0.6.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jbosssx</artifactId> - <version>2.0.3.SP1</version> - <scope>provided</scope> - </dependency> -  - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnp-client</artifactId> - <version>5.0.3.GA</version> - <scope>test</scope> - </dependency> - - - <dependency> - <groupId>org.jboss.remoting</groupId> - <artifactId>jboss-remoting</artifactId> - <version>2.5.1</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.aspects</groupId> - <artifactId>jboss-security-aspects</artifactId> - <version>1.0.0.GA</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.aspects</groupId> - <artifactId>jboss-remoting-aspects</artifactId> - <version>1.0.1.GA</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - <version>1.3.4-jboss-update1</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-server</artifactId> - <version>5.1.0.GA</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-profileservice</artifactId> - <version>5.1.0.GA</version> - <scope>test</scope> - </dependency> - - </dependencies> - -</project> Copied: tags/teiid-parent-7.4.0.Beta2/jboss-integration/pom.xml (from rev 3070, trunk/jboss-integration/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/jboss-integration/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/jboss-integration/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,146 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-jboss-integration</artifactId> + <name>teiid-jboss-integration</name> + <description>JBoss specific integration layer for teiid</description> + + <dependencies> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-runtime</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-cache-jbosscache</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-connector</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-aop-mc-int</artifactId> + <version>2.0.6.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + <version>2.0.3.SP1</version> + <scope>provided</scope> + </dependency> +  + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.naming</groupId> + <artifactId>jnp-client</artifactId> + <version>5.0.3.GA</version> + <scope>test</scope> + </dependency> + + + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + <version>2.5.1</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.aspects</groupId> + <artifactId>jboss-security-aspects</artifactId> + <version>1.0.0.GA</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.aspects</groupId> + <artifactId>jboss-remoting-aspects</artifactId> + <version>1.0.1.GA</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>oswego-concurrent</groupId> + <artifactId>concurrent</artifactId> + <version>1.3.4-jboss-update1</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <version>5.1.0.GA</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-profileservice</artifactId> + <version>5.1.0.GA</version> + <scope>test</scope> + </dependency> + + </dependencies> + +</project> Deleted: tags/teiid-parent-7.4.0.Beta2/metadata/pom.xml =================================================================== --- trunk/metadata/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/metadata/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-metadata</artifactId> - <name>Metadata</name> - <description>Provides vdb metadata from index files.</description> - - <dependencies> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - </dependency> - - </dependencies> - -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/metadata/pom.xml (from rev 3070, trunk/metadata/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/metadata/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/metadata/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-metadata</artifactId> + <name>Metadata</name> + <description>Provides vdb metadata from index files.</description> + + <dependencies> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + </dependency> + + </dependencies> + +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/pom.xml =================================================================== --- trunk/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,493 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-parent</artifactId> - <packaging>pom</packaging> - <name>Teiid</name> - <version>7.4.0.Beta2</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/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection> - </scm> - <licenses> - <license> - <name>GNU Lesser General Public License</name> - <url>http://www.gnu.org/licenses/lgpl.html</url> - <distribution>repo</distribution> - <comments>A business-friendly OSS license</comments> - </license> - </licenses> - <url>${site.url}</url> - <developers> - <developer> - <name>Steve Hawkins</name> - <id>steve</id> - <email>shawkins(a)redhat.com</email> - <organization>Red Hat</organization> - <roles> - <role>Project Lead</role> - </roles> - <timezone>-6</timezone> - </developer> - <developer> - <name>Ramesh Reddy</name> - <id>ramesh</id> - <email>rareddy(a)redhat.com</email> - <organization>Red Hat</organization> - <roles> - <role>Project Lead</role> - </roles> - <timezone>-6</timezone> - </developer> - <developer> - <name>Van Halbert</name> - <id>van</id> - <email>vhalbert(a)redhat.com</email> - <organization>Red Hat</organization> - <roles> - <role>Developer</role> - </roles> - <timezone>-6</timezone> - </developer> - <developer> - <name>Ted Jones</name> - <id>ted</id> - <email>tejones(a)redhat.com</email> - <organization>Red Hat</organization> - <roles> - <role>Developer</role> - </roles> - <timezone>-6</timezone> - </developer> - </developers> - <profiles> - <profile> -  - <id>release</id> - <modules> - <module>documentation</module> - <module>build</module> - </modules> - </profile> - <profile> -  - <id>dev</id> - <modules> - <module>build</module> - </modules> - </profile> - </profiles> - <build> -  - <pluginManagement> - <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-6-m1-jboss</version> - </plugin> - </plugins> - </pluginManagement> - <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <showDeprecation>false</showDeprecation> - <showWarnings>false</showWarnings> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <include>**/*TestCase.java</include> - <include>**/*Test.java</include> - <include>**/Test*.java</include> - </includes> - <excludes> - <exclude>**/Abstract*TestCase.java</exclude> -  - <include>**/Test*$*.java</include> - </excludes> - <systemProperties> - <property> - <name>user.dir</name> - <value>${basedir}/target</value> - </property> - <property> - <name>java.io.tmpdir</name> - <value>${basedir}/target</value> - </property> - </systemProperties> - </configuration> - </plugin> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - <configuration> - <archive> - <manifest> - <addDefaultSpecificationEntries> true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries> true</addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <Implementation-URL>${pom.url}</Implementation-URL> - </manifestEntries> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.5</version> - </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <aggregate>true</aggregate> - <maxmemory>512m</maxmemory> - <excludePackageNames>*.internal</excludePackageNames> - </configuration> - </plugin> - </plugins> - </reporting> - <repositories> - <repository> - <id>jboss-public-repository</id> - <name>JBoss Public Maven Repository Group</name> - <url>http://repository.jboss.org/nexus/content/groups/public/</url> - </repository> - </repositories> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.5</version> - <scope>test</scope> - </dependency> - </dependencies> - <dependencyManagement> - <dependencies> -  - -  - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <type>test-jar</type> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-console</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-console</artifactId> - <type>test-jar</type> - <version>${project.version}</version> - <scope>test</scope> - </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</artifactId> - <type>test-jar</type> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <type>test-jar</type> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-metadata</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-metadata</artifactId> - <type>test-jar</type> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-txn-jbossts</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-jboss-integration</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-runtime</artifactId> - <version>${project.version}</version> - </dependency> - -  - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <version>1.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - <exclusions> - <exclusion> - <groupId>logkit</groupId> - <artifactId>logkit</artifactId> - </exclusion> - <exclusion> - <groupId>avalon-framework</groupId> - <artifactId>avalon-framework</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>jgroups</groupId> - <artifactId>jgroups</artifactId> - <version>2.6.10.GA</version> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>3.1.0.GA</version> - <exclusions> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - <version>2.1.0.SP1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-metatype</artifactId> - <version>2.1.0.SP1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.integration</groupId> - <artifactId>jboss-profileservice-spi</artifactId> - <version>5.1.0.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <version>2.1.2.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <version>2.0.7.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <version>2.0.7.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-connector</artifactId> - <version>5.1.0.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-reflect</artifactId> - <version>2.0.2.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.remoting</groupId> - <artifactId>jboss-remoting</artifactId> - <version>2.5.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>net.sourceforge.saxon</groupId> - <artifactId>saxon</artifactId> - <version>9.1.0.8</version> - </dependency> - <dependency> - <groupId>net.sourceforge.saxon</groupId> - <artifactId>saxon</artifactId> - <classifier>dom</classifier> - <version>9.1.0.8</version> - </dependency> - <dependency> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - <version>3.2.1.Final</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${ant.version}</version> - </dependency> - <dependency> - <groupId>com.googlecode.json-simple</groupId> - <artifactId>json-simple</artifactId> - <version>1.1</version> - </dependency> - </dependencies> - </dependencyManagement> - <modules> - <module>common-core</module> - <module>api</module> - <module>client</module> - <module>engine</module> - <module>connectors</module> - <module>console</module> - <module>metadata</module> - <module>runtime</module> - <module>adminshell</module> - <module>cache-jbosscache</module> - <module>hibernate-dialect</module> - <module>jboss-integration</module> - <module>test-integration</module> - </modules> - <distributionManagement> - <repository> - <id>jboss-releases-repository</id> - <name>JBoss Releases Repository</name> - <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url> - </repository> - <snapshotRepository> - <id>jboss-snapshots-repository</id> - <name>JBoss Snapshots Repository</name> - <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url> - </snapshotRepository> - </distributionManagement> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/pom.xml (from rev 3070, trunk/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,493 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-parent</artifactId> + <packaging>pom</packaging> + <name>Teiid</name> + <version>7.4.0.Beta2</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.4.0.Beta2</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-7.4.0.Beta2</developerConnection> + </scm> + <licenses> + <license> + <name>GNU Lesser General Public License</name> + <url>http://www.gnu.org/licenses/lgpl.html</url> + <distribution>repo</distribution> + <comments>A business-friendly OSS license</comments> + </license> + </licenses> + <url>${site.url}</url> + <developers> + <developer> + <name>Steve Hawkins</name> + <id>steve</id> + <email>shawkins(a)redhat.com</email> + <organization>Red Hat</organization> + <roles> + <role>Project Lead</role> + </roles> + <timezone>-6</timezone> + </developer> + <developer> + <name>Ramesh Reddy</name> + <id>ramesh</id> + <email>rareddy(a)redhat.com</email> + <organization>Red Hat</organization> + <roles> + <role>Project Lead</role> + </roles> + <timezone>-6</timezone> + </developer> + <developer> + <name>Van Halbert</name> + <id>van</id> + <email>vhalbert(a)redhat.com</email> + <organization>Red Hat</organization> + <roles> + <role>Developer</role> + </roles> + <timezone>-6</timezone> + </developer> + <developer> + <name>Ted Jones</name> + <id>ted</id> + <email>tejones(a)redhat.com</email> + <organization>Red Hat</organization> + <roles> + <role>Developer</role> + </roles> + <timezone>-6</timezone> + </developer> + </developers> + <profiles> + <profile> +  + <id>release</id> + <modules> + <module>documentation</module> + <module>build</module> + </modules> + </profile> + <profile> +  + <id>dev</id> + <modules> + <module>build</module> + </modules> + </profile> + </profiles> + <build> +  + <pluginManagement> + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-6-m1-jboss</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + <showDeprecation>false</showDeprecation> + <showWarnings>false</showWarnings> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/*TestCase.java</include> + <include>**/*Test.java</include> + <include>**/Test*.java</include> + </includes> + <excludes> + <exclude>**/Abstract*TestCase.java</exclude> +  + <include>**/Test*$*.java</include> + </excludes> + <systemProperties> + <property> + <name>user.dir</name> + <value>${basedir}/target</value> + </property> + <property> + <name>java.io.tmpdir</name> + <value>${basedir}/target</value> + </property> + </systemProperties> + </configuration> + </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + <configuration> + <archive> + <manifest> + <addDefaultSpecificationEntries> true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries> true</addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <Implementation-URL>${pom.url}</Implementation-URL> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.5</version> + </plugin> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <aggregate>true</aggregate> + <maxmemory>512m</maxmemory> + <excludePackageNames>*.internal</excludePackageNames> + </configuration> + </plugin> + </plugins> + </reporting> + <repositories> + <repository> + <id>jboss-public-repository</id> + <name>JBoss Public Maven Repository Group</name> + <url>http://repository.jboss.org/nexus/content/groups/public/</url> + </repository> + </repositories> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.5</version> + <scope>test</scope> + </dependency> + </dependencies> + <dependencyManagement> + <dependencies> +  + +  + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <type>test-jar</type> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-console</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-console</artifactId> + <type>test-jar</type> + <version>${project.version}</version> + <scope>test</scope> + </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</artifactId> + <type>test-jar</type> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <type>test-jar</type> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-metadata</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-metadata</artifactId> + <type>test-jar</type> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-txn-jbossts</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-jboss-integration</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-runtime</artifactId> + <version>${project.version}</version> + </dependency> + +  + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + <exclusions> + <exclusion> + <groupId>logkit</groupId> + <artifactId>logkit</artifactId> + </exclusion> + <exclusion> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>2.6.10.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.1.0.GA</version> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-managed</artifactId> + <version>2.1.0.SP1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-metatype</artifactId> + <version>2.1.0.SP1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <version>5.1.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + <version>2.1.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs-spi</artifactId> + <version>2.0.7.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <version>2.0.7.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-connector</artifactId> + <version>5.1.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + <version>2.0.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + <version>2.5.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <version>9.1.0.8</version> + </dependency> + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <classifier>dom</classifier> + <version>9.1.0.8</version> + </dependency> + <dependency> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + <version>3.2.1.Final</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>${ant.version}</version> + </dependency> + <dependency> + <groupId>com.googlecode.json-simple</groupId> + <artifactId>json-simple</artifactId> + <version>1.1</version> + </dependency> + </dependencies> + </dependencyManagement> + <modules> + <module>common-core</module> + <module>api</module> + <module>client</module> + <module>engine</module> + <module>connectors</module> + <module>console</module> + <module>metadata</module> + <module>runtime</module> + <module>adminshell</module> + <module>cache-jbosscache</module> + <module>hibernate-dialect</module> + <module>jboss-integration</module> + <module>test-integration</module> + </modules> + <distributionManagement> + <repository> + <id>jboss-releases-repository</id> + <name>JBoss Releases Repository</name> + <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url> + </repository> + <snapshotRepository> + <id>jboss-snapshots-repository</id> + <name>JBoss Snapshots Repository</name> + <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url> + </snapshotRepository> + </distributionManagement> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/runtime/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-runtime</artifactId> - <name>Runtime Engine</name> - <description>Teiid Runtime Engine</description> - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-metadata</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.integration</groupId> - <artifactId>jboss-profileservice-spi</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/runtime/pom.xml (from rev 3070, trunk/runtime/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/runtime/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/runtime/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-runtime</artifactId> + <name>Runtime Engine</name> + <description>Teiid Runtime Engine</description> + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-metadata</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs-spi</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/test-integration/common/pom.xml =================================================================== --- trunk/test-integration/common/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/test-integration/common/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-test-integration</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>test-integration-common</artifactId> - <name>Common Integration Tests</name> - <description>Common Integration tests that do not require external dependencies</description> - <dependencies> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.3-606.jdbc3</version> - </dependency> - </dependencies> - -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/test-integration/common/pom.xml (from rev 3070, trunk/test-integration/common/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/test-integration/common/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/test-integration/common/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-test-integration</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>test-integration-common</artifactId> + <name>Common Integration Tests</name> + <description>Common Integration tests that do not require external dependencies</description> + <dependencies> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.3-606.jdbc3</version> + </dependency> + </dependencies> + +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/test-integration/db/pom.xml =================================================================== --- trunk/test-integration/db/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/test-integration/db/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,537 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - - - <parent> - <artifactId>teiid-test-integration</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>test-integration-db</artifactId> - - <name>DB Dependent Integration Tests</name> - <groupId>org.jboss.teiid.teiid-test-integration</groupId> - <description>Integration tests that require external database dependencies </description> - <dependencies> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <type>test-jar</type> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - <scope>compile</scope> - </dependency> - - - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <type>test-jar</type> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>test-integration-common</artifactId> - <type>test-jar</type> - <scope>compile</scope> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>1.7.0</version> - </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> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - - </dependency> - - <dependency> - <groupId>ant-contrib</groupId> - <artifactId>cpptasks</artifactId> - <version>1.0b3</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </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>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>${postgresql.version}</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> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - - <build> - <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <showDeprecation>false</showDeprecation> - <showWarnings>false</showWarnings> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/assembly/binaries.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - - <profile> - <id>runalltests</id> - <build> - <plugins> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <additionalClasspathElements> - <additionalClasspathElement>${basedir}/lib/ojdbc6.jar</additionalClasspathElement> - <additionalClasspathElement>${basedir}/lib/sqljdbc4.jar</additionalClasspathElement> - <additionalClasspathElement>${basedir}/lib/db2jcc4.jar</additionalClasspathElement> - - </additionalClasspathElements> - <systemProperties> - <property> - <name>usedatasources</name> - <value>${usedatasources}</value> - </property> - <property> - <name>datasourceloc</name> - <value>${datasourceloc}</value> - </property> - </systemProperties> - - - <includes> -  - <include>**/*Test.java</include> - <include>**/*Tests.java</include> - <include>**/Test*.java</include> - </includes> - <excludes> - <exclude>**/*Abstract*TestCase.java</exclude> - <exclude>**/*Abstract*Test.java</exclude> -  - <exclude>**/Test*$*.java</exclude> - </excludes> - - </configuration> - </plugin> - - </plugins> - - </build> - - - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - - <configuration> - <outputDirectory>${basedir}/target/newsite</outputDirectory> - </configuration> - </plugin> - </plugins> - </reporting> - </profile> - - <profile> - <id>runsingletest</id> - <activation> - <property> - <name>classname</name> - </property> - </activation> - <build> - <plugins> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <additionalClasspathElements> - <additionalClasspathElement>${basedir}/lib/ojdbc6.jar</additionalClasspathElement> - <additionalClasspathElement>${basedir}/lib/sqljdbc4.jar</additionalClasspathElement> - <additionalClasspathElement>${basedir}/lib/db2jcc4.jar</additionalClasspathElement> - </additionalClasspathElements> - <systemProperties> - <property> - <name>usedatasources</name> - <value>${usedatasources}</value> - </property> - <property> - <name>datasourceloc</name> - <value>${datasourceloc}</value> - </property> - </systemProperties> - - - <includes> - <include>**/${classname}.java</include> - </includes> - - </configuration> - </plugin> - - </plugins> - </build> - </profile> - - - <profile> - <id>setupdatasources</id> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${apache.ant.version}</version> - </dependency> - </dependencies> - <configuration> - </configuration> - <executions> - <execution> - <id>setupalldatasources</id> - <phase>pre-integration-test</phase> - <configuration> - <tasks> - <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> - <property name="relative.resources.dir" value="src/main/resources" /> - <property name="datasourceloc" value="${datasourceloc}" /> - <ant antfile="src/main/resources/ddl/manage_schemas.xml" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - - </plugins> - </build> - </profile> - <profile> - <id>singledatasource</id> - <activation> - <property> - <name>datasource</name> - </property> - </activation> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${apache.ant.version}</version> - </dependency> - </dependencies> - <configuration> - - </configuration> - <executions> - <execution> - <id>setupsingledatasource</id> - <phase>pre-integration-test</phase> - <configuration> - <tasks> - - <property name="single" value="${datasource}" /> - <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> - <property name="datasourceloc" value="${datasourceloc}" /> - - <property name="relative.resources.dir" value="src/main/resources" /> - <ant antfile="src/main/resources/ddl/manage_schemas.xml" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - - </plugins> - </build> - </profile> - - - <profile> - <id>runclienttests</id> - <activation> - <property> - <name>scenario.dir</name> - </property> - </activation> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${apache.ant.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>run-client-test</id> - <phase>integration-test</phase> - <configuration> - <tasks> - - <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> - <property name="scenario.dir" value="${scenario.dir}" /> - <property name="queryset.artifacts.dir" value="${queryset.artifacts.dir}" /> - <property name="vdb.artifacts.dir" value="${vdb.artifacts.dir}" /> -  - <property name="config.file" value="${config.file}" /> - <property name="query.scenario.classname" value="${query.scenario.classname}" /> - <property name="proj.dir" value="${project.basedir}/target/" /> - <property name="usedatasources" value="${usedatasources}" /> - <property name="datasourceloc" value="${datasourceloc}" /> - - <ant antfile="src/main/resources/ctc_tests/ctc.xml" /> - - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - </executions> - </plugin> - </plugins> - </build> - - </profile> - - <profile> - <id>assemble</id> - - - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/assembly/binaries.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/work/assembly</workDirectory> - - </configuration> - <executions> - - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - - </profiles> - - -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/test-integration/db/pom.xml (from rev 3070, trunk/test-integration/db/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/test-integration/db/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/test-integration/db/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,537 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + + + <parent> + <artifactId>teiid-test-integration</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>test-integration-db</artifactId> + + <name>DB Dependent Integration Tests</name> + <groupId>org.jboss.teiid.teiid-test-integration</groupId> + <description>Integration tests that require external database dependencies </description> + <dependencies> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <type>test-jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + <scope>compile</scope> + </dependency> + + + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <type>test-jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>test-integration-common</artifactId> + <type>test-jar</type> + <scope>compile</scope> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.0</version> + </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> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + + </dependency> + + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>cpptasks</artifactId> + <version>1.0b3</version> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </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>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>${postgresql.version}</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> + + <profiles> + <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + + <build> + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + <showDeprecation>false</showDeprecation> + <showWarnings>false</showWarnings> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/assembly/binaries.xml</descriptor> + </descriptors> + <outputDirectory>target/distribution</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + + <profile> + <id>runalltests</id> + <build> + <plugins> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <additionalClasspathElements> + <additionalClasspathElement>${basedir}/lib/ojdbc6.jar</additionalClasspathElement> + <additionalClasspathElement>${basedir}/lib/sqljdbc4.jar</additionalClasspathElement> + <additionalClasspathElement>${basedir}/lib/db2jcc4.jar</additionalClasspathElement> + + </additionalClasspathElements> + <systemProperties> + <property> + <name>usedatasources</name> + <value>${usedatasources}</value> + </property> + <property> + <name>datasourceloc</name> + <value>${datasourceloc}</value> + </property> + </systemProperties> + + + <includes> +  + <include>**/*Test.java</include> + <include>**/*Tests.java</include> + <include>**/Test*.java</include> + </includes> + <excludes> + <exclude>**/*Abstract*TestCase.java</exclude> + <exclude>**/*Abstract*Test.java</exclude> +  + <exclude>**/Test*$*.java</exclude> + </excludes> + + </configuration> + </plugin> + + </plugins> + + </build> + + + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + + <configuration> + <outputDirectory>${basedir}/target/newsite</outputDirectory> + </configuration> + </plugin> + </plugins> + </reporting> + </profile> + + <profile> + <id>runsingletest</id> + <activation> + <property> + <name>classname</name> + </property> + </activation> + <build> + <plugins> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <additionalClasspathElements> + <additionalClasspathElement>${basedir}/lib/ojdbc6.jar</additionalClasspathElement> + <additionalClasspathElement>${basedir}/lib/sqljdbc4.jar</additionalClasspathElement> + <additionalClasspathElement>${basedir}/lib/db2jcc4.jar</additionalClasspathElement> + </additionalClasspathElements> + <systemProperties> + <property> + <name>usedatasources</name> + <value>${usedatasources}</value> + </property> + <property> + <name>datasourceloc</name> + <value>${datasourceloc}</value> + </property> + </systemProperties> + + + <includes> + <include>**/${classname}.java</include> + </includes> + + </configuration> + </plugin> + + </plugins> + </build> + </profile> + + + <profile> + <id>setupdatasources</id> + <build> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>${apache.ant.version}</version> + </dependency> + </dependencies> + <configuration> + </configuration> + <executions> + <execution> + <id>setupalldatasources</id> + <phase>pre-integration-test</phase> + <configuration> + <tasks> + <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> + <property name="relative.resources.dir" value="src/main/resources" /> + <property name="datasourceloc" value="${datasourceloc}" /> + <ant antfile="src/main/resources/ddl/manage_schemas.xml" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + + </plugins> + </build> + </profile> + <profile> + <id>singledatasource</id> + <activation> + <property> + <name>datasource</name> + </property> + </activation> + <build> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>${apache.ant.version}</version> + </dependency> + </dependencies> + <configuration> + + </configuration> + <executions> + <execution> + <id>setupsingledatasource</id> + <phase>pre-integration-test</phase> + <configuration> + <tasks> + + <property name="single" value="${datasource}" /> + <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> + <property name="datasourceloc" value="${datasourceloc}" /> + + <property name="relative.resources.dir" value="src/main/resources" /> + <ant antfile="src/main/resources/ddl/manage_schemas.xml" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + + </plugins> + </build> + </profile> + + + <profile> + <id>runclienttests</id> + <activation> + <property> + <name>scenario.dir</name> + </property> + </activation> + <build> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>${apache.ant.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>run-client-test</id> + <phase>integration-test</phase> + <configuration> + <tasks> + + <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> + <property name="scenario.dir" value="${scenario.dir}" /> + <property name="queryset.artifacts.dir" value="${queryset.artifacts.dir}" /> + <property name="vdb.artifacts.dir" value="${vdb.artifacts.dir}" /> +  + <property name="config.file" value="${config.file}" /> + <property name="query.scenario.classname" value="${query.scenario.classname}" /> + <property name="proj.dir" value="${project.basedir}/target/" /> + <property name="usedatasources" value="${usedatasources}" /> + <property name="datasourceloc" value="${datasourceloc}" /> + + <ant antfile="src/main/resources/ctc_tests/ctc.xml" /> + + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + </executions> + </plugin> + </plugins> + </build> + + </profile> + + <profile> + <id>assemble</id> + + + <build> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/assembly/binaries.xml</descriptor> + </descriptors> + <outputDirectory>target/distribution</outputDirectory> + <workDirectory>target/work/assembly</workDirectory> + + </configuration> + <executions> + + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + + </profiles> + + +</project> \ No newline at end of file Deleted: tags/teiid-parent-7.4.0.Beta2/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ tags/teiid-parent-7.4.0.Beta2/test-integration/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -1,107 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>teiid-parent</artifactId> - <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>teiid-test-integration</artifactId> - <packaging>pom</packaging> - <name>Integration Tests</name> - <description>Integration tests spanning server/embedded/connectors.</description> - - <properties> - <derby.version>10.2.1.6</derby.version> - <mysql.connector.version>5.1.5</mysql.connector.version> - <postgresql.version>8.3-603.jdbc3</postgresql.version> - - <apache.ant.version>1.7.0</apache.ant.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-common-core</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-metadata</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-metadata</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-api</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>translator-jdbc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-engine</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-adminshell</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-runtime</artifactId> - </dependency> - -  - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>${derby.version}</version> - - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <scope>provided</scope> - </dependency> - - </dependencies> - - <modules> - <module>common</module> - <module>db</module> - </modules> -</project> \ No newline at end of file Copied: tags/teiid-parent-7.4.0.Beta2/test-integration/pom.xml (from rev 3070, trunk/test-integration/pom.xml) =================================================================== --- tags/teiid-parent-7.4.0.Beta2/test-integration/pom.xml (rev 0) +++ tags/teiid-parent-7.4.0.Beta2/test-integration/pom.xml 2011-04-06 19:34:31 UTC (rev 3071) @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>teiid-parent</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>7.4.0.Beta2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>teiid-test-integration</artifactId> + <packaging>pom</packaging> + <name>Integration Tests</name> + <description>Integration tests spanning server/embedded/connectors.</description> + + <properties> + <derby.version>10.2.1.6</derby.version> + <mysql.connector.version>5.1.5</mysql.connector.version> + <postgresql.version>8.3-603.jdbc3</postgresql.version> + + <apache.ant.version>1.7.0</apache.ant.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-metadata</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-metadata</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-jdbc</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-client</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-engine</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-adminshell</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-runtime</artifactId> + </dependency> + +  + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>${derby.version}</version> + + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs-spi</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <scope>provided</scope> + </dependency> + + </dependencies> + + <modules> + <module>common</module> + <module>db</module> + </modules> +</project> \ No newline at end of file

13 years, 9 months

1
0
0 / 0

teiid SVN: r3070 - in trunk: adminshell and 36 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-04-06 15:32:32 -0400 (Wed, 06 Apr 2011) New Revision: 3070 Modified: trunk/adminshell/pom.xml trunk/api/pom.xml trunk/build/pom.xml trunk/cache-jbosscache/pom.xml trunk/client/pom.xml trunk/common-core/pom.xml trunk/connectors/connector-file/pom.xml trunk/connectors/connector-ldap/pom.xml trunk/connectors/connector-salesforce/pom.xml trunk/connectors/connector-ws/pom.xml trunk/connectors/pom.xml trunk/connectors/salesforce-api/pom.xml trunk/connectors/sandbox/pom.xml trunk/connectors/sandbox/translator-yahoo/pom.xml trunk/connectors/translator-file/pom.xml trunk/connectors/translator-jdbc/pom.xml trunk/connectors/translator-ldap/pom.xml trunk/connectors/translator-loopback/pom.xml trunk/connectors/translator-olap/pom.xml trunk/connectors/translator-salesforce/pom.xml trunk/connectors/translator-ws/pom.xml trunk/console/pom.xml trunk/documentation/admin-guide/pom.xml trunk/documentation/caching-guide/pom.xml trunk/documentation/client-developers-guide/pom.xml trunk/documentation/developer-guide/pom.xml trunk/documentation/pom.xml trunk/documentation/quick-start-example/pom.xml trunk/documentation/reference/pom.xml trunk/engine/pom.xml trunk/hibernate-dialect/pom.xml trunk/jboss-integration/pom.xml trunk/metadata/pom.xml trunk/pom.xml trunk/runtime/pom.xml trunk/test-integration/common/pom.xml trunk/test-integration/db/pom.xml trunk/test-integration/pom.xml Log: [maven-release-plugin] prepare release teiid-parent-7.4.0.Beta2 Modified: trunk/adminshell/pom.xml =================================================================== --- trunk/adminshell/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/adminshell/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-adminshell</artifactId> Modified: trunk/api/pom.xml =================================================================== --- trunk/api/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/api/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-api</artifactId> Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/build/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid</artifactId> Modified: trunk/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/cache-jbosscache/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-cache-jbosscache</artifactId> Modified: trunk/client/pom.xml =================================================================== --- trunk/client/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/client/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client</artifactId> Modified: trunk/common-core/pom.xml =================================================================== --- trunk/common-core/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/common-core/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-common-core</artifactId> Modified: trunk/connectors/connector-file/pom.xml =================================================================== --- trunk/connectors/connector-file/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/connectors/connector-file/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-file</artifactId> Modified: trunk/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/connectors/connector-ldap/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/connectors/connector-salesforce/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> Modified: trunk/connectors/connector-ws/pom.xml =================================================================== --- trunk/connectors/connector-ws/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/connectors/connector-ws/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ws</artifactId> Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/connectors/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/connectors/salesforce-api/pom.xml =================================================================== --- trunk/connectors/salesforce-api/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/connectors/salesforce-api/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> Modified: trunk/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/connectors/sandbox/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid.connectors</groupId> Modified: trunk/connectors/sandbox/translator-yahoo/pom.xml =================================================================== --- trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-yahoo</artifactId> Modified: trunk/connectors/translator-file/pom.xml =================================================================== --- trunk/connectors/translator-file/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/connectors/translator-file/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-file</artifactId> Modified: trunk/connectors/translator-jdbc/pom.xml =================================================================== --- trunk/connectors/translator-jdbc/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/connectors/translator-jdbc/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-jdbc</artifactId> Modified: trunk/connectors/translator-ldap/pom.xml =================================================================== --- trunk/connectors/translator-ldap/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/connectors/translator-ldap/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ldap</artifactId> Modified: trunk/connectors/translator-loopback/pom.xml =================================================================== --- trunk/connectors/translator-loopback/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/connectors/translator-loopback/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-loopback</artifactId> Modified: trunk/connectors/translator-olap/pom.xml =================================================================== --- trunk/connectors/translator-olap/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/connectors/translator-olap/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-olap</artifactId> Modified: trunk/connectors/translator-salesforce/pom.xml =================================================================== --- trunk/connectors/translator-salesforce/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/connectors/translator-salesforce/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-salesforce</artifactId> Modified: trunk/connectors/translator-ws/pom.xml =================================================================== --- trunk/connectors/translator-ws/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/connectors/translator-ws/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ws</artifactId> Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/console/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/documentation/admin-guide/pom.xml =================================================================== --- trunk/documentation/admin-guide/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/documentation/admin-guide/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> Modified: trunk/documentation/caching-guide/pom.xml =================================================================== --- trunk/documentation/caching-guide/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/documentation/caching-guide/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>caching-guide</artifactId> Modified: trunk/documentation/client-developers-guide/pom.xml =================================================================== --- trunk/documentation/client-developers-guide/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/documentation/client-developers-guide/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>client-developers-guide</artifactId> Modified: trunk/documentation/developer-guide/pom.xml =================================================================== --- trunk/documentation/developer-guide/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/documentation/developer-guide/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>developer-guide</artifactId> Modified: trunk/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/documentation/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/documentation/quick-start-example/pom.xml =================================================================== --- trunk/documentation/quick-start-example/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/documentation/quick-start-example/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>quick-start-example</artifactId> Modified: trunk/documentation/reference/pom.xml =================================================================== --- trunk/documentation/reference/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/documentation/reference/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> Modified: trunk/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/engine/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-engine</artifactId> Modified: trunk/hibernate-dialect/pom.xml =================================================================== --- trunk/hibernate-dialect/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/hibernate-dialect/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-hibernate-dialect</artifactId> Modified: trunk/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/jboss-integration/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/metadata/pom.xml =================================================================== --- trunk/metadata/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/metadata/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-metadata</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -5,15 +5,15 @@ <artifactId>teiid-parent</artifactId> <packaging>pom</packaging> <name>Teiid</name> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</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/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection> + <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-7.4.0.Beta2</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-7.4.0.Beta2</developerConnection> </scm> <licenses> <license> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/runtime/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/test-integration/common/pom.xml =================================================================== --- trunk/test-integration/common/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/test-integration/common/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-integration-common</artifactId> Modified: trunk/test-integration/db/pom.xml =================================================================== --- trunk/test-integration/db/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/test-integration/db/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -9,7 +9,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) +++ trunk/test-integration/pom.xml 2011-04-06 19:32:32 UTC (rev 3070) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2-SNAPSHOT</version> + <version>7.4.0.Beta2</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-test-integration</artifactId>

13 years, 9 months

1
0
0 / 0

teiid SVN: r3069 - in trunk: adminshell and 36 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-04-06 14:42:21 -0400 (Wed, 06 Apr 2011) New Revision: 3069 Modified: trunk/adminshell/pom.xml trunk/api/pom.xml trunk/build/pom.xml trunk/cache-jbosscache/pom.xml trunk/client/pom.xml trunk/common-core/pom.xml trunk/connectors/connector-file/pom.xml trunk/connectors/connector-ldap/pom.xml trunk/connectors/connector-salesforce/pom.xml trunk/connectors/connector-ws/pom.xml trunk/connectors/pom.xml trunk/connectors/salesforce-api/pom.xml trunk/connectors/sandbox/pom.xml trunk/connectors/sandbox/translator-yahoo/pom.xml trunk/connectors/translator-file/pom.xml trunk/connectors/translator-jdbc/pom.xml trunk/connectors/translator-ldap/pom.xml trunk/connectors/translator-loopback/pom.xml trunk/connectors/translator-olap/pom.xml trunk/connectors/translator-salesforce/pom.xml trunk/connectors/translator-ws/pom.xml trunk/console/pom.xml trunk/documentation/admin-guide/pom.xml trunk/documentation/caching-guide/pom.xml trunk/documentation/client-developers-guide/pom.xml trunk/documentation/developer-guide/pom.xml trunk/documentation/pom.xml trunk/documentation/quick-start-example/pom.xml trunk/documentation/reference/pom.xml trunk/engine/pom.xml trunk/hibernate-dialect/pom.xml trunk/jboss-integration/pom.xml trunk/metadata/pom.xml trunk/pom.xml trunk/runtime/pom.xml trunk/test-integration/common/pom.xml trunk/test-integration/db/pom.xml trunk/test-integration/pom.xml Log: fixing the version to appropriately be a snapshot Modified: trunk/adminshell/pom.xml =================================================================== --- trunk/adminshell/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/adminshell/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-adminshell</artifactId> Modified: trunk/api/pom.xml =================================================================== --- trunk/api/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/api/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-api</artifactId> Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/build/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid</artifactId> Modified: trunk/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/cache-jbosscache/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-cache-jbosscache</artifactId> Modified: trunk/client/pom.xml =================================================================== --- trunk/client/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/client/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client</artifactId> Modified: trunk/common-core/pom.xml =================================================================== --- trunk/common-core/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/common-core/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-common-core</artifactId> Modified: trunk/connectors/connector-file/pom.xml =================================================================== --- trunk/connectors/connector-file/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/connectors/connector-file/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-file</artifactId> Modified: trunk/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/connectors/connector-ldap/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/connectors/connector-salesforce/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> Modified: trunk/connectors/connector-ws/pom.xml =================================================================== --- trunk/connectors/connector-ws/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/connectors/connector-ws/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ws</artifactId> Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/connectors/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/connectors/salesforce-api/pom.xml =================================================================== --- trunk/connectors/salesforce-api/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/connectors/salesforce-api/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> Modified: trunk/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/connectors/sandbox/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid.connectors</groupId> Modified: trunk/connectors/sandbox/translator-yahoo/pom.xml =================================================================== --- trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-yahoo</artifactId> Modified: trunk/connectors/translator-file/pom.xml =================================================================== --- trunk/connectors/translator-file/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/connectors/translator-file/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-file</artifactId> Modified: trunk/connectors/translator-jdbc/pom.xml =================================================================== --- trunk/connectors/translator-jdbc/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/connectors/translator-jdbc/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-jdbc</artifactId> Modified: trunk/connectors/translator-ldap/pom.xml =================================================================== --- trunk/connectors/translator-ldap/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/connectors/translator-ldap/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ldap</artifactId> Modified: trunk/connectors/translator-loopback/pom.xml =================================================================== --- trunk/connectors/translator-loopback/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/connectors/translator-loopback/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-loopback</artifactId> Modified: trunk/connectors/translator-olap/pom.xml =================================================================== --- trunk/connectors/translator-olap/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/connectors/translator-olap/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-olap</artifactId> Modified: trunk/connectors/translator-salesforce/pom.xml =================================================================== --- trunk/connectors/translator-salesforce/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/connectors/translator-salesforce/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-salesforce</artifactId> Modified: trunk/connectors/translator-ws/pom.xml =================================================================== --- trunk/connectors/translator-ws/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/connectors/translator-ws/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ws</artifactId> Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/console/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/documentation/admin-guide/pom.xml =================================================================== --- trunk/documentation/admin-guide/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/documentation/admin-guide/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> Modified: trunk/documentation/caching-guide/pom.xml =================================================================== --- trunk/documentation/caching-guide/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/documentation/caching-guide/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>caching-guide</artifactId> Modified: trunk/documentation/client-developers-guide/pom.xml =================================================================== --- trunk/documentation/client-developers-guide/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/documentation/client-developers-guide/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>client-developers-guide</artifactId> Modified: trunk/documentation/developer-guide/pom.xml =================================================================== --- trunk/documentation/developer-guide/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/documentation/developer-guide/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>developer-guide</artifactId> Modified: trunk/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/documentation/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/documentation/quick-start-example/pom.xml =================================================================== --- trunk/documentation/quick-start-example/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/documentation/quick-start-example/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>quick-start-example</artifactId> Modified: trunk/documentation/reference/pom.xml =================================================================== --- trunk/documentation/reference/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/documentation/reference/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> Modified: trunk/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/engine/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-engine</artifactId> Modified: trunk/hibernate-dialect/pom.xml =================================================================== --- trunk/hibernate-dialect/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/hibernate-dialect/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-hibernate-dialect</artifactId> Modified: trunk/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/jboss-integration/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/metadata/pom.xml =================================================================== --- trunk/metadata/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/metadata/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-metadata</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -5,7 +5,7 @@ <artifactId>teiid-parent</artifactId> <packaging>pom</packaging> <name>Teiid</name> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> <description>Federated SQL and XML query engine.</description> <properties> <ant.version>1.7.0</ant.version> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/runtime/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/test-integration/common/pom.xml =================================================================== --- trunk/test-integration/common/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/test-integration/common/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-integration-common</artifactId> Modified: trunk/test-integration/db/pom.xml =================================================================== --- trunk/test-integration/db/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/test-integration/db/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -9,7 +9,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2011-04-06 18:05:32 UTC (rev 3068) +++ trunk/test-integration/pom.xml 2011-04-06 18:42:21 UTC (rev 3069) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.4.0.Beta2</version> + <version>7.4.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-test-integration</artifactId>

13 years, 9 months

1
0
0 / 0

teiid SVN: r3068 - in trunk: engine/src/main/java/org/teiid/dqp/internal/process and 5 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-04-06 14:05:32 -0400 (Wed, 06 Apr 2011) New Revision: 3068 Added: trunk/api/src/main/java/org/teiid/metadata/MetadataProvider.java Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java trunk/engine/src/main/java/org/teiid/query/mapping/relational/QueryNode.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/command/UpdateProcedureResolver.java trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java Log: TEIID-1326 adding the ability to inject new view definitions at runtime. Added: trunk/api/src/main/java/org/teiid/metadata/MetadataProvider.java =================================================================== --- trunk/api/src/main/java/org/teiid/metadata/MetadataProvider.java (rev 0) +++ trunk/api/src/main/java/org/teiid/metadata/MetadataProvider.java 2011-04-06 18:05:32 UTC (rev 3068) @@ -0,0 +1,70 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.metadata; + +import org.teiid.CommandContext; + +/** + * A hook for providing {@link ViewDefinition}s + */ +public interface MetadataProvider { + + public enum Scope { + /** + * The {@link ViewDefinition} applies only to the calling user + */ + USER, + /** + * The {@link ViewDefinition} applies to all users + */ + VDB + } + + public static class ViewDefinition { + private String sql; + private Scope scope = Scope.VDB; + + public ViewDefinition(String sql, Scope scope) { + this.sql = sql; + this.scope = scope; + } + + public String getSql() { + return sql; + } + + public Scope getScope() { + return scope; + } + } + + /** + * Returns an updated {@link ViewDefinition} or null if the default view definition + * should be used. + * @param viewName + * @param context + * @return + */ + ViewDefinition getViewDefinition(String schema, String viewName, CommandContext context); + +} Property changes on: trunk/api/src/main/java/org/teiid/metadata/MetadataProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java 2011-04-06 18:00:20 UTC (rev 3067) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java 2011-04-06 18:05:32 UTC (rev 3068) @@ -25,6 +25,7 @@ import org.teiid.cache.CacheConfiguration; import org.teiid.client.RequestMessage; import org.teiid.core.util.ApplicationInfo; +import org.teiid.metadata.MetadataProvider; public class DQPConfiguration{ @@ -56,6 +57,7 @@ private int userRequestSourceConcurrency = DEFAULT_USER_REQUEST_SOURCE_CONCURRENCY; private AuthorizationValidator authorizationValidator; + private MetadataProvider metadataProvider; @ManagementProperty(description="Max active plans (default 20). Increase this value, and max threads, on highly concurrent systems - but ensure that the underlying pools can handle the increased load without timeouts.") public int getMaxActivePlans() { @@ -220,4 +222,12 @@ AuthorizationValidator authorizationValidator) { this.authorizationValidator = authorizationValidator; } + + public MetadataProvider getMetadataProvider() { + return metadataProvider; + } + + public void setMetadataProvider(MetadataProvider metadataProvider) { + this.metadataProvider = metadataProvider; + } } Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2011-04-06 18:00:20 UTC (rev 3067) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2011-04-06 18:05:32 UTC (rev 3068) @@ -325,6 +325,7 @@ request.setResultSetCacheEnabled(this.rsCache != null); request.setAuthorizationValidator(this.authorizationValidator); request.setUserRequestConcurrency(this.getUserRequestSourceConcurrency()); + request.setMetadataProvider(this.config.getMetadataProvider()); ResultsFuture<ResultsMessage> resultsFuture = new ResultsFuture<ResultsMessage>(); RequestWorkItem workItem = new RequestWorkItem(this, requestMsg, request, resultsFuture.getResultsReceiver(), requestID, workContext); logMMCommand(workItem, Event.NEW, null); Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2011-04-06 18:00:20 UTC (rev 3067) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2011-04-06 18:05:32 UTC (rev 3068) @@ -24,8 +24,11 @@ import java.sql.Connection; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Properties; import java.util.Set; @@ -57,10 +60,14 @@ import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; import org.teiid.logging.MessageLevel; +import org.teiid.metadata.MetadataProvider; import org.teiid.metadata.FunctionMethod.Determinism; +import org.teiid.metadata.MetadataProvider.ViewDefinition; import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; import org.teiid.query.eval.SecurityFunctionEvaluator; +import org.teiid.query.mapping.relational.QueryNode; +import org.teiid.query.metadata.BasicQueryMetadataWrapper; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.metadata.TempCapabilitiesFinder; import org.teiid.query.metadata.TempMetadataAdapter; @@ -98,8 +105,53 @@ /** * Server side representation of the RequestMessage. Knows how to process itself. */ -public class Request { +public class Request implements SecurityFunctionEvaluator { + private final class ViewDefinitionMetadataWrapper extends + BasicQueryMetadataWrapper { + + private Map<List<String>, QueryNode> qnodes = new HashMap<List<String>, QueryNode>(); + + private ViewDefinitionMetadataWrapper( + QueryMetadataInterface actualMetadata) { + super(actualMetadata); + } + + @Override + public QueryNode getVirtualPlan(Object groupID) + throws TeiidComponentException, QueryMetadataException { + QueryNode result = super.getVirtualPlan(groupID); + //if there's no exception, then this must be a visible view + + String schema = getName(getModelID(groupID)); + String viewName = getName(groupID); + List<String> key = Arrays.asList(schema, viewName); + + QueryNode cached = qnodes.get(key); + if (cached != null) { + return cached; + } + if (context == null) { + //TODO: could just consider moving up when the context is created + throw new AssertionError("Should not attempt to resolve a view before the context has been set."); //$NON-NLS-1$ + } + ViewDefinition vd = metadataProvider.getViewDefinition(getName(getModelID(groupID)), getName(groupID), context); + if (vd != null) { + result = new QueryNode(DataTypeManager.getCanonicalString(vd.getSql())); + if (vd.getScope() == MetadataProvider.Scope.USER) { + result.setUser(context.getUserName()); + } + } + qnodes.put(key, result); + return result; + } + + @Override + public QueryMetadataInterface getDesignTimeMetadata() { + return new ViewDefinitionMetadataWrapper(this.actualMetadata.getDesignTimeMetadata()); + } + } + // init state protected RequestMessage requestMsg; private String vdbName; @@ -135,6 +187,7 @@ private boolean resultSetCacheEnabled = true; private int userRequestConcurrency; private AuthorizationValidator authorizationValidator; + private MetadataProvider metadataProvider; void initialize(RequestMessage requestMsg, BufferManager bufferManager, @@ -173,6 +226,10 @@ this.authorizationValidator = authorizationValidator; } + public void setMetadataProvider(MetadataProvider metadataProvider) { + this.metadataProvider = metadataProvider; + } + /** * if the metadata has not been supplied via setMetadata, this method will create the appropriate state * @@ -201,6 +258,10 @@ this.metadata = new MultiSourceMetadataWrapper(this.metadata, this.multiSourceModels); } + if (this.metadataProvider != null) { + this.metadata = new ViewDefinitionMetadataWrapper(this.metadata); + } + TempMetadataAdapter tma = new TempMetadataAdapter(metadata, new TempMetadataStore()); tma.setSession(true); this.metadata = tma; @@ -244,15 +305,7 @@ context.setPlanToProcessConverter(modifier); } - context.setSecurityFunctionEvaluator(new SecurityFunctionEvaluator() { - @Override - public boolean hasRole(String roleType, String roleName) throws TeiidComponentException { - if (!DATA_ROLE.equalsIgnoreCase(roleType)) { - return false; - } - return authorizationValidator.hasRole(roleName, workContext); - } - }); + context.setSecurityFunctionEvaluator(this); context.setTempTableStore(tempTableStore); context.setQueryProcessorFactory(new QueryProcessorFactoryImpl(this.bufferManager, this.processorDataManager, this.capabilitiesFinder, idGenerator, metadata)); context.setMetadata(this.metadata); @@ -262,6 +315,15 @@ context.setUserRequestSourceConcurrency(this.userRequestConcurrency); } + @Override + public boolean hasRole(String roleType, String roleName) + throws TeiidComponentException { + if (!DATA_ROLE.equalsIgnoreCase(roleType)) { + return false; + } + return authorizationValidator.hasRole(roleName, workContext); + } + public void setUserRequestConcurrency(int userRequestConcurrency) { this.userRequestConcurrency = userRequestConcurrency; } Modified: trunk/engine/src/main/java/org/teiid/query/mapping/relational/QueryNode.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/mapping/relational/QueryNode.java 2011-04-06 18:00:20 UTC (rev 3067) +++ trunk/engine/src/main/java/org/teiid/query/mapping/relational/QueryNode.java 2011-04-06 18:05:32 UTC (rev 3068) @@ -26,6 +26,7 @@ import java.util.List; import org.teiid.query.sql.lang.Command; +import org.teiid.query.validator.UpdateValidator.UpdateInfo; /** @@ -43,9 +44,10 @@ // Initial state private String query; private List<String> bindings; // optional - construct if needed - + private String user; // After parsing and resolution private Command command; + private UpdateInfo updateInfo; /** * Construct a query node with the required parameters. @@ -123,5 +125,21 @@ public String toString() { return query; } - + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + public UpdateInfo getUpdateInfo() { + return updateInfo; + } + + public void setUpdateInfo(UpdateInfo updateInfo) { + this.updateInfo = updateInfo; + } + } Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2011-04-06 18:00:20 UTC (rev 3067) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2011-04-06 18:05:32 UTC (rev 3068) @@ -1114,7 +1114,7 @@ qnode = metadata.getVirtualPlan(metadataID); } - Command result = QueryResolver.resolveView(virtualGroup, qnode, cacheString, metadata); + Command result = (Command)QueryResolver.resolveView(virtualGroup, qnode, cacheString, metadata).getCommand().clone(); return QueryRewriter.rewrite(result, metadata, context); } @@ -1155,7 +1155,7 @@ for (Object index : indexes) { id.addIndex(resolveIndex(metadata, id, index)); } - Command c = QueryResolver.resolveView(table, metadata.getVirtualPlan(table.getMetadataID()), SQLConstants.Reserved.SELECT, metadata); + Command c = (Command)QueryResolver.resolveView(table, metadata.getVirtualPlan(table.getMetadataID()), SQLConstants.Reserved.SELECT, metadata).getCommand().clone(); CacheHint hint = c.getCacheHint(); if (hint != null) { recordAnnotation(analysisRecord, Annotation.MATERIALIZED_VIEW, Priority.LOW, "SimpleQueryResolver.cache_hint_used", table, matTableName, id.getCacheHint()); //$NON-NLS-1$ Modified: trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java 2011-04-06 18:00:20 UTC (rev 3067) +++ trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java 2011-04-06 18:05:32 UTC (rev 3068) @@ -29,10 +29,10 @@ import org.teiid.api.exception.query.QueryMetadataException; import org.teiid.api.exception.query.QueryParserException; import org.teiid.api.exception.query.QueryResolverException; +import org.teiid.api.exception.query.QueryValidatorException; import org.teiid.client.metadata.ParameterInfo; import org.teiid.core.TeiidComponentException; import org.teiid.core.types.DataTypeManager; -import org.teiid.core.util.StringUtil; import org.teiid.language.SQLConstants; import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; @@ -43,7 +43,6 @@ import org.teiid.query.metadata.TempMetadataStore; import org.teiid.query.metadata.TempMetadataID.Type; import org.teiid.query.parser.QueryParser; -import org.teiid.query.resolver.command.UpdateProcedureResolver; import org.teiid.query.resolver.util.ResolverUtil; import org.teiid.query.sql.ProcedureReservedWords; import org.teiid.query.sql.lang.Command; @@ -55,9 +54,7 @@ import org.teiid.query.sql.symbol.ElementSymbol; import org.teiid.query.sql.symbol.GroupSymbol; import org.teiid.query.sql.symbol.SingleElementSymbol; -import org.teiid.query.validator.UpdateValidator; import org.teiid.query.validator.UpdateValidator.UpdateInfo; -import org.teiid.query.validator.UpdateValidator.UpdateType; public abstract class ProcedureContainerResolver implements CommandResolver { @@ -184,37 +181,16 @@ public static UpdateInfo getUpdateInfo(GroupSymbol group, QueryMetadataInterface metadata) throws TeiidComponentException, QueryMetadataException, QueryResolverException { - //if this is not a view, just return null - if(group.isTempGroupSymbol() || !metadata.isVirtualGroup(group.getMetadataID()) || !metadata.isVirtualModel(metadata.getModelID(group.getMetadataID()))) { + if (!QueryResolver.isView(group, metadata)) { return null; } - String updatePlan = metadata.getUpdatePlan(group.getMetadataID()); - String deletePlan = metadata.getDeletePlan(group.getMetadataID()); - String insertPlan = metadata.getInsertPlan(group.getMetadataID()); - - UpdateInfo info = (UpdateInfo)metadata.getFromMetadataCache(group.getMetadataID(), "UpdateInfo"); //$NON-NLS-1$ - if (info == null) { - List<ElementSymbol> elements = ResolverUtil.resolveElementsInGroup(group, metadata); - UpdateValidator validator = new UpdateValidator(metadata, determineType(insertPlan), determineType(updatePlan), determineType(deletePlan)); - info = validator.getUpdateInfo(); - validator.validate(UpdateProcedureResolver.getQueryTransformCmd(group, metadata), elements); - metadata.addToMetadataCache(group.getMetadataID(), "UpdateInfo", info); //$NON-NLS-1$ - } - return info; - } - - private static UpdateType determineType(String plan) { - UpdateType type = UpdateType.INHERENT; - if (plan != null) { - if (StringUtil.startsWithIgnoreCase(plan, SQLConstants.Reserved.CREATE)) { - type = UpdateType.UPDATE_PROCEDURE; - } else { - type = UpdateType.INSTEAD_OF; - } + try { + return QueryResolver.resolveView(group, metadata.getVirtualPlan(group.getMetadataID()), SQLConstants.Reserved.SELECT, metadata).getUpdateInfo(); + } catch (QueryValidatorException e) { + throw new QueryResolverException(e, e.getMessage()); } - return type; } - + /** * @param metadata * @param procCommand Modified: trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java 2011-04-06 18:00:20 UTC (rev 3067) +++ trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java 2011-04-06 18:05:32 UTC (rev 3068) @@ -37,7 +37,9 @@ import org.teiid.core.TeiidComponentException; import org.teiid.core.types.DataTypeManager; import org.teiid.core.util.Assertion; +import org.teiid.core.util.StringUtil; import org.teiid.dqp.internal.process.Request; +import org.teiid.language.SQLConstants; import org.teiid.logging.LogManager; import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; @@ -80,7 +82,10 @@ import org.teiid.query.sql.symbol.SingleElementSymbol; import org.teiid.query.sql.visitor.ExpressionMappingVisitor; import org.teiid.query.sql.visitor.ValueIteratorProviderCollectorVisitor; +import org.teiid.query.validator.UpdateValidator; import org.teiid.query.validator.ValidationVisitor; +import org.teiid.query.validator.UpdateValidator.UpdateInfo; +import org.teiid.query.validator.UpdateValidator.UpdateType; /** @@ -423,16 +428,20 @@ } } - public static Command resolveView(GroupSymbol virtualGroup, QueryNode qnode, + public static QueryNode resolveView(GroupSymbol virtualGroup, QueryNode qnode, String cacheString, QueryMetadataInterface qmi) throws TeiidComponentException, QueryMetadataException, QueryResolverException, QueryValidatorException { qmi = qmi.getDesignTimeMetadata(); - Command result = (Command)qmi.getFromMetadataCache(virtualGroup.getMetadataID(), "transformation/" + cacheString); //$NON-NLS-1$ - if (result != null) { - result = (Command)result.clone(); - } else { - result = qnode.getCommand(); + cacheString = "transformation/" + cacheString; //$NON-NLS-1$ + if (qnode.getUser() != null) { + cacheString += "/" + qnode.getUser(); //$NON-NLS-1$ + } + QueryNode cachedNode = (QueryNode)qmi.getFromMetadataCache(virtualGroup.getMetadataID(), cacheString); + if (cachedNode == null + || (qnode.getQuery() != null && !cachedNode.getQuery().equals(qnode.getQuery())) + || (qnode.getCommand() != null && !cachedNode.getCommand().equals(qnode.getCommand()))) { + Command result = qnode.getCommand(); List bindings = null; if (result == null) { try { @@ -463,9 +472,42 @@ } ResolverUtil.setSymbolType(projectedSymbol, symbols.get(i).getType()); } - qmi.addToMetadataCache(virtualGroup.getMetadataID(), "transformation/" + cacheString, result.clone()); //$NON-NLS-1$ + cachedNode = new QueryNode(qnode.getQuery()); + cachedNode.setCommand((Command)result.clone()); + cachedNode.setUser(qnode.getUser()); + + if(isView(virtualGroup, qmi)) { + String updatePlan = qmi.getUpdatePlan(virtualGroup.getMetadataID()); + String deletePlan = qmi.getDeletePlan(virtualGroup.getMetadataID()); + String insertPlan = qmi.getInsertPlan(virtualGroup.getMetadataID()); + + List<ElementSymbol> elements = ResolverUtil.resolveElementsInGroup(virtualGroup, qmi); + UpdateValidator validator = new UpdateValidator(qmi, determineType(insertPlan), determineType(updatePlan), determineType(deletePlan)); + validator.validate(result, elements); + UpdateInfo info = validator.getUpdateInfo(); + cachedNode.setUpdateInfo(info); + } + qmi.addToMetadataCache(virtualGroup.getMetadataID(), cacheString, cachedNode); } - return result; + return cachedNode; } + + public static boolean isView(GroupSymbol virtualGroup, + QueryMetadataInterface qmi) throws TeiidComponentException, + QueryMetadataException { + return !virtualGroup.isTempGroupSymbol() && qmi.isVirtualGroup(virtualGroup.getMetadataID()) && qmi.isVirtualModel(qmi.getModelID(virtualGroup.getMetadataID())); + } + private static UpdateType determineType(String plan) { + UpdateType type = UpdateType.INHERENT; + if (plan != null) { + if (StringUtil.startsWithIgnoreCase(plan, SQLConstants.Reserved.CREATE)) { + type = UpdateType.UPDATE_PROCEDURE; + } else { + type = UpdateType.INSTEAD_OF; + } + } + return type; + } + } Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/UpdateProcedureResolver.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/resolver/command/UpdateProcedureResolver.java 2011-04-06 18:00:20 UTC (rev 3067) +++ trunk/engine/src/main/java/org/teiid/query/resolver/command/UpdateProcedureResolver.java 2011-04-06 18:05:32 UTC (rev 3068) @@ -50,6 +50,7 @@ import org.teiid.query.resolver.util.ResolveVirtualGroupCriteriaVisitor; import org.teiid.query.resolver.util.ResolverUtil; import org.teiid.query.resolver.util.ResolverVisitor; +import org.teiid.query.sql.LanguageObject; import org.teiid.query.sql.ProcedureReservedWords; import org.teiid.query.sql.lang.Command; import org.teiid.query.sql.lang.Criteria; @@ -97,21 +98,14 @@ // get a symbol map between virtual elements and the elements that define // then in the query transformation, this info is used in evaluating/validating // has criteria/translate criteria clauses - Command transformCmd = getQueryTransformCmd(virtualGroup, metadata); - Map symbolMap = SymbolMap.createSymbolMap(virtualGroup, transformCmd.getProjectedSymbols(), metadata).asMap(); - procCommand.setSymbolMap(symbolMap); - } - - /** - * Get the command for the transformation query that defines this virtual group. - */ - public static Command getQueryTransformCmd(GroupSymbol virtualGroup, QueryMetadataInterface metadata) - throws QueryMetadataException, QueryResolverException, TeiidComponentException { - try { - return QueryResolver.resolveView(virtualGroup, metadata.getVirtualPlan(virtualGroup.getMetadataID()), SQLConstants.Reserved.SELECT, metadata); + Command transformCmd; + try { + transformCmd = QueryResolver.resolveView(virtualGroup, metadata.getVirtualPlan(virtualGroup.getMetadataID()), SQLConstants.Reserved.SELECT, metadata).getCommand(); } catch (QueryValidatorException e) { throw new QueryResolverException(e, e.getMessage()); } + Map<ElementSymbol, Expression> symbolMap = SymbolMap.createSymbolMap(virtualGroup, LanguageObject.Util.deepClone(transformCmd.getProjectedSymbols(), SingleElementSymbol.class), metadata).asMap(); + procCommand.setSymbolMap(symbolMap); } /** Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java 2011-04-06 18:00:20 UTC (rev 3067) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java 2011-04-06 18:05:32 UTC (rev 3068) @@ -34,6 +34,7 @@ import org.junit.Ignore; import org.junit.Test; import org.mockito.Mockito; +import org.teiid.CommandContext; import org.teiid.api.exception.query.QueryResolverException; import org.teiid.cache.DefaultCacheFactory; import org.teiid.client.RequestMessage; @@ -44,20 +45,23 @@ import org.teiid.dqp.internal.process.AbstractWorkItem.ThreadState; import org.teiid.dqp.service.AutoGenDataService; import org.teiid.dqp.service.FakeBufferService; +import org.teiid.metadata.MetadataProvider; import org.teiid.query.optimizer.TestOptimizer; import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities; import org.teiid.query.optimizer.capabilities.SourceCapabilities.Capability; import org.teiid.query.unittest.FakeMetadataFactory; +import org.teiid.query.unittest.RealMetadataFactory; @SuppressWarnings("nls") public class TestDQPCore { private DQPCore core; + private DQPConfiguration config; private AutoGenDataService agds; @Before public void setUp() throws Exception { agds = new AutoGenDataService(); - DQPWorkContext context = FakeMetadataFactory.buildWorkContext(FakeMetadataFactory.exampleBQT()); + DQPWorkContext context = FakeMetadataFactory.buildWorkContext(RealMetadataFactory.exampleBQTCached()); context.getVDB().getModel("BQT3").setVisible(false); //$NON-NLS-1$ context.getVDB().getModel("VQT").setVisible(false); //$NON-NLS-1$ @@ -70,7 +74,7 @@ core.setCacheFactory(new DefaultCacheFactory()); core.setTransactionService(new FakeTransactionService()); - DQPConfiguration config = new DQPConfiguration(); + config = new DQPConfiguration(); config.setMaxActivePlans(1); config.setUserRequestSourceConcurrency(2); core.start(config); @@ -309,6 +313,33 @@ assertEquals(1, agds.getExecuteCount().get()); } + @Test public void testMetadataProvider() throws Exception { + this.config.setMetadataProvider(new MetadataProvider() { + int callCount; + @Override + public ViewDefinition getViewDefinition(String schema, + String viewName, CommandContext context) { + if (callCount++ > 0) { + ViewDefinition vd = new ViewDefinition("SELECT 'something else'", Scope.USER); + return vd; + } + ViewDefinition vd = new ViewDefinition("SELECT 'hello world'", Scope.USER); + return vd; + } + }); + //the sql should normally return 10 rows + String sql = "SELECT * FROM vqt.SmallB UNION SELECT * FROM vqt.SmallB"; //$NON-NLS-1$ + String userName = "1"; //$NON-NLS-1$ + + ResultsMessage rm = helpExecute(sql, userName); + assertEquals(1, rm.getResults().length); //$NON-NLS-1$ + assertEquals("hello world", rm.getResults()[0].get(0)); //$NON-NLS-1$ + + rm = helpExecute(sql, userName); + assertEquals(1, rm.getResults().length); //$NON-NLS-1$ + assertEquals("something else", rm.getResults()[0].get(0)); //$NON-NLS-1$ + } + public void helpTestVisibilityFails(String sql) throws Exception { RequestMessage reqMsg = exampleRequestMessage(sql); reqMsg.setTxnAutoWrapMode(RequestMessage.TXN_WRAP_OFF);

13 years, 9 months

1
0
0 / 0

teiid SVN: r3067 - trunk/engine/src/main/java/org/teiid/query/metadata.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-04-06 14:00:20 -0400 (Wed, 06 Apr 2011) New Revision: 3067 Modified: trunk/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java Log: TEIID-1489 updating the fix to reuse the metadata caches Modified: trunk/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java 2011-04-05 19:07:59 UTC (rev 3066) +++ trunk/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java 2011-04-06 18:00:20 UTC (rev 3067) @@ -134,10 +134,10 @@ /* * TODO: move caching to jboss cache structure */ - private final Map<String, Object> metadataCache = Collections.synchronizedMap(new LRUCache<String, Object>(250)); - private final Map<String, Object> groupInfoCache = Collections.synchronizedMap(new LRUCache<String, Object>(250)); - private final Map<String, Collection<Table>> partialNameToFullNameCache = Collections.synchronizedMap(new LRUCache<String, Collection<Table>>(1000)); - private final Map<String, Collection<StoredProcedureInfo>> procedureCache = Collections.synchronizedMap(new LRUCache<String, Collection<StoredProcedureInfo>>(200)); + private Map<String, Object> metadataCache = Collections.synchronizedMap(new LRUCache<String, Object>(250)); + private Map<String, Object> groupInfoCache = Collections.synchronizedMap(new LRUCache<String, Object>(250)); + private Map<String, Collection<Table>> partialNameToFullNameCache = Collections.synchronizedMap(new LRUCache<String, Collection<Table>>(1000)); + private Map<String, Collection<StoredProcedureInfo>> procedureCache = Collections.synchronizedMap(new LRUCache<String, Collection<StoredProcedureInfo>>(200)); /** * TransformationMetadata constructor * @param context Object containing the info needed to lookup metadta. @@ -1076,6 +1076,11 @@ @Override public QueryMetadataInterface getDesignTimeMetadata() { - return new TransformationMetadata(store, functionLibrary); + TransformationMetadata tm = new TransformationMetadata(store, functionLibrary); + tm.groupInfoCache = this.groupInfoCache; + tm.metadataCache = this.metadataCache; + tm.partialNameToFullNameCache = this.partialNameToFullNameCache; + tm.procedureCache = this.procedureCache; + return tm; } } \ No newline at end of file

13 years, 9 months

1
0
0 / 0

Teiid - Continuous Build - Build # 1444 - Failure!

by jboss-qa-internal＠redhat.com

Teiid - Continuous Build - Build # 1444 - Failure: Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid%20-%20Continuous%20Build/1444/ to view the results.

13 years, 9 months

1
1
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

teiid-commits April 2011