teiid SVN: r1941 - in trunk/connectors: connector-xml-soap and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-03-08 17:13:59 -0500 (Mon, 08 Mar 2010)
New Revision: 1941
Modified:
trunk/connectors/connector-xml-file/pom.xml
trunk/connectors/connector-xml-soap/pom.xml
Log:
TEIID-990: XML Source and XML connector are same now; renaming the xml source connector to simply xml connectors
Modified: trunk/connectors/connector-xml-file/pom.xml
===================================================================
--- trunk/connectors/connector-xml-file/pom.xml 2010-03-08 21:52:33 UTC (rev 1940)
+++ trunk/connectors/connector-xml-file/pom.xml 2010-03-08 22:13:59 UTC (rev 1941)
@@ -7,9 +7,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
<artifactId>connector-xml-file</artifactId>
- <name>connector-xmlsource-file</name>
+ <name>connector-xml-file</name>
<version>7.0.0-SNAPSHOT</version>
- <description>File Based XML Source Connector</description>
+ <description>File Based XML Connector</description>
<packaging>rar</packaging>
<dependencies>
@@ -39,7 +39,13 @@
<groupId>org.jboss.teiid</groupId>
<artifactId>teiid-common-core</artifactId>
<type>test-jar</type>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-metadata</artifactId>
+ <type>test-jar</type>
+ </dependency>
</dependencies>
<build>
Modified: trunk/connectors/connector-xml-soap/pom.xml
===================================================================
--- trunk/connectors/connector-xml-soap/pom.xml 2010-03-08 21:52:33 UTC (rev 1940)
+++ trunk/connectors/connector-xml-soap/pom.xml 2010-03-08 22:13:59 UTC (rev 1941)
@@ -7,9 +7,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
<artifactId>connector-xml-soap</artifactId>
- <name>connector-xmlsource-soap</name>
+ <name>connector-xml-soap</name>
<version>7.0.0-SNAPSHOT</version>
- <description>SOAP based XML Source Connector</description>
+ <description>SOAP based XML Connector</description>
<packaging>rar</packaging>
<dependencies>
@@ -45,6 +45,7 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
@@ -58,6 +59,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-metadata</artifactId>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
<version>1.3</version>
@@ -110,7 +117,7 @@
<artifactId>xmlsec</artifactId>
<version>1.3.0</version>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
16 years, 1 month
teiid SVN: r1940 - in trunk/connectors: connector-xml-soap and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-03-08 16:52:33 -0500 (Mon, 08 Mar 2010)
New Revision: 1940
Modified:
trunk/connectors/connector-xml-file/pom.xml
trunk/connectors/connector-xml-soap/pom.xml
Log:
TEIID-990: XML Source and XML connector are same now; renaming the xml source connector to simply xml connectors
Modified: trunk/connectors/connector-xml-file/pom.xml
===================================================================
--- trunk/connectors/connector-xml-file/pom.xml 2010-03-08 21:41:34 UTC (rev 1939)
+++ trunk/connectors/connector-xml-file/pom.xml 2010-03-08 21:52:33 UTC (rev 1940)
@@ -6,7 +6,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>connector-xmlsource-file</artifactId>
+ <artifactId>connector-xml-file</artifactId>
<name>connector-xmlsource-file</name>
<version>7.0.0-SNAPSHOT</version>
<description>File Based XML Source Connector</description>
Modified: trunk/connectors/connector-xml-soap/pom.xml
===================================================================
--- trunk/connectors/connector-xml-soap/pom.xml 2010-03-08 21:41:34 UTC (rev 1939)
+++ trunk/connectors/connector-xml-soap/pom.xml 2010-03-08 21:52:33 UTC (rev 1940)
@@ -6,8 +6,9 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>connector-xmlsource-soap</artifactId>
+ <artifactId>connector-xml-soap</artifactId>
<name>connector-xmlsource-soap</name>
+ <version>7.0.0-SNAPSHOT</version>
<description>SOAP based XML Source Connector</description>
<packaging>rar</packaging>
16 years, 1 month
teiid SVN: r1939 - trunk/client/src/main/java/org/teiid/adminapi/impl.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-03-08 16:41:34 -0500 (Mon, 08 Mar 2010)
New Revision: 1939
Modified:
trunk/client/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java
Log:
TEIID-833: Removing the implicit addition of the 'sys' model from vdb metadata. Moved to deployer
Modified: trunk/client/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2010-03-08 21:24:24 UTC (rev 1938)
+++ trunk/client/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2010-03-08 21:41:34 UTC (rev 1939)
@@ -43,9 +43,7 @@
import org.teiid.adminapi.VDB;
import org.teiid.adminapi.impl.ModelMetaData.ValidationError;
-import com.metamatrix.core.CoreConstants;
-
@ManagementObject(componentType=@ManagementComponent(type="teiid",subtype="vdb"))
@XmlAccessorType(XmlAccessType.NONE)
@XmlType(name = "", propOrder = {
@@ -91,14 +89,6 @@
public VDBMetaData() {
// auto add sytem model.
- ModelMetaData system = new ModelMetaData();
- system.setName(CoreConstants.SYSTEM_MODEL);
- system.setVisible(true);
- system.setModelType(Model.Type.PHYSICAL.name());
- system.addSourceMapping("system", "system");
- system.setSupportsMultiSourceBindings(false);
-
- addModel(system);
}
@ManagementProperty(description="Name of the VDB", readOnly=true)
16 years, 1 month
teiid SVN: r1938 - trunk/connectors.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-03-08 16:24:24 -0500 (Mon, 08 Mar 2010)
New Revision: 1938
Added:
trunk/connectors/connector-xml-file/
trunk/connectors/connector-xml-soap/
Removed:
trunk/connectors/connector-xmlsource-file/
trunk/connectors/connector-xmlsource-soap/
Modified:
trunk/connectors/pom.xml
Log:
TEIID-990: XML Source and XML connector are same now; renaming the xml source connector to simply xml connectors
Copied: trunk/connectors/connector-xml-file (from rev 1930, trunk/connectors/connector-xmlsource-file)
Copied: trunk/connectors/connector-xml-soap (from rev 1930, trunk/connectors/connector-xmlsource-soap)
Modified: trunk/connectors/pom.xml
===================================================================
--- trunk/connectors/pom.xml 2010-03-08 21:16:59 UTC (rev 1937)
+++ trunk/connectors/pom.xml 2010-03-08 21:24:24 UTC (rev 1938)
@@ -83,8 +83,7 @@
<module>salesforce-api</module>
<module>sandbox</module>
<module>connector-xml</module>
- <module>connector-xmlsource-file</module>
- <module>connector-xmlsource-soap</module>
+ <module>connector-xml-file</module>
<module>connector-xml-soap</module>
<module>connector-xml-http</module>
</modules>
16 years, 1 month
teiid SVN: r1937 - trunk/connectors.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-03-08 16:16:59 -0500 (Mon, 08 Mar 2010)
New Revision: 1937
Removed:
trunk/connectors/connector-xml-soap/
Log:
TEIID-990: as part removal of the axis libraries the XML soap connector is merged into the XML source soap connector
16 years, 1 month
teiid SVN: r1936 - in trunk: engine/src/main/resources/com/metamatrix/dqp and 2 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-03-08 16:08:40 -0500 (Mon, 08 Mar 2010)
New Revision: 1936
Removed:
trunk/runtime/src/main/java/com/metamatrix/platform/security/membership/
Modified:
trunk/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java
trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties
trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java
Log:
TEIID-833: JAXB parser was deleting the implicitly added the "SYS" model in the VDBMetadata object at the unmarshell time. Circumvent this by adding the "SYS" model during the deployment of the VDB. Also fix a possible NPE in the cached finder.
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java 2010-03-08 21:03:19 UTC (rev 1935)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java 2010-03-08 21:08:40 UTC (rev 1936)
@@ -33,6 +33,7 @@
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.core.CoreConstants;
+import com.metamatrix.dqp.DQPPlugin;
import com.metamatrix.query.optimizer.capabilities.BasicSourceCapabilities;
import com.metamatrix.query.optimizer.capabilities.CapabilitiesFinder;
import com.metamatrix.query.optimizer.capabilities.SourceCapabilities;
@@ -71,6 +72,9 @@
for (String sourceName:model.getSourceNames()) {
try {
ConnectorManager mgr = this.connectorRepo.getConnectorManager(model.getSourceJndiName(sourceName));
+ if (mgr == null) {
+ throw new ConnectorException(DQPPlugin.Util.getString("CachedFinder.no_connector_found", model.getSourceJndiName(sourceName), modelName, sourceName));
+ }
caps = mgr.getCapabilities();
break;
} catch(ConnectorException e) {
Modified: trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties
===================================================================
--- trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties 2010-03-08 21:03:19 UTC (rev 1935)
+++ trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties 2010-03-08 21:08:40 UTC (rev 1936)
@@ -514,4 +514,5 @@
TransformationMetadata.Invalid_type=Invalid type: {0}.
TransformationMetadata.Unable_to_determine_fullname_for_element__1=Unable to determine fullname for element
-CachedRequestWorkItem.not_available=Cache result is no longer available.
\ No newline at end of file
+CachedRequestWorkItem.not_available=Cache result is no longer available.
+CachedFinder.no_connector_found=No connector with jndi-name {0} found for Model {1} with source name {2}
\ No newline at end of file
Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-03-08 21:03:19 UTC (rev 1935)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-03-08 21:08:40 UTC (rev 1936)
@@ -85,10 +85,15 @@
throw new DeploymentException("VDB has validaity errors; failed to deploy");
}
- this.vdbRepository.addVDB(deployment);
+ // Add system model to the deployed VDB
+ ModelMetaData system = new ModelMetaData();
+ system.setName(CoreConstants.SYSTEM_MODEL);
+ system.setVisible(true);
+ system.setModelType(Model.Type.PHYSICAL.name());
+ system.addSourceMapping("system", "system");
+ system.setSupportsMultiSourceBindings(false);
+ deployment.addModel(system);
- TransformationMetadata metadata = null;
-
// get the metadata store of the VDB (this is build in parse stage)
CompositeMetadataStore store = unit.getAttachment(CompositeMetadataStore.class);
@@ -106,6 +111,7 @@
}
// check if this is a VDB with index files, if there are then build the TransformationMetadata
+ TransformationMetadata metadata = null;
IndexMetadataFactory indexFactory = unit.getAttachment(IndexMetadataFactory.class);
UDFMetaData udf = unit.getAttachment(UDFMetaData.class);
if (indexFactory != null) {
@@ -126,6 +132,7 @@
// add transformation metadata to the repository.
this.vdbRepository.addMetadata(deployment, metadata);
this.vdbRepository.addMetadataStore(deployment, store);
+ this.vdbRepository.addVDB(deployment);
try {
saveMetadataStore((VFSDeploymentUnit)unit, deployment, metadata.getMetadataStore());
16 years, 1 month
teiid SVN: r1934 - trunk.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-03-06 12:26:23 -0500 (Sat, 06 Mar 2010)
New Revision: 1934
Modified:
trunk/pom.xml
Log:
TEIID-833: removing jboss-embedded
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-03-06 17:25:18 UTC (rev 1933)
+++ trunk/pom.xml 2010-03-06 17:26:23 UTC (rev 1934)
@@ -79,22 +79,12 @@
<version>2.2-beta-2</version>
<configuration>
<descriptors>
- <!--
<descriptor>build/assembly/src.xml</descriptor>
- -->
<descriptor>build/assembly/client-jar.xml</descriptor>
<descriptor>build/assembly/jboss-container/dist.xml</descriptor>
<descriptor>build/assembly/adminshell/adminshell-dependencies.xml</descriptor>
<descriptor>build/assembly/adminshell/adminshell-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>documentation/assembly/docs.xml</descriptor>
- -->
</descriptors>
<outputDirectory>target/distribution</outputDirectory>
<workDirectory>target/assembly/work</workDirectory>
@@ -493,9 +483,6 @@
</dependencies>
</dependencyManagement>
<modules>
- <!--
- <module>txn-jbossts</module>
- -->
<module>test-integration</module>
<module>common-core</module>
<module>common-internal</module>
@@ -511,7 +498,6 @@
<module>cache-jbosscache</module>
<module>hibernate-dialect</module>
<module>jboss-integration</module>
- <module>jboss-embedded</module>
</modules>
<distributionManagement>
16 years, 1 month
