teiid SVN: r1173 - in trunk: common-core/src/test/java/com/metamatrix/common/types and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-07-22 18:30:58 -0400 (Wed, 22 Jul 2009)
New Revision: 1173
Modified:
trunk/common-core/src/main/java/com/metamatrix/common/types/MMJDBCSQLTypeInfo.java
trunk/common-core/src/test/java/com/metamatrix/common/types/TestDataTypeManager.java
trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestVDBLessExecution.java
Log:
TEIID-736 fixing type mappings
Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/MMJDBCSQLTypeInfo.java
===================================================================
--- trunk/common-core/src/main/java/com/metamatrix/common/types/MMJDBCSQLTypeInfo.java 2009-07-22 17:08:37 UTC (rev 1172)
+++ trunk/common-core/src/main/java/com/metamatrix/common/types/MMJDBCSQLTypeInfo.java 2009-07-22 22:30:58 UTC (rev 1173)
@@ -99,30 +99,25 @@
private static Map<String, String> CLASSNAME_TO_NAME = new HashMap<String, String>();
static {
- addTypeMapping(STRING, STRING_CLASS, Types.VARCHAR);
- TYPE_TO_NAME_MAP.put(Types.LONGVARCHAR, STRING);
+ addTypeMapping(STRING, STRING_CLASS, Types.VARCHAR, Types.LONGVARCHAR, Types.CHAR);
+ addTypeMapping(CHAR, CHAR_CLASS, Types.CHAR, false);
addTypeMapping(BOOLEAN, BOOLEAN_CLASS, Types.BIT);
addTypeMapping(TIME, TIME_CLASS, Types.TIME);
addTypeMapping(DATE, DATE_CLASS, Types.DATE);
addTypeMapping(TIMESTAMP, TIMESTAMP_CLASS, Types.TIMESTAMP);
addTypeMapping(INTEGER, INTEGER_CLASS, Types.INTEGER);
addTypeMapping(FLOAT, FLOAT_CLASS, Types.REAL);
- addTypeMapping(DOUBLE, DOUBLE_CLASS, Types.DOUBLE);
- TYPE_TO_NAME_MAP.put(Types.FLOAT, DOUBLE);
- addTypeMapping(BIGDECIMAL, BIGDECIMAL_CLASS, Types.NUMERIC);
- TYPE_TO_NAME_MAP.put(Types.DECIMAL, BIGDECIMAL);
- NAME_TO_CLASSNAME.put(BIGINTEGER, BIGINTEGER_CLASS);
- CLASSNAME_TO_NAME.put(BIGINTEGER_CLASS, BIGINTEGER);
- NAME_TO_TYPE_MAP.put(BIGINTEGER, Types.NUMERIC);
+ addTypeMapping(DOUBLE, DOUBLE_CLASS, Types.DOUBLE, Types.FLOAT);
+ addTypeMapping(BIGDECIMAL, BIGDECIMAL_CLASS, Types.NUMERIC, Types.DECIMAL);
+ addTypeMapping(BIGINTEGER, BIGINTEGER_CLASS, Types.NUMERIC, false);
addTypeMapping(BYTE, BYTE_CLASS, Types.TINYINT);
addTypeMapping(SHORT, SHORT_CLASS, Types.SMALLINT);
addTypeMapping(LONG, LONG_CLASS, Types.BIGINT);
- addTypeMapping(CHAR, CHAR_CLASS, Types.CHAR);
addTypeMapping(OBJECT, OBJECT_CLASS, Types.JAVA_OBJECT);
addTypeMapping(CLOB, CLOB_CLASS, Types.CLOB);
- addTypeMapping(BLOB, BLOB_CLASS, Types.BLOB);
+ addTypeMapping(BLOB, BLOB_CLASS, Types.BLOB, Types.BINARY, Types.VARBINARY, Types.LONGVARBINARY);
- addTypeMapping(NULL, null, Types.NUMERIC);
+ addTypeMapping(NULL, null, Types.NULL);
//## JDBC4.0-begin ##
addTypeMapping(XML, XML_CLASS, Types.SQLXML);
@@ -137,9 +132,18 @@
## JDBC3.0-JDK1.5-end ##*/
}
- private static void addTypeMapping(String typeName, String javaClass, int sqlType) {
+ private static void addTypeMapping(String typeName, String javaClass, int sqlType, int ... secondaryTypes) {
+ addTypeMapping(typeName, javaClass, sqlType, true);
+ for (int type : secondaryTypes) {
+ TYPE_TO_NAME_MAP.put(type, typeName);
+ }
+ }
+
+ private static void addTypeMapping(String typeName, String javaClass, int sqlType, boolean preferedType) {
NAME_TO_TYPE_MAP.put(typeName, sqlType);
- TYPE_TO_NAME_MAP.put(sqlType, typeName);
+ if (preferedType) {
+ TYPE_TO_NAME_MAP.put(sqlType, typeName);
+ }
if (javaClass != null) {
NAME_TO_CLASSNAME.put(typeName, javaClass);
CLASSNAME_TO_NAME.put(javaClass, typeName);
Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/TestDataTypeManager.java
===================================================================
--- trunk/common-core/src/test/java/com/metamatrix/common/types/TestDataTypeManager.java 2009-07-22 17:08:37 UTC (rev 1172)
+++ trunk/common-core/src/test/java/com/metamatrix/common/types/TestDataTypeManager.java 2009-07-22 22:30:58 UTC (rev 1173)
@@ -185,8 +185,12 @@
}
}
- assertEquals(MMJDBCSQLTypeInfo.getSQLTypeFromRuntimeType(DataTypeManager.DefaultDataClasses.TIMESTAMP), Types.TIMESTAMP);
- assertEquals(MMJDBCSQLTypeInfo.getSQLTypeFromRuntimeType(DataTypeManager.DefaultDataClasses.XML), Types.SQLXML);
+ assertEquals(Types.TIMESTAMP, MMJDBCSQLTypeInfo.getSQLTypeFromRuntimeType(DataTypeManager.DefaultDataClasses.TIMESTAMP));
+ //## JDBC4.0-begin ##
+ assertEquals(Types.SQLXML, MMJDBCSQLTypeInfo.getSQLTypeFromRuntimeType(DataTypeManager.DefaultDataClasses.XML));
+ //## JDBC4.0-end ##
+ assertEquals(DataTypeManager.DefaultDataTypes.STRING, MMJDBCSQLTypeInfo.getTypeName(Types.CHAR));
+ assertEquals(Types.CHAR, MMJDBCSQLTypeInfo.getSQLTypeFromRuntimeType(DataTypeManager.DefaultDataClasses.CHAR));
}
public void testRuntimeTypeConversion() throws Exception {
Modified: trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestVDBLessExecution.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestVDBLessExecution.java 2009-07-22 17:08:37 UTC (rev 1172)
+++ trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestVDBLessExecution.java 2009-07-22 22:30:58 UTC (rev 1173)
@@ -52,7 +52,7 @@
@Test public void testIntegrationExecution() {
getConnection(VDB, DQP_PROP_FILE);
executeAndAssertResults("select * from Example, Smalla where notional = intkey", new String[] { //$NON-NLS-1$
- "TRADEID[string] NOTIONAL[integer] INTKEY[integer] STRINGKEY[string] INTNUM[integer] STRINGNUM[string] FLOATNUM[float] LONGNUM[long] DOUBLENUM[double] BYTENUM[short] DATEVALUE[date] TIMEVALUE[time] TIMESTAMPVALUE[timestamp] BOOLEANVALUE[short] CHARVALUE[char] SHORTVALUE[short] BIGINTEGERVALUE[long] BIGDECIMALVALUE[bigdecimal] OBJECTVALUE[string]", //$NON-NLS-1$
+ "TRADEID[string] NOTIONAL[integer] INTKEY[integer] STRINGKEY[string] INTNUM[integer] STRINGNUM[string] FLOATNUM[float] LONGNUM[long] DOUBLENUM[double] BYTENUM[short] DATEVALUE[date] TIMEVALUE[time] TIMESTAMPVALUE[timestamp] BOOLEANVALUE[short] CHARVALUE[string] SHORTVALUE[short] BIGINTEGERVALUE[long] BIGDECIMALVALUE[bigdecimal] OBJECTVALUE[string]", //$NON-NLS-1$
"x 1 1 1 -23 null -23.0 -23 -23.0 -127 2000-01-02 01:00:00 2000-01-01 00:00:01.0 1 0 -32767 -23 -23 -23", //$NON-NLS-1$
"y 2 2 2 -22 -22 null -22 -22.0 -126 2000-01-03 02:00:00 2000-01-01 00:00:02.0 0 1 -32766 -22 -22 -22", //$NON-NLS-1$
});
@@ -125,7 +125,7 @@
"null VDBLess Derby.SMALLA TIMEVALUE 92 time 8 null 0 10 1 null null null null 0 10 NO null null null null NO", //$NON-NLS-1$
"null VDBLess Derby.SMALLA TIMESTAMPVALUE 93 timestamp 29 null 0 10 1 null null null null 0 11 NO null null null null NO", //$NON-NLS-1$
"null VDBLess Derby.SMALLA BOOLEANVALUE 5 short 5 null 0 10 1 null null null null 0 12 NO null null null null NO", //$NON-NLS-1$
- "null VDBLess Derby.SMALLA CHARVALUE 1 char 1 null 0 0 1 null null null null 2 13 NO null null null null NO", //$NON-NLS-1$
+ "null VDBLess Derby.SMALLA CHARVALUE 12 string 4000 null 0 0 1 null null null null 2 13 NO null null null null NO", //$NON-NLS-1$
"null VDBLess Derby.SMALLA SHORTVALUE 5 short 5 null 0 10 1 null null null null 0 14 NO null null null null NO", //$NON-NLS-1$
"null VDBLess Derby.SMALLA BIGINTEGERVALUE -5 long 19 null 0 10 1 null null null null 0 15 NO null null null null NO", //$NON-NLS-1$
"null VDBLess Derby.SMALLA BIGDECIMALVALUE 2 bigdecimal 20 null 0 10 1 null null null null 0 16 NO null null null null NO", //$NON-NLS-1$
16 years, 5 months
Warning: could not send message for past 4 hours
by Mail Delivery Subsystem
**********************************************
** THIS IS A WARNING MESSAGE ONLY **
** YOU DO NOT NEED TO RESEND YOUR MESSAGE **
**********************************************
The original message was received at Wed, 22 Jul 2009 13:08:38 -0400
from svn01.web.mwc.hst.phx2.redhat.com [10.5.105.7]
----- Transcript of session follows -----
<teiid-commits(a)lists.jboss.org>... Deferred: Connection refused by mx1.lists.jboss.org.
Warning: message still undelivered after 4 hours
Will keep trying until message is 5 days old
16 years, 5 months
Warning: could not send message for past 4 hours
by Mail Delivery Subsystem
**********************************************
** THIS IS A WARNING MESSAGE ONLY **
** YOU DO NOT NEED TO RESEND YOUR MESSAGE **
**********************************************
The original message was received at Wed, 22 Jul 2009 11:53:40 -0400
from svn01.web.mwc.hst.phx2.redhat.com [10.5.105.7]
----- Transcript of session follows -----
<teiid-commits(a)lists.jboss.org>... Deferred: Connection refused by mx1.lists.jboss.org.
Warning: message still undelivered after 4 hours
Will keep trying until message is 5 days old
16 years, 5 months
Warning: could not send message for past 4 hours
by Mail Delivery Subsystem
**********************************************
** THIS IS A WARNING MESSAGE ONLY **
** YOU DO NOT NEED TO RESEND YOUR MESSAGE **
**********************************************
The original message was received at Wed, 22 Jul 2009 11:54:17 -0400
from svn01.web.mwc.hst.phx2.redhat.com [10.5.105.7]
----- Transcript of session follows -----
<teiid-commits(a)lists.jboss.org>... Deferred: Connection refused by mx1.lists.jboss.org.
Warning: message still undelivered after 4 hours
Will keep trying until message is 5 days old
16 years, 5 months
Warning: could not send message for past 4 hours
by Mail Delivery Subsystem
**********************************************
** THIS IS A WARNING MESSAGE ONLY **
** YOU DO NOT NEED TO RESEND YOUR MESSAGE **
**********************************************
The original message was received at Wed, 22 Jul 2009 10:05:52 -0400
from svn01.web.mwc.hst.phx2.redhat.com [10.5.105.7]
----- Transcript of session follows -----
<teiid-commits(a)lists.jboss.org>... Deferred: Connection refused by mx1.lists.jboss.org.
Warning: message still undelivered after 4 hours
Will keep trying until message is 5 days old
16 years, 5 months
teiid SVN: r1172 - in trunk: build/kit-runtime/deploy and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-07-22 13:08:37 -0400 (Wed, 22 Jul 2009)
New Revision: 1172
Modified:
trunk/build/kit-runtime/deploy.properties
trunk/build/kit-runtime/deploy/membership-file.properties
trunk/build/kit-runtime/deploy/membership-ldap.properties
trunk/runtime/src/main/java/com/metamatrix/platform/security/membership/service/MembershipServiceImpl.java
Log:
TEIID-664: modified code such that the membership specific properties does not need to be present in the "deploy.properties". The code will look for "memebership-xxx.properties" file in the classpath, where xxx is the domain name. The xxx name is determined from the "domain order" property.
Modified: trunk/build/kit-runtime/deploy/membership-file.properties
===================================================================
--- trunk/build/kit-runtime/deploy/membership-file.properties 2009-07-22 15:54:17 UTC (rev 1171)
+++ trunk/build/kit-runtime/deploy/membership-file.properties 2009-07-22 17:08:37 UTC (rev 1172)
@@ -1,5 +1,11 @@
#File based membership domain configuration properties
+# File Membership Domain Settings (activate, Membership Domain Class Name, Property file for configuration)
+activate=false
+
+# The class that implements the File membership
+AuthDomainClass=com.metamatrix.platform.security.membership.spi.file.FileMembershipDomain
+
#Location of the properties file containing user name and password entries.
usersFile=users.properties
Modified: trunk/build/kit-runtime/deploy/membership-ldap.properties
===================================================================
--- trunk/build/kit-runtime/deploy/membership-ldap.properties 2009-07-22 15:54:17 UTC (rev 1171)
+++ trunk/build/kit-runtime/deploy/membership-ldap.properties 2009-07-22 17:08:37 UTC (rev 1172)
@@ -1,7 +1,10 @@
# Configuration file for LDAP membership domain
-activate=true
+activate=false
+# The class that implements the LDAP membership
+ldap.AuthDomainClass=com.metamatrix.platform.security.membership.spi.ldap.LDAPMembershipDomain
+
#Full LDAP URL (mandatory)
ldapURL=
Modified: trunk/build/kit-runtime/deploy.properties
===================================================================
--- trunk/build/kit-runtime/deploy.properties 2009-07-22 15:54:17 UTC (rev 1171)
+++ trunk/build/kit-runtime/deploy.properties 2009-07-22 17:08:37 UTC (rev 1172)
@@ -99,20 +99,11 @@
membership.superUser=admin
membership.superUserPassword=teiid
#Membership Domain Order (comma separated list of domains to authenticate user. ex: file, ldap)
-membership.DomainOrder=file
+membership.DomainOrder=file,ldap
#Allow connections only from specified hosts
#membership.allowedHosts=
-# File Membership Domain Settings (activate, Membership Domain Class Name, Property file for configuration)
-file.activate=false
-file.AuthDomainClass=com.metamatrix.platform.security.membership.spi.file.FileMembershipDomain
-file.propertiesFile=./deploy/membership-file.properties
-# LDAP Membership Domain Settings (activate, Membership Domain Class Name, Property file for configuration)
-#ldap.activate=false
-#ldap.AuthDomainClass=com.metamatrix.platform.security.membership.spi.ldap.LDAPMembershipDomain
-#ldap.propertiesFile=./deploy/membership-ldap.properties
-
#
# Authorization Service Settings
#
@@ -121,7 +112,6 @@
entitlements.enabled=false
entitlements.adminRolesFile=./deploy/admin-roles.properties
-
#
# Server Settings (Socket transport)
#
Modified: trunk/runtime/src/main/java/com/metamatrix/platform/security/membership/service/MembershipServiceImpl.java
===================================================================
--- trunk/runtime/src/main/java/com/metamatrix/platform/security/membership/service/MembershipServiceImpl.java 2009-07-22 15:54:17 UTC (rev 1171)
+++ trunk/runtime/src/main/java/com/metamatrix/platform/security/membership/service/MembershipServiceImpl.java 2009-07-22 17:08:37 UTC (rev 1172)
@@ -183,13 +183,13 @@
String domainName = ((String) domainNameItr.next()).trim();
try {
Properties domainProps = PropertiesUtils.getProperties(domainName + ".*", env); //$NON-NLS-1$
- if (!Boolean.valueOf(domainProps.getProperty(DOMAIN_ACTIVE)).booleanValue()) {
+ if (!Boolean.valueOf(domainProps.getProperty(DOMAIN_ACTIVE, "true")).booleanValue()) { //$NON-NLS-1$
LogManager.logDetail(LogConstants.CTX_MEMBERSHIP, "Skipping initilization of inactive domain " + domainName); //$NON-NLS-1$
continue;
}
MembershipDomain newDomain = createDomain(domainName, domainProps);
- LogManager.logInfo(LogConstants.CTX_MEMBERSHIP, DQPEmbeddedPlugin.Util.getString("MembershipServiceImpl.loaded", domainName)); //$NON-NLS-1$
if(newDomain!=null) {
+ LogManager.logInfo(LogConstants.CTX_MEMBERSHIP, DQPEmbeddedPlugin.Util.getString("MembershipServiceImpl.loaded", domainName)); //$NON-NLS-1$
this.domains.add(new MembershipDomainHolder(newDomain, domainName));
}
} catch (Exception e){
@@ -213,36 +213,48 @@
private MembershipDomain createDomain(String domainName, Properties properties) throws ApplicationInitializationException, MalformedURLException, IOException, MembershipSourceException {
MembershipDomain domain = null;
- String className = properties.getProperty(AuthenticationProviderType.Attributes.AUTHDOMAIN_CLASS);
-
- if (className != null && className.length() > 0) {
- try {
- domain = (MembershipDomain) Thread.currentThread().getContextClassLoader().loadClass(className).newInstance();
- } catch (Throwable e) {
- throw new ApplicationInitializationException(e, DQPEmbeddedPlugin.Util.getString("MembershipServiceImpl.failed_to_create", className)); //$NON-NLS-1$
- }
- } else {
- throw new ApplicationInitializationException(DQPEmbeddedPlugin.Util.getString("MembershipServiceImpl.unable_to_create", domainName)); //$NON-NLS-1$
- }
-
properties.setProperty(DOMAIN_NAME, domainName);
- String propsString = properties.getProperty(DOMAIN_PROPERTIES);
-
+ // load properties file that defines the custom properties
+ URL url = null;
+ String propsString = properties.getProperty(DOMAIN_PROPERTIES);
if (propsString != null) {
- URL url = URLHelper.buildURL(this.dqpURL, propsString);
- Properties customProps = PropertiesUtils.loadFromURL(url);
- properties.putAll(customProps);
-
- // Using this URL the Membership providers can further define and files that are in relative context to this file
- properties.put(DOMAIN_PROPERTIES, url);
+ url = URLHelper.buildURL(this.dqpURL, propsString);
}
-
- domain.initialize(properties);
-
- return domain;
+ else {
+ url = this.getClass().getClassLoader().getResource("membership-"+domainName+".properties"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ if (url != null) {
+ Properties customProps = PropertiesUtils.loadFromURL(url);
+ properties.putAll(customProps);
+
+ // Using this URL the Membership providers can further define and files that are in relative context to this file
+ properties.put(DOMAIN_PROPERTIES, url);
+
+ boolean activate = PropertiesUtils.getBooleanProperty(properties, DOMAIN_ACTIVE, false);
+ if (activate) {
+ String className = properties.getProperty(AuthenticationProviderType.Attributes.AUTHDOMAIN_CLASS);
+
+ if (className != null && className.length() > 0) {
+ try {
+ domain = (MembershipDomain) Thread.currentThread().getContextClassLoader().loadClass(className).newInstance();
+ } catch (Throwable e) {
+ throw new ApplicationInitializationException(e, DQPEmbeddedPlugin.Util.getString("MembershipServiceImpl.failed_to_create", className)); //$NON-NLS-1$
+ }
+ } else {
+ throw new ApplicationInitializationException(DQPEmbeddedPlugin.Util.getString("MembershipServiceImpl.unable_to_create", domainName)); //$NON-NLS-1$
+ }
+
+ domain.initialize(properties);
+ return domain;
+ }
+ }
+ return null;
}
+
+
private void shutdownDomains() {
// Shut down the domain(s) ...
Iterator iter = this.domains.iterator();
16 years, 5 months
teiid SVN: r1171 - trunk.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-07-22 11:54:17 -0400 (Wed, 22 Jul 2009)
New Revision: 1171
Modified:
trunk/pom.xml
Log:
TEIID-732: renaming the embedded --> runtime, and kit to teiid
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-07-22 15:53:40 UTC (rev 1170)
+++ trunk/pom.xml 2009-07-22 15:54:17 UTC (rev 1171)
@@ -81,8 +81,8 @@
<descriptors>
<descriptor>build/assembly/src.xml</descriptor>
<descriptor>build/assembly/client-jar.xml</descriptor>
- <descriptor>build/assembly/embedded/embedded-dependencies.xml</descriptor>
- <descriptor>build/assembly/embedded/embedded-dist.xml</descriptor>
+ <descriptor>build/assembly/runtime/dependencies.xml</descriptor>
+ <descriptor>build/assembly/runtime/dist.xml</descriptor>
<descriptor>build/assembly/cdk/cdk-dependencies.xml</descriptor>
<descriptor>build/assembly/cdk/cdk-dist.xml</descriptor>
<descriptor>build/assembly/adminshell/adminshell-dependencies.xml</descriptor>
16 years, 5 months
teiid SVN: r1170 - in trunk/build: assembly and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-07-22 11:53:40 -0400 (Wed, 22 Jul 2009)
New Revision: 1170
Added:
trunk/build/assembly/runtime/
trunk/build/assembly/runtime/dependencies.xml
trunk/build/assembly/runtime/dist.xml
trunk/build/kit-runtime/
Removed:
trunk/build/assembly/embedded/
trunk/build/assembly/runtime/embedded-dependencies.xml
trunk/build/assembly/runtime/embedded-dist.xml
trunk/build/kit-embedded/
Modified:
trunk/build/assembly/runtime/build-configuration.xml
trunk/build/pom.xml
Log:
TEIID-732: renaming the embedded --> runtime, and kit to teiid
Copied: trunk/build/assembly/runtime (from rev 1167, trunk/build/assembly/embedded)
Modified: trunk/build/assembly/runtime/build-configuration.xml
===================================================================
--- trunk/build/assembly/embedded/build-configuration.xml 2009-07-22 02:53:09 UTC (rev 1167)
+++ trunk/build/assembly/runtime/build-configuration.xml 2009-07-22 15:53:40 UTC (rev 1170)
@@ -1,13 +1,13 @@
<project default="main" name="teiid-configuration-build" basedir=".">
- <property name="kit.dir" value="${basedir}/target/kit-embedded"/>
+ <property name="kit.dir" value="${basedir}/target/kit-runtime"/>
<property name="extensions.dir" value="${basedir}/target/dependency"/>
<target name="main" >
<copy todir="${kit.dir}">
- <fileset dir="${basedir}/kit-embedded"/>
+ <fileset dir="${basedir}/kit-runtime"/>
</copy>
<!-- unzip the connector zip files in to directory and move the jar files into extensions directory -->
Added: trunk/build/assembly/runtime/dependencies.xml
===================================================================
--- trunk/build/assembly/runtime/dependencies.xml (rev 0)
+++ trunk/build/assembly/runtime/dependencies.xml 2009-07-22 15:53:40 UTC (rev 1170)
@@ -0,0 +1,59 @@
+<!--This script builds a JAR for the Embedded Server Installation -->
+<assembly>
+
+ <id>runtime-dependencies</id>
+
+ <formats>
+ <format>dir</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <baseDirectory>teiid</baseDirectory>
+
+ <moduleSets>
+ <moduleSet>
+ <includeSubModules>true</includeSubModules>
+
+ <includes>
+ <include>org.jboss.teiid:teiid-cache-jbosscache</include>
+ <include>org.jboss.teiid:teiid-common-internal</include>
+
+ <include>org.jboss.teiid:teiid-connector-api</include>
+ <include>org.jboss.teiid:teiid-connector-metadata</include>
+ <include>org.jboss.teiid:teiid-runtime</include>
+ <include>org.jboss.teiid:teiid-engine</include>
+ <include>org.jboss.teiid:teiid-metadata</include>
+ <include>org.jboss.teiid:teiid-txn-jbossts</include>
+ </includes>
+
+ <binaries>
+ <includeDependencies>true</includeDependencies>
+ <unpack>false</unpack>
+
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>teiid*</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+
+ </binaries>
+
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.teiid:teiid-hibernate-dialect</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+
+</assembly>
\ No newline at end of file
Added: trunk/build/assembly/runtime/dist.xml
===================================================================
--- trunk/build/assembly/runtime/dist.xml (rev 0)
+++ trunk/build/assembly/runtime/dist.xml 2009-07-22 15:53:40 UTC (rev 1170)
@@ -0,0 +1,70 @@
+<!--This script builds a JAR for the Embedded Server Installation -->
+<assembly>
+
+ <id>dist</id>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>teiid-${version}</baseDirectory>
+
+ <fileSets>
+
+ <fileSet>
+ <directory>target/distribution</directory>
+ <includes>
+ <include>teiid-${version}-client.jar</include>
+ </includes>
+ <outputDirectory>client</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/distribution/teiid-${version}-runtime-dependencies.dir</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>teiid-txn-jbossts-${version}.jar</exclude>
+ <exclude>teiid-hibernate-dialect-${version}.jar</exclude>
+ </excludes>
+ <outputDirectory>lib</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/distribution/teiid-${version}-runtime-dependencies.dir</directory>
+ <includes>
+ <include>teiid-hibernate-dialect-${version}.jar</include>
+ </includes>
+ <outputDirectory>client</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/distribution/teiid-${version}-runtime-dependencies.dir</directory>
+ <includes>
+ <include>teiid-txn-jbossts-${version}.jar</include>
+ </includes>
+ <outputDirectory>lib/patches</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>build/target/kit-runtime</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>**/run.*</exclude>
+ </excludes>
+ </fileSet>
+
+ <fileSet>
+ <directory>build/target/kit-runtime</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**/run.*</include>
+ </includes>
+ <filtered>true</filtered>
+ </fileSet>
+
+ </fileSets>
+
+</assembly>
\ No newline at end of file
Deleted: trunk/build/assembly/runtime/embedded-dependencies.xml
===================================================================
--- trunk/build/assembly/embedded/embedded-dependencies.xml 2009-07-22 02:53:09 UTC (rev 1167)
+++ trunk/build/assembly/runtime/embedded-dependencies.xml 2009-07-22 15:53:40 UTC (rev 1170)
@@ -1,59 +0,0 @@
-<!--This script builds a JAR for the Embedded Server Installation -->
-<assembly>
-
- <id>embedded-dependencies</id>
-
- <formats>
- <format>dir</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
- <baseDirectory>teiid-embedded</baseDirectory>
-
- <moduleSets>
- <moduleSet>
- <includeSubModules>true</includeSubModules>
-
- <includes>
- <include>org.jboss.teiid:teiid-cache-jbosscache</include>
- <include>org.jboss.teiid:teiid-common-internal</include>
-
- <include>org.jboss.teiid:teiid-connector-api</include>
- <include>org.jboss.teiid:teiid-connector-metadata</include>
- <include>org.jboss.teiid:teiid-embedded</include>
- <include>org.jboss.teiid:teiid-engine</include>
- <include>org.jboss.teiid:teiid-metadata</include>
- <include>org.jboss.teiid:teiid-txn-jbossts</include>
- </includes>
-
- <binaries>
- <includeDependencies>true</includeDependencies>
- <unpack>false</unpack>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>true</useProjectArtifact>
- <unpack>false</unpack>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <exclude>teiid*</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-
- </binaries>
-
- </moduleSet>
- <moduleSet>
- <includes>
- <include>org.jboss.teiid:teiid-hibernate-dialect</include>
- </includes>
- <binaries>
- <includeDependencies>false</includeDependencies>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-
-</assembly>
\ No newline at end of file
Deleted: trunk/build/assembly/runtime/embedded-dist.xml
===================================================================
--- trunk/build/assembly/embedded/embedded-dist.xml 2009-07-22 02:53:09 UTC (rev 1167)
+++ trunk/build/assembly/runtime/embedded-dist.xml 2009-07-22 15:53:40 UTC (rev 1170)
@@ -1,70 +0,0 @@
-<!--This script builds a JAR for the Embedded Server Installation -->
-<assembly>
-
- <id>embedded-dist</id>
-
- <formats>
- <format>zip</format>
- </formats>
-
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>teiid-embedded-${version}</baseDirectory>
-
- <fileSets>
-
- <fileSet>
- <directory>target/distribution</directory>
- <includes>
- <include>teiid-${version}-client.jar</include>
- </includes>
- <outputDirectory>client</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>target/distribution/teiid-${version}-embedded-dependencies.dir</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>teiid-txn-jbossts-${version}.jar</exclude>
- <exclude>teiid-hibernate-dialect-${version}.jar</exclude>
- </excludes>
- <outputDirectory>lib</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>target/distribution/teiid-${version}-embedded-dependencies.dir</directory>
- <includes>
- <include>teiid-hibernate-dialect-${version}.jar</include>
- </includes>
- <outputDirectory>client</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>target/distribution/teiid-${version}-embedded-dependencies.dir</directory>
- <includes>
- <include>teiid-txn-jbossts-${version}.jar</include>
- </includes>
- <outputDirectory>lib/patches</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>build/target/kit-embedded</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>**/run.*</exclude>
- </excludes>
- </fileSet>
-
- <fileSet>
- <directory>build/target/kit-embedded</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>**/run.*</include>
- </includes>
- <filtered>true</filtered>
- </fileSet>
-
- </fileSets>
-
-</assembly>
\ No newline at end of file
Copied: trunk/build/kit-runtime (from rev 1169, trunk/build/kit-embedded)
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2009-07-22 14:05:52 UTC (rev 1169)
+++ trunk/build/pom.xml 2009-07-22 15:53:40 UTC (rev 1170)
@@ -104,7 +104,7 @@
<phase>package</phase>
<configuration>
<tasks>
- <ant antfile="assembly/embedded/build-configuration.xml" />
+ <ant antfile="assembly/runtime/build-configuration.xml" />
</tasks>
</configuration>
<goals>
16 years, 5 months
teiid SVN: r1169 - trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-07-22 10:05:52 -0400 (Wed, 22 Jul 2009)
New Revision: 1169
Modified:
trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCacheFactory.java
Log:
TEIID-485: putting the destroy cache code back, which left out by mistake during the upgrade
Modified: trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCacheFactory.java
===================================================================
--- trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCacheFactory.java 2009-07-22 03:48:48 UTC (rev 1168)
+++ trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCacheFactory.java 2009-07-22 14:05:52 UTC (rev 1169)
@@ -111,5 +111,7 @@
public void destroy() {
jmxManager.unregisterAllMBeans();
+ this.cacheStore.destroy();
+ this.destroyed = true;
}
}
16 years, 5 months
