teiid SVN: r2199 - trunk/connectors/translator-file/src/main/resources/META-INF.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-06-08 13:58:27 -0400 (Tue, 08 Jun 2010)
New Revision: 2199
Modified:
trunk/connectors/translator-file/src/main/resources/META-INF/jboss-beans.xml
Log:
TEIID-1115: The file template XML configuration was from the previous to the translator changes. Those errors are fixed now for the current version.
Modified: trunk/connectors/translator-file/src/main/resources/META-INF/jboss-beans.xml
===================================================================
--- trunk/connectors/translator-file/src/main/resources/META-INF/jboss-beans.xml 2010-06-08 17:24:18 UTC (rev 2198)
+++ trunk/connectors/translator-file/src/main/resources/META-INF/jboss-beans.xml 2010-06-08 17:58:27 UTC (rev 2199)
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="${project.artifactId}-${project.version}" class="org.teiid.templates.TranslatorDeploymentTemplate">
- <property name="info"><inject bean="${project.artifactId}-templateinfo"/></property>
+ <bean name="translator-file-template" class="org.teiid.templates.TranslatorDeploymentTemplate">
+ <property name="info"><inject bean="translator-file"/></property>
<property name="managedObjectFactory"><inject bean="ManagedObjectFactory"/></property>
</bean>
- <bean name="${project.artifactId}-templateinfo" class="org.teiid.templates.TranslatorTemplateInfo">
+ <bean name="translator-file" class="org.teiid.templates.TranslatorTemplateInfo">
<constructor factoryMethod="createTemplateInfo">
<factory bean="TranslatorDeploymentTemplateInfoFactory"/>
<parameter class="java.lang.Class">org.teiid.templates.TranslatorTemplateInfo</parameter>
<parameter class="java.lang.Class">org.teiid.translator.file.FileExecutionFactory</parameter>
- <parameter class="java.lang.String">${project.artifactId}-${project.version}</parameter>
- <parameter class="java.lang.String">${project.description}</parameter>
+ <parameter class="java.lang.String">translator-file</parameter>
+ <parameter class="java.lang.String">File</parameter>
</constructor>
</bean>
13 years, 11 months
teiid SVN: r2198 - in trunk/documentation/quick-start-example/src/main/docbook/en-US: images and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-06-08 13:24:18 -0400 (Tue, 08 Jun 2010)
New Revision: 2198
Modified:
trunk/documentation/quick-start-example/src/main/docbook/en-US/content/buildvdb.xml
trunk/documentation/quick-start-example/src/main/docbook/en-US/content/connect-vdb.xml
trunk/documentation/quick-start-example/src/main/docbook/en-US/content/deployment.xml
trunk/documentation/quick-start-example/src/main/docbook/en-US/content/example-explained.xml
trunk/documentation/quick-start-example/src/main/docbook/en-US/images/steps-defined.png
trunk/documentation/quick-start-example/src/main/docbook/en-US/images/steps.png
Log:
TEIID-973: made some changes to fix the quick start guide for the latest text connector changes. Still not complete with out the re-modelled VDB and a new video showing the process. When the new video being recorded, then we will add the derbyclient step into it.
Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/content/buildvdb.xml
===================================================================
--- trunk/documentation/quick-start-example/src/main/docbook/en-US/content/buildvdb.xml 2010-06-08 16:33:19 UTC (rev 2197)
+++ trunk/documentation/quick-start-example/src/main/docbook/en-US/content/buildvdb.xml 2010-06-08 17:24:18 UTC (rev 2198)
@@ -37,8 +37,11 @@
<para>Import the Derby database's "account" schema into a source model.</para>
</listitem>
<listitem>
- <para>Manually create the source model for the "Text File". Create a Table called "Price" with
- "stock" and "price" as column names</para>
+ <para>Manually create the view model for the "Text File". Create a Table called "Price" with
+ "stock" and "price" as column names. In the transformation window add the following SQL</para>
+ <programlisting><![CDATA[
+ SQL text here..
+ ]]> </programlisting>
</listitem>
<listitem>
<para>Create a view model called "AccountView"</para>
Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/content/connect-vdb.xml
===================================================================
--- trunk/documentation/quick-start-example/src/main/docbook/en-US/content/connect-vdb.xml 2010-06-08 16:33:19 UTC (rev 2197)
+++ trunk/documentation/quick-start-example/src/main/docbook/en-US/content/connect-vdb.xml 2010-06-08 17:24:18 UTC (rev 2198)
@@ -7,6 +7,12 @@
this process is no different than connecting to any other JDBC source like Oracle.</para>
<sect1>
<title>Stand-alone Java Application Deployment</title>
+
+ <para>Before you can make a JDBC connection to the Teiid VDB, add the Teiid's driver jar file to your application's classpath</para>
+ <programlisting><![CDATA[
+ ${jboss-install}/server/${profile}/lib/teiid-${version}-client.jar
+ ]]> </programlisting>
+
<para>
For a Java application to connect to a JDBC source, it needs a URL, user-id, and password. To
connect to your VDB all you need is a URL and any additional optional properties that you would like to set.
@@ -95,8 +101,7 @@
You are encouraged to experiment with queries that go beyond the simple "select * from CustomerAccount".
</para>
- <para>If your application is Web based, you can also deploy Teiid in an application server
- and treat it as any other JDBC source by creating a connection pool with the
+ <para>If your application is Web based, you can create data source for your VDB using the above and treat it as any other JDBC source using
<emphasis>org.teiid.jdbc.TeiidDataSource</emphasis> and assigning it a JNDI name.
Refer to <ulink url="https://community.jboss.org/docs/DOC-13888">deployment to application server</ulink> for more information.
</para>
Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/content/deployment.xml
===================================================================
--- trunk/documentation/quick-start-example/src/main/docbook/en-US/content/deployment.xml 2010-06-08 16:33:19 UTC (rev 2197)
+++ trunk/documentation/quick-start-example/src/main/docbook/en-US/content/deployment.xml 2010-06-08 17:24:18 UTC (rev 2198)
@@ -2,55 +2,35 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="deployment">
<title>Deployment</title>
- <para> Having built the VDB, it must be deployed so it can be access through a JDBC connection.</para>
- <para> Teiid is typically used in one of two manners:</para>
- <itemizedlist>
- <listitem>
- <para>
- As a
- <link linkend="stand-alone-deployment">Stand-alone</link>
- Java application
- </para>
- </listitem>
- <listitem>
- <para>In a JEE Application Server (Deploy and Create connection pool).</para>
- </listitem>
- </itemizedlist>
+ <para> Having built the VDB, it must be deployed into Teiid server, so it can be accessed through a JDBC connection.</para>
+
<para />
- <para>This example deploys Teiid within a stand-alone Java application. The sample deployment is shown below.
+ <para>This example deploys Teiid within a JBoss AS. The sample deployment is shown below.
You can find more details about deploying to application servers on the Teiid web-site</para>
<para />
- <sect1 id="stand-alone-deployment">
- <title>Stand-alone Application Deployment</title>
+ <sect1 id="teiid-runtime">
+ <title>JBoss AS Application Deployment</title>
+
<orderedlist>
<listitem>
- <para>Add the "${jboss-install}/server/${profile}/lib/teiid-${version}-client.jar" to your application classpath</para>
- </listitem>
- <listitem>
<para>
Before we can deploy the VDB to the server, we need to create and deploy the required Connection Factories for Derby
and File sources. Connection Factories are sources that provide the data then their data is integrated through Teiid. If you are
familiar with creating data sources or connection factories in JBoss AS, then this is exactly the same operation.
</para>
- <para>For this example we need to create three (3) different data sources. You would first need to create a data source to Derby.
- See ${teiid-examples}/portfolio/PortfolioModel/portfolio-ds.xml.
- Then create Teiid specific connection factories to Derby and File sources.
- See ${teiid-examples}/portfolio/PortfolioModel/derby-connector-ds.xml
- and ${teiid-examples}/portfolio/PortfolioModel/text-connector-ds.xml</para>
-
- <para>The reason we created a data source and also a Connection Factory for Derby is, the data source provides a
- JDBC connection to the portfolio database, and the Connection Factory provides a Teiid wrapper around
- data source that understands execution and query translation defined by the Teiid runtime. The concerns about the
- connection and Teiid access are separated into two different sources. So, the data source can be used by any other application
- however the Teid connection factory is only used by the Teiid. This will be case for any JDBC
- based sources. The same is not true for File source, because File Connector can access the resource directly itself.</para>
- <para>To deploy these connection factories copy the "-ds.xml" files into "${jboss-install}/server/{profile}/deploy" directory.
- Make sure they are started correctly and you have supplied correct credentials for data source. </para>
+ <para>For this example we need to create three (2) different data sources. You would first need to create a data source to Derby,
+ then to File source. See or copy the following</para>
+ <programlisting><![CDATA[
+ ${teiid-examples}/portfolio/PortfolioModel/portfolio-ds.xml
+ ${teiid-examples}/portfolio/PortfolioModel/marketdata-file-ds.xml
+ ]]> </programlisting>
+ <para>files into "${jboss-install}/server/{profile}/deploy" directory.</para>
</listitem>
<listitem>
- <para>Place your VDB in a the "${jboss-install}/server/{profile}/deploy" directory. If the JBoss AS is not already
- started, start by running the "${jboss-install}/bin/run.sh" or "${jboss-install}/bin/run.bat" scripts.
+ <para>The above data sources provide the data to your VDB. Now to deploy your VDB, place your VDB in a the "${jboss-install}/server/{profile}/deploy" directory.
+ If the JBoss AS is not already started, start by running the "${jboss-install}/bin/run.sh" or "${jboss-install}/bin/run.bat" scripts.
+ Make sure there were no errors during the deply of the VDB
</para>
</listitem>
<listitem>
Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/content/example-explained.xml
===================================================================
--- trunk/documentation/quick-start-example/src/main/docbook/en-US/content/example-explained.xml 2010-06-08 16:33:19 UTC (rev 2197)
+++ trunk/documentation/quick-start-example/src/main/docbook/en-US/content/example-explained.xml 2010-06-08 17:24:18 UTC (rev 2198)
@@ -99,7 +99,7 @@
</programlisting>
<para>We need to start the Derby RDBMS and create the "accounts" database with the below schema. These
commands are intended for a Linux environment. For starting the Derby instance on another platform, you will need to use
- commands appropariate to that platform.</para>
+ commands appropriate to that platform.</para>
<para>Start a terminal session, and change directory to where
Derby is installed and execute following commands</para>
<programlisting><![CDATA[
@@ -126,82 +126,10 @@
</sect1>
<sect1 id="step-2">
<title>Step-2: Describe the CSV file and its contents</title>
- <para>In order to use a Text file as the source, we need to define two different types of files: A descriptor
- file and one or more data files. Conceptually, a Descriptor file defines a schema, and each data file defines
- data inside a table</para>
+ <para>In order to use a Text file as the source, we need a data file defines data inside a table</para>
<orderedlist>
<listitem>
- <para>Text Descriptor File - The Text Descriptor file defines the structure
- of the text file you want to use as a data source. The path to the data file, delimiter character used,and the number
- of header lines are attributes of the Descriptor file.
- A sample descriptor file is shown below.</para>
- <programlisting><![CDATA[
- MarketData.Price.location = /path/to/marketdata-price.txt
- MarketData.Price.delimiter = ,
- MarketData.Price.headerLine = 1
- ]]>
- </programlisting>
- <para>The table shown below details some of the available properties that can be used in a Descriptor file. For
- full details look in Text File Connector documentation</para>
- <table frame="all">
- <title>Connection Properties</title>
- <tgroup cols='2' align='left' colsep='1' rowsep='1'>
- <colspec colname='c1' colwidth="1*" />
- <colspec colname='c2' colwidth="1*" />
- <thead>
- <row>
- <entry>
- <para>Property</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>location</para>
- </entry>
- <entry>
- <para>The path to the file on the local system or URL to remote file.</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>delimiter</para>
- </entry>
- <entry>
- <para>The character the file uses to delimit the fields within each line in the file</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>headerLine</para>
- </entry>
- <entry>
- <para>The line number in which the names of the columns are defined</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>skipHeaderLines</para>
- </entry>
- <entry>
- <para>The number of top lines to skip in a text file (include one for the header).</para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <para>Note that each property line starts with the "schema" information and followed by the logical "table"
- name and then the "property" itself. In the above sample file "MarketData" is the schema and "Price" is
- the table. The sample Descriptor file is for a 'single' table. You can define multiple tables in the
- same Descriptor file, but each "location" property for a given "table" must point to different data file.</para>
- </listitem>
- <listitem>
- <para>Data File: This is the file that is identified by the "location" property in the Descriptor file.
- Each data file contains column information for the table. The
+ <para>Data File: Each data file contains column information for the table. The
column information is typically defined on line 1 as header line in the file, and all the following lines
contain the actual rows of data. Each single line corresponds to single row. A portion of the sample file
is shown below. The complete sample file is "examples/portfolio/marketdata-price.txt".</para>
Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/images/steps-defined.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/images/steps.png
===================================================================
(Binary files differ)
13 years, 11 months
teiid SVN: r2197 - trunk/console/src/main/resources/META-INF.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2010-06-08 12:33:19 -0400 (Tue, 08 Jun 2010)
New Revision: 2197
Modified:
trunk/console/src/main/resources/META-INF/rhq-plugin.xml
Log:
removed dependency on JMX plugin (not required)
Modified: trunk/console/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- trunk/console/src/main/resources/META-INF/rhq-plugin.xml 2010-06-08 16:32:10 UTC (rev 2196)
+++ trunk/console/src/main/resources/META-INF/rhq-plugin.xml 2010-06-08 16:33:19 UTC (rev 2197)
@@ -77,7 +77,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
- <depends plugin="JMX" />
<depends plugin="JBossAS5" useClasses="true" />
<server name="Data Services" description="Teiid Data Services"
13 years, 11 months
teiid SVN: r2196 - in trunk/console/src/main/java/org/teiid/rhq: plugin and 3 other directories.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2010-06-08 12:32:10 -0400 (Tue, 08 Jun 2010)
New Revision: 2196
Modified:
trunk/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java
trunk/console/src/main/java/org/teiid/rhq/plugin/Facet.java
trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformDiscoveryComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorDiscoveryComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/VDBComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/AbstractPropertySimpleAdapter.java
trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/MeasurementAdapterFactory.java
trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/PropertyAdapterFactory.java
trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/AbstractPropertyMapToCompositeValueAdapter.java
trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/PropertyListToCollectionValueAdapter.java
trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/PropertyMapToGenericValueAdapter.java
trunk/console/src/main/java/org/teiid/rhq/plugin/util/DeploymentUtils.java
trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java
trunk/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java
Log:
TEIID-1073: Changed logger to use "org.rhq" category
Modified: trunk/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -36,7 +36,7 @@
public class DQPManagementView implements PluginConstants {
private static ManagedComponent mc = null;
- private static final Log LOG = LogFactory.getLog(DQPManagementView.class);
+ private static final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
private static final MetaValueFactory metaValueFactory = MetaValueFactory
.getInstance();
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/Facet.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/Facet.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/Facet.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -86,7 +86,7 @@
OperationFacet, ConfigurationFacet, ContentFacet, DeleteResourceFacet,
CreateChildResourceFacet {
- protected final Log LOG = LogFactory.getLog(Facet.class);
+ protected final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
/**
* Represents the resource configuration of the custom product being
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -53,7 +53,7 @@
*
*/
public class PlatformComponent extends Facet {
- private final Log LOG = LogFactory.getLog(PlatformComponent.class);
+ private final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
String[] PLATFORM_SERVICES_NAMES = { "org.teiid.jboss.deployers.RuntimeEngineDeployer",
"org.teiid.services.BufferServiceImpl", "org.teiid.services.SessionServiceImpl", "org.teiid.transport.SocketConfiguration" };
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformDiscoveryComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformDiscoveryComponent.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformDiscoveryComponent.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -42,7 +42,7 @@
*/
public class PlatformDiscoveryComponent implements ResourceDiscoveryComponent {
- private final Log log = LogFactory.getLog(this.getClass());
+ private final Log log = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
/**
* Review the javadoc for both {@link ResourceDiscoveryComponent} and
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorComponent.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorComponent.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -51,7 +51,7 @@
*
*/
public class TranslatorComponent extends Facet {
- private final Log LOG = LogFactory.getLog(TranslatorComponent.class);
+ private final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public static interface Config {
String COMPONENT_TYPE = "componentType";
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorDiscoveryComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorDiscoveryComponent.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorDiscoveryComponent.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -50,7 +50,7 @@
*/
public class TranslatorDiscoveryComponent implements ResourceDiscoveryComponent {
- private final Log log = LogFactory.getLog(this.getClass());
+ private final Log log = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public Set<DiscoveredResourceDetails> discoverResources(
ResourceDiscoveryContext discoveryContext)
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/VDBComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/VDBComponent.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/VDBComponent.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -78,7 +78,7 @@
*
*/
public class VDBComponent extends Facet {
- private final Log LOG = LogFactory.getLog(VDBComponent.class);
+ private final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
/*
* (non-Javadoc)
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -43,7 +43,7 @@
*/
public class VDBDiscoveryComponent implements ResourceDiscoveryComponent {
- private final Log log = LogFactory.getLog(this.getClass());
+ private final Log log = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public Set<DiscoveredResourceDetails> discoverResources(
ResourceDiscoveryContext discoveryContext)
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/AbstractPropertySimpleAdapter.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/AbstractPropertySimpleAdapter.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/AbstractPropertySimpleAdapter.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -25,6 +25,7 @@
import org.apache.commons.logging.LogFactory;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple;
+import org.teiid.rhq.plugin.util.PluginConstants;
import org.jboss.metatype.api.values.MetaValue;
@@ -34,7 +35,7 @@
*/
public abstract class AbstractPropertySimpleAdapter implements PropertyAdapter<PropertySimple, PropertyDefinitionSimple>
{
- private final Log log = LogFactory.getLog(this.getClass());
+ private final Log log = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public PropertySimple convertToProperty(MetaValue metaValue, PropertyDefinitionSimple propDefSimple)
{
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/MeasurementAdapterFactory.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/MeasurementAdapterFactory.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/MeasurementAdapterFactory.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -27,11 +27,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.metatype.api.types.MetaType;
+import org.teiid.rhq.plugin.util.PluginConstants;
public class MeasurementAdapterFactory
{
- private static final Log LOG = LogFactory.getLog(MeasurementAdapterFactory.class);
+ private static final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
private static Map<String, String> customAdapters = new HashMap<String, String>();
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/PropertyAdapterFactory.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/PropertyAdapterFactory.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/PropertyAdapterFactory.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -37,6 +37,7 @@
import org.teiid.rhq.plugin.adapter.impl.PropertyMapToTableValueAdapter;
import org.teiid.rhq.plugin.adapter.impl.PropertySimpleToEnumValueAdapter;
import org.teiid.rhq.plugin.adapter.impl.PropertySimpleToSimpleValueAdapter;
+import org.teiid.rhq.plugin.util.PluginConstants;
import com.sun.istack.Nullable;
@@ -45,7 +46,7 @@
*/
public class PropertyAdapterFactory
{
- private static final Log LOG = LogFactory.getLog(PropertyAdapterFactory.class);
+ private static final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public static PropertyAdapter getPropertyAdapter(MetaValue metaValue)
{
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/AbstractPropertyMapToCompositeValueAdapter.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/AbstractPropertyMapToCompositeValueAdapter.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/AbstractPropertyMapToCompositeValueAdapter.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -33,6 +33,7 @@
import org.teiid.rhq.plugin.adapter.api.AbstractPropertyMapAdapter;
import org.teiid.rhq.plugin.adapter.api.PropertyAdapter;
import org.teiid.rhq.plugin.adapter.api.PropertyAdapterFactory;
+import org.teiid.rhq.plugin.util.PluginConstants;
import org.jboss.metatype.api.types.MetaType;
import org.jboss.metatype.api.types.SimpleMetaType;
@@ -47,7 +48,7 @@
public abstract class AbstractPropertyMapToCompositeValueAdapter extends AbstractPropertyMapAdapter
implements PropertyAdapter<PropertyMap, PropertyDefinitionMap>
{
- private final Log log = LogFactory.getLog(this.getClass());
+ private final Log log = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public void populateMetaValueFromProperty(PropertyMap propMap, MetaValue metaValue, PropertyDefinitionMap propDefMap)
{
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/PropertyListToCollectionValueAdapter.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/PropertyListToCollectionValueAdapter.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/PropertyListToCollectionValueAdapter.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -37,13 +37,14 @@
import org.teiid.rhq.plugin.adapter.api.AbstractPropertyListAdapter;
import org.teiid.rhq.plugin.adapter.api.PropertyAdapter;
import org.teiid.rhq.plugin.adapter.api.PropertyAdapterFactory;
+import org.teiid.rhq.plugin.util.PluginConstants;
/**
*
*/
public class PropertyListToCollectionValueAdapter extends AbstractPropertyListAdapter implements PropertyAdapter<PropertyList, PropertyDefinitionList>
{
- private static final Log LOG = LogFactory.getLog(PropertyListToCollectionValueAdapter.class);
+ private static final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public void populateMetaValueFromProperty(PropertyList property, MetaValue metaValue, PropertyDefinitionList propertyDefinition)
{
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/PropertyMapToGenericValueAdapter.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/PropertyMapToGenericValueAdapter.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/impl/PropertyMapToGenericValueAdapter.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -42,6 +42,7 @@
import org.teiid.rhq.plugin.adapter.api.AbstractPropertyMapAdapter;
import org.teiid.rhq.plugin.adapter.api.PropertyAdapter;
import org.teiid.rhq.plugin.adapter.api.PropertyAdapterFactory;
+import org.teiid.rhq.plugin.util.PluginConstants;
import org.teiid.rhq.plugin.util.ProfileServiceUtil;
/**
@@ -52,7 +53,7 @@
public class PropertyMapToGenericValueAdapter extends AbstractPropertyMapAdapter
implements PropertyAdapter<PropertyMap, PropertyDefinitionMap>
{
- private final Log log = LogFactory.getLog(this.getClass());
+ private final Log log = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public void populateMetaValueFromProperty(PropertyMap propMap, MetaValue metaValue, PropertyDefinitionMap propDefMap)
{
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/util/DeploymentUtils.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/util/DeploymentUtils.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/util/DeploymentUtils.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -39,7 +39,7 @@
*
*/
public class DeploymentUtils {
- private static final Log LOG = LogFactory.getLog(DeploymentUtils.class);
+ private static final Log LOG = LogFactory.getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
public static boolean hasCorrectExtension(String archiveFileName, ResourceType resourceType) {
String expectedExtension = "vdb";
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -41,13 +41,13 @@
* These are global properties used by all components
*/
public final static String PROFILE_SERVICE = "ProfileService"; //$NON-NLS-1$
-
+
/**
- * These properties are exposed via the #getProperty method call.
+ * Log4j log category to use
*/
- public static String SYSTEM_NAME = "cluster.name"; //$NON-NLS-1$
- public static String SYSTEM_NAME_IDENTIFIER = "JGroups"; //$NON-NLS-1$
-
+ public final static String DEFAULT_LOGGER_CATEGORY = "org.rhq"; //$NON-NLS-1$
+
+
/**
* Use these component type names when calling Connection related methods
* that require the type.
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java 2010-06-08 14:51:53 UTC (rev 2195)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/util/ProfileServiceUtil.java 2010-06-08 16:32:10 UTC (rev 2196)
@@ -79,7 +79,7 @@
public class ProfileServiceUtil {
protected final static Log LOG = LogFactory
- .getLog(ProfileServiceUtil.class);
+ .getLog(PluginConstants.DEFAULT_LOGGER_CATEGORY);
private static ComponentType DQPTYPE = new ComponentType("teiid", "dqp");
private static String DQPNAME = "org.teiid.jboss.deployers.RuntimeEngineDeployer";
private static final Map<String, ComponentType> COMPONENT_TYPE_CACHE = new HashMap<String, ComponentType>();
13 years, 11 months
teiid SVN: r2195 - trunk/console/src/main/java/org/teiid/rhq/plugin.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-06-08 10:51:53 -0400 (Tue, 08 Jun 2010)
New Revision: 2195
Modified:
trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java
Log:
Moving the 'info' logging to 'debug'
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java 2010-06-08 14:50:39 UTC (rev 2194)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java 2010-06-08 14:51:53 UTC (rev 2195)
@@ -99,7 +99,7 @@
// Add to return values
discoveredResources.add(detail);
- log.info("Discovered Teiid VDB: " + vdbName);
+ log.debug("Discovered Teiid VDB: " + vdbName);
}
return discoveredResources;
13 years, 11 months
teiid SVN: r2194 - trunk/build/kits/jboss-container/deploy/teiid.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-06-08 10:50:39 -0400 (Tue, 08 Jun 2010)
New Revision: 2194
Modified:
trunk/build/kits/jboss-container/deploy/teiid/teiid-connector-templates-jboss-beans.xml
Log:
TEIID-1080: taking the version numbers out of the template names, so that they stay the same from version to version.
Modified: trunk/build/kits/jboss-container/deploy/teiid/teiid-connector-templates-jboss-beans.xml
===================================================================
--- trunk/build/kits/jboss-container/deploy/teiid/teiid-connector-templates-jboss-beans.xml 2010-06-08 14:47:10 UTC (rev 2193)
+++ trunk/build/kits/jboss-container/deploy/teiid/teiid-connector-templates-jboss-beans.xml 2010-06-08 14:50:39 UTC (rev 2194)
@@ -38,7 +38,7 @@
<factory bean="DSDeploymentTemplateInfoFactory"/>
<parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTemplateInfo</parameter>
<parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter>
- <parameter class="java.lang.String">connector-ldap-${project.version}</parameter>
+ <parameter class="java.lang.String">connector-ldap</parameter>
<parameter class="java.lang.String">LDAP Connection</parameter>
</constructor>
<property name="rarName">connector-ldap-${project.version}.rar</property>
@@ -53,7 +53,7 @@
<factory bean="DSDeploymentTemplateInfoFactory"/>
<parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTemplateInfo</parameter>
<parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter>
- <parameter class="java.lang.String">connector-salesforce-${project.version}</parameter>
+ <parameter class="java.lang.String">connector-salesforce</parameter>
<parameter class="java.lang.String">Salesforce Connection</parameter>
</constructor>
<property name="rarName">connector-salesforce-${project.version}.rar</property>
@@ -68,7 +68,7 @@
<factory bean="DSDeploymentTemplateInfoFactory"/>
<parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTemplateInfo</parameter>
<parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter>
- <parameter class="java.lang.String">connector-file-${project.version}</parameter>
+ <parameter class="java.lang.String">connector-file</parameter>
<parameter class="java.lang.String">File Connection</parameter>
</constructor>
<property name="rarName">connector-file-${project.version}.rar</property>
@@ -83,7 +83,7 @@
<factory bean="DSDeploymentTemplateInfoFactory"/>
<parameter class="java.lang.Class">org.teiid.templates.connector.ConnectorTemplateInfo</parameter>
<parameter class="java.lang.Class">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter>
- <parameter class="java.lang.String">connector-ws-${project.version}</parameter>
+ <parameter class="java.lang.String">connector-ws</parameter>
<parameter class="java.lang.String">WS Connection</parameter>
</constructor>
<property name="rarName">connector-ws-${project.version}.rar</property>
13 years, 11 months
teiid SVN: r2193 - trunk/console/src/main/java/org/teiid/rhq/plugin/util.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2010-06-08 10:47:10 -0400 (Tue, 08 Jun 2010)
New Revision: 2193
Modified:
trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java
Log:
Changed descriptions from "JBoss Enterprise" to "Teiid"
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java 2010-06-08 14:41:59 UTC (rev 2192)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/util/PluginConstants.java 2010-06-08 14:47:10 UTC (rev 2193)
@@ -65,7 +65,7 @@
public final static String SUBTYPE = "NoTx"; //$NON-NLS-1$
public final static String TEIID_RUNTIME_ENGINE = "org.teiid.jboss.deployers.RuntimeEngineDeployer"; //$NON-NLS-1$
public final static String TEIID_ENGINE_RESOURCE_NAME = "Data Services"; //$NON-NLS-1$
- public final static String TEIID_ENGINE_RESOURCE_DESCRIPTION = "JBoss Enterprise Data Service Runtime Engine"; //$NON-NLS-1$
+ public final static String TEIID_ENGINE_RESOURCE_DESCRIPTION = "Teiid Data Service Runtime Engine"; //$NON-NLS-1$
public static interface Operations {
@@ -94,9 +94,9 @@
public final static String TYPE = "teiid"; //$NON-NLS-1$
public final static String SUBTYPE = "vdb"; //$NON-NLS-1$
- public final static String NAME = "Enterprise Virtual Database"; //$NON-NLS-1$
+ public final static String NAME = "Teiid Virtual Database"; //$NON-NLS-1$
public final static String VERSION = "version"; //$NON-NLS-1$
- public final static String DESCRIPTION = "JBoss Enterprise Virtual Database (VDB)"; //$NON-NLS-1$
+ public final static String DESCRIPTION = "Teiid Virtual Database (VDB)"; //$NON-NLS-1$
public static interface Operations {
13 years, 11 months
teiid SVN: r2192 - in trunk/console/src/main/java/org/teiid/rhq: comm and 4 other directories.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2010-06-08 10:41:59 -0400 (Tue, 08 Jun 2010)
New Revision: 2192
Added:
trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedResult.java
Removed:
trunk/console/src/main/java/org/teiid/rhq/admin/utils/
trunk/console/src/main/java/org/teiid/rhq/comm/ConnectionConstants.java
trunk/console/src/main/java/org/teiid/rhq/comm/ExecutedResult.java
trunk/console/src/main/java/org/teiid/rhq/comm/impl/
trunk/console/src/main/java/org/teiid/rhq/embedded/pool/
trunk/console/src/main/java/org/teiid/rhq/enterprise/pool/
Modified:
trunk/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java
trunk/console/src/main/java/org/teiid/rhq/plugin/Facet.java
trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/VDBComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedOperationResultImpl.java
trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedResourceConfigurationResultImpl.java
Log:
refactoring and removal of legacy tech preview code
Modified: trunk/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java 2010-06-08 14:15:45 UTC (rev 2191)
+++ trunk/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java 2010-06-08 14:41:59 UTC (rev 2192)
@@ -27,7 +27,7 @@
import org.teiid.adminapi.Transaction;
import org.teiid.adminapi.impl.RequestMetadata;
import org.teiid.adminapi.impl.RequestMetadataMapper;
-import org.teiid.rhq.comm.ExecutedResult;
+import org.teiid.rhq.plugin.objects.ExecutedResult;
import org.teiid.rhq.plugin.util.PluginConstants;
import org.teiid.rhq.plugin.util.ProfileServiceUtil;
import org.teiid.rhq.plugin.util.PluginConstants.ComponentType.Platform;
Deleted: trunk/console/src/main/java/org/teiid/rhq/comm/ConnectionConstants.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/comm/ConnectionConstants.java 2010-06-08 14:15:45 UTC (rev 2191)
+++ trunk/console/src/main/java/org/teiid/rhq/comm/ConnectionConstants.java 2010-06-08 14:41:59 UTC (rev 2192)
@@ -1,249 +0,0 @@
-/*
- * 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.rhq.comm;
-
-
-/**
- * These are the Constants that used in conjunction with using the
- * @since 5.5.3
- */
-public interface ConnectionConstants {
-
-
- public static final String VERSION = "6.0.0";
-
- /**
- * These are Environment properties need to create a connection. They will be exposed via the @see #getEnvironment call.
- */
-
- // The system key is the value used to obtain a connection.
- // In embedded, its a predefined value
- // In enterprise, its the installation directory
- public final static String SYSTEM_KEY = "system.key"; //$NON-NLS-1$
- public final static String USERNAME = "username"; //$NON-NLS-1$
- public final static String PASSWORD = "password"; //$NON-NLS-1$
- public final static String URL = "url"; //$NON-NLS-1$
-// public final static String INSTALL_DIR = "install.dir"; //$NON-NLS-1$
-
- /**
- * These are global properties used by all components
- */
- /*
- * This is the key for the fully qualified identifier.
- * For Runtime components it should be the deployedcomponent full name
- * For Resource components it should be the Service Defn full name
- * for adding to the value maps for metrics and operations.
- */
- public final static String IDENTIFIER = "identifier"; //$NON-NLS-1$
-
-
- /**
- * These properties are exposed via the #getProperty method call.
- */
- public static String SYSTEM_NAME = "cluster.name"; //$NON-NLS-1$
- public static String SYSTEM_NAME_IDENTIFIER = "JGroups"; //$NON-NLS-1$
-
- /**
- * Use these component type names when calling Connection related methods
- * that require the type.
- * @since 1.0
- */
- public interface ComponentType {
- public final static String PLATFORM = "Platform"; //$NON-NLS-1$
-
- public interface Runtime {
-
- public interface System {
- public final static String TYPE = "Runtime.System"; //$NON-NLS-1$
-
- public static interface Operations {
-
- public final static String BOUNCE_SYSTEM = "bounceSystem"; //$NON-NLS-1$
- public final static String GET_LONGRUNNINGQUERIES = "listLongRunningQueries"; //$NON-NLS-1$
-
- }
-
- public static interface Metrics {
-
- public final static String QUERY_COUNT = "queryCount"; //$NON-NLS-1$
- public final static String SESSION_COUNT = "sessionCount"; //$NON-NLS-1$
- public final static String LONG_RUNNING_QUERIES = "longRunningQueries"; //$NON-NLS-1$
-
- }
- }
-
-
-
- public interface Process {
-
- public final static String TYPE = "Runtime.Process"; //$NON-NLS-1$
- public static interface Operations {
-
- }
-
- }
-
-
- public interface Connector {
-
- public final static String TYPE = "Runtime.Connector"; //$NON-NLS-1$
- public static interface Operations {
-
- public final static String RESTART_CONNECTOR = "restart"; //$NON-NLS-1$
- public final static String STOP_CONNECTOR = "stop"; //$NON-NLS-1$
-
- }
-
- }
-
-// public interface Service {
-//
-// public final static String TYPE = "Runtime.Service"; //$NON-NLS-1$
-// public static interface Operations {
-//
-// public final static String RESTART_SERVICE = "restart"; //$NON-NLS-1$
-// public final static String STOP_SERVICE = "stop"; //$NON-NLS-1$
-//
-// }
-//
-// }
-
- public interface Session {
-
- public final static String TYPE = "Runtime.Sesssion"; //$NON-NLS-1$
- public static interface Query {
-
- public final static String GET_SESSIONS = "getSessions"; //$NON-NLS-1$
- }
-
-
-
- }
-
- public interface Queries {
-
- public final static String TYPE = "Runtime.Queries"; //$NON-NLS-1$
- public static interface Query {
-
- public final static String GET_QUERIES = "listQueries"; //$NON-NLS-1$
- }
-
-
-
- }
-
- }
- public interface Resource {
-
- public interface VDB {
- public final static String TYPE = "teiid"; //$NON-NLS-1$
- public final static String SUBTYPE = "vdb"; //$NON-NLS-1$
-
-
- public static interface Operations {
-
- }
- }
-
- public interface Model {
- public final static String TYPE = "teiid"; //$NON-NLS-1$
- public final static String SUBTYPE = "model"; //$NON-NLS-1$
-
-
- public static interface Operations {
-
- }
- }
-
- public interface Service {
-
- public final static String TYPE = "Resource.Service"; //$NON-NLS-1$
- public static interface Operations {
-
- }
-
- public static interface Query {
-
- }
-
- }
- public interface Connector {
-
- public final static String TYPE = "Resource.Connector"; //$NON-NLS-1$
- public static interface Operations {
-
- }
-
- }
- }
-
- public interface Security {
-
- }
- /**
- * Use these metric names when calling getValues() on the connection
- * interface.
- * @since 1.0
- */
- public interface Metric {
- public final static String HIGH_WATER_MARK = "highWatermark"; //$NON-NLS-1$
-
- }
-
- /**
- * Use these operation names when calling executeOperation() on the connection
- * interface.
- * @since 1.0
- */
- public static interface Operation {
- public final static String KILL_REQUEST = "killRequest"; //$NON-NLS-1$
- public final static String GET_VDBS = "listVDBs"; //$NON-NLS-1$
-
- public final static String GET_PROPERTIES = "getProperties"; //$NON-NLS-1$
-
- /**
- * Use these value names when calling executeOperation() on the connection
- * interface. These will correlate with parameters used in operations.
- * @since 1.0
- */
- public static interface Value {
- public final static String STOP_NOW = "stopNow"; //$NON-NLS-1$
- public final static String WAIT_UNTIL_FINISHED = "waitUntilFinished"; //$NON-NLS-1$
-
- public final static String INCLUDE_SOURCE_QUERIES = "includeSourceQueries"; //$NON-NLS-1$
-
- public final static String LONG_RUNNING_QUERY_LIMIT = "longRunningQueryLimit"; //$NON-NLS-1$
-
- public final static String FIELD_LIST = "fieldList"; //$NON-NLS-1$
-
- public final static String REQUEST_ID = "requestID"; //$NON-NLS-1$
-
- public final static String NAME = "Name"; //$NON-NLS-1$
- public final static String VALUE = "Value"; //$NON-NLS-1$
-
- }
-
- }
-
- }
-
- }
Deleted: trunk/console/src/main/java/org/teiid/rhq/comm/ExecutedResult.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/comm/ExecutedResult.java 2010-06-08 14:15:45 UTC (rev 2191)
+++ trunk/console/src/main/java/org/teiid/rhq/comm/ExecutedResult.java 2010-06-08 14:41:59 UTC (rev 2192)
@@ -1,42 +0,0 @@
-/*
- * 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.rhq.comm;
-
-import java.util.Collection;
-import java.util.List;
-
-public interface ExecutedResult {
-
- String getComponentType() ;
-
- String getOperationName();
-
- Object getResult();
-
- List<String> getFieldNameList();
-
- void setContent(Collection content);
-
- void setContent(String content);
-
-
-}
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/Facet.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/Facet.java 2010-06-08 14:15:45 UTC (rev 2191)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/Facet.java 2010-06-08 14:41:59 UTC (rev 2192)
@@ -72,8 +72,8 @@
import org.rhq.core.pluginapi.operation.OperationFacet;
import org.rhq.core.pluginapi.operation.OperationResult;
import org.teiid.rhq.admin.DQPManagementView;
-import org.teiid.rhq.comm.ExecutedResult;
import org.teiid.rhq.plugin.objects.ExecutedOperationResultImpl;
+import org.teiid.rhq.plugin.objects.ExecutedResult;
import org.teiid.rhq.plugin.util.DeploymentUtils;
import org.teiid.rhq.plugin.util.PluginConstants;
import org.teiid.rhq.plugin.util.ProfileServiceUtil;
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorComponent.java 2010-06-08 14:15:45 UTC (rev 2191)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/TranslatorComponent.java 2010-06-08 14:41:59 UTC (rev 2192)
@@ -43,7 +43,6 @@
import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
-import org.teiid.rhq.comm.ConnectionConstants;
import org.teiid.rhq.plugin.util.PluginConstants;
import org.teiid.rhq.plugin.util.ProfileServiceUtil;
@@ -119,13 +118,8 @@
protected void setOperationArguments(String name,
Configuration configuration, Map argumentMap) {
+ //No operations for translators
- if (name
- .equals(ConnectionConstants.ComponentType.Operation.GET_PROPERTIES)) {
- String key = ConnectionConstants.IDENTIFIER;
- argumentMap.put(key, getComponentIdentifier());
- }
-
}
/* (non-Javadoc)
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/VDBComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/VDBComponent.java 2010-06-08 14:15:45 UTC (rev 2191)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/VDBComponent.java 2010-06-08 14:41:59 UTC (rev 2192)
@@ -67,7 +67,6 @@
import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.teiid.adminapi.impl.PropertyMetadata;
import org.teiid.rhq.admin.DQPManagementView;
-import org.teiid.rhq.comm.ConnectionConstants;
import org.teiid.rhq.plugin.util.PluginConstants;
import org.teiid.rhq.plugin.util.ProfileServiceUtil;
import org.teiid.rhq.plugin.util.PluginConstants.Operation;
@@ -116,9 +115,6 @@
} else if (name.equals(Platform.Operations.KILL_SESSION)) {
valueMap.put(Operation.Value.SESSION_ID, configuration.getSimple(
Operation.Value.SESSION_ID).getLongValue());
- } else if (name.equals(Platform.Operations.GET_PROPERTIES)) {
- key = ConnectionConstants.IDENTIFIER;
- valueMap.put(key, getComponentIdentifier());
} else if (name.equals(Platform.Operations.KILL_SESSION)) {
valueMap.put(Operation.Value.SESSION_ID, configuration.getSimple(
Operation.Value.SESSION_ID).getLongValue());
@@ -134,7 +130,9 @@
@Override
public AvailabilityType getAvailability() {
// TODO Remove vdb version after no longer viable in Teiid
- String status = DQPManagementView.getVDBStatus(this.name, 1);
+ String version = this.resourceConfiguration.getSimpleValue(
+ "version", null);
+ String status = DQPManagementView.getVDBStatus(this.name, Integer.parseInt(version));
if (status.equals("ACTIVE")) {
return AvailabilityType.UP;
}
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedOperationResultImpl.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedOperationResultImpl.java 2010-06-08 14:15:45 UTC (rev 2191)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedOperationResultImpl.java 2010-06-08 14:41:59 UTC (rev 2192)
@@ -37,7 +37,6 @@
import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple;
import org.rhq.core.domain.operation.OperationDefinition;
import org.rhq.core.pluginapi.operation.OperationResult;
-import org.teiid.rhq.comm.ExecutedResult;
public class ExecutedOperationResultImpl implements ExecutedResult {
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedResourceConfigurationResultImpl.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedResourceConfigurationResultImpl.java 2010-06-08 14:15:45 UTC (rev 2191)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedResourceConfigurationResultImpl.java 2010-06-08 14:41:59 UTC (rev 2192)
@@ -34,7 +34,6 @@
import org.rhq.core.domain.configuration.definition.PropertyDefinitionList;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionMap;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple;
-import org.teiid.rhq.comm.ExecutedResult;
public class ExecutedResourceConfigurationResultImpl implements ExecutedResult {
Copied: trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedResult.java (from rev 2141, trunk/console/src/main/java/org/teiid/rhq/comm/ExecutedResult.java)
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedResult.java (rev 0)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedResult.java 2010-06-08 14:41:59 UTC (rev 2192)
@@ -0,0 +1,42 @@
+/*
+ * 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.rhq.plugin.objects;
+
+import java.util.Collection;
+import java.util.List;
+
+public interface ExecutedResult {
+
+ String getComponentType() ;
+
+ String getOperationName();
+
+ Object getResult();
+
+ List<String> getFieldNameList();
+
+ void setContent(Collection content);
+
+ void setContent(String content);
+
+
+}
13 years, 11 months
teiid SVN: r2191 - in trunk/console/src/main/java/org/teiid/rhq/plugin: adapter/api and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2010-06-08 10:15:45 -0400 (Tue, 08 Jun 2010)
New Revision: 2191
Modified:
trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformDiscoveryComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java
trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/PropertyAdapter.java
trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/PropertyAdapterFactory.java
trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedOperationResultImpl.java
trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedResourceConfigurationResultImpl.java
Log:
Clean up unused imports and comments
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java 2010-06-08 13:46:09 UTC (rev 2190)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformComponent.java 2010-06-08 14:15:45 UTC (rev 2191)
@@ -36,13 +36,11 @@
import org.jboss.managed.api.RunState;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
-import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.MeasurementReport;
import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
-import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.teiid.rhq.admin.DQPManagementView;
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformDiscoveryComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformDiscoveryComponent.java 2010-06-08 13:46:09 UTC (rev 2190)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/PlatformDiscoveryComponent.java 2010-06-08 14:15:45 UTC (rev 2191)
@@ -22,18 +22,13 @@
package org.teiid.rhq.plugin;
import java.util.HashSet;
-import java.util.Map;
import java.util.Set;
-import javax.naming.NamingException;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.managed.api.ComponentType;
import org.jboss.managed.api.ManagedComponent;
-import org.jboss.managed.api.ManagedProperty;
import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java 2010-06-08 13:46:09 UTC (rev 2190)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/VDBDiscoveryComponent.java 2010-06-08 14:15:45 UTC (rev 2191)
@@ -21,40 +21,19 @@
*/
package org.teiid.rhq.plugin;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
-import java.util.Map;
import java.util.Set;
-import javax.naming.NamingException;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.managed.api.ComponentType;
import org.jboss.managed.api.ManagedComponent;
-import org.jboss.managed.api.ManagedObject;
-import org.jboss.managed.api.ManagedProperty;
-import org.jboss.managed.plugins.ManagedObjectImpl;
-import org.jboss.metatype.api.types.MetaType;
-import org.jboss.metatype.api.values.CollectionValueSupport;
-import org.jboss.metatype.api.values.EnumValueSupport;
-import org.jboss.metatype.api.values.GenericValueSupport;
-import org.jboss.metatype.api.values.MetaValue;
-import org.jboss.metatype.api.values.MetaValueFactory;
-import org.jboss.metatype.api.values.SimpleValue;
-import org.jboss.metatype.api.values.SimpleValueSupport;
import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.PropertyList;
-import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
-import org.teiid.adminapi.Request;
import org.teiid.rhq.plugin.util.PluginConstants;
import org.teiid.rhq.plugin.util.ProfileServiceUtil;
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/PropertyAdapter.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/PropertyAdapter.java 2010-06-08 13:46:09 UTC (rev 2190)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/PropertyAdapter.java 2010-06-08 14:15:45 UTC (rev 2191)
@@ -30,9 +30,6 @@
/**
* An adapter that can convert back and forth between a specific type of {@link MetaValue} and a specific type of {@link
* Property}.
- *
- * @author Mark Spritzler
- * @author Ian Springer
*/
public interface PropertyAdapter<P extends Property, D extends PropertyDefinition>
{
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/PropertyAdapterFactory.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/PropertyAdapterFactory.java 2010-06-08 13:46:09 UTC (rev 2190)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/adapter/api/PropertyAdapterFactory.java 2010-06-08 14:15:45 UTC (rev 2191)
@@ -41,7 +41,7 @@
import com.sun.istack.Nullable;
/**
- * @author Mark Spritzler
+ *
*/
public class PropertyAdapterFactory
{
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedOperationResultImpl.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedOperationResultImpl.java 2010-06-08 13:46:09 UTC (rev 2190)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedOperationResultImpl.java 2010-06-08 14:15:45 UTC (rev 2191)
@@ -21,7 +21,6 @@
*/
package org.teiid.rhq.plugin.objects;
-import java.lang.annotation.Annotation;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
@@ -29,8 +28,6 @@
import java.util.Map;
import java.util.Set;
-import javax.persistence.Transient;
-
import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
Modified: trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedResourceConfigurationResultImpl.java
===================================================================
--- trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedResourceConfigurationResultImpl.java 2010-06-08 13:46:09 UTC (rev 2190)
+++ trunk/console/src/main/java/org/teiid/rhq/plugin/objects/ExecutedResourceConfigurationResultImpl.java 2010-06-08 14:15:45 UTC (rev 2191)
@@ -26,7 +26,6 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
@@ -35,8 +34,6 @@
import org.rhq.core.domain.configuration.definition.PropertyDefinitionList;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionMap;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple;
-import org.rhq.core.domain.operation.OperationDefinition;
-import org.rhq.core.pluginapi.operation.OperationResult;
import org.teiid.rhq.comm.ExecutedResult;
13 years, 11 months
teiid SVN: r2190 - trunk/console/src/resources.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2010-06-08 09:46:09 -0400 (Tue, 08 Jun 2010)
New Revision: 2190
Removed:
trunk/console/src/resources/enterprise/
Log:
Removed extraneous rhq-plugin.xml (left over from legacy tech preview).
13 years, 11 months