11:28 a.m.
Author: shawkins
Date: 2011-01-12 12:28:31 -0500 (Wed, 12 Jan 2011)
New Revision: 2835
Modified:
trunk/build/kits/jboss-container/conf/props/teiid-security-roles.properties
trunk/build/kits/jboss-container/teiid-examples/simpleclient/JDBCClient.java
trunk/build/kits/jboss-container/teiid-releasenotes.html
trunk/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml
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
Log:
TEIID-1372 changing the user credentials to user/user and corrections to the docs based
upon Paul's use of beta1
Modified: trunk/build/kits/jboss-container/conf/props/teiid-security-roles.properties
===================================================================
--- trunk/build/kits/jboss-container/conf/props/teiid-security-roles.properties 2011-01-11
23:59:41 UTC (rev 2834)
+++ trunk/build/kits/jboss-container/conf/props/teiid-security-roles.properties 2011-01-12
17:28:31 UTC (rev 2835)
@@ -1,3 +1,3 @@
# A roles.properties file for use with the UsersRolesLoginModule
# username=role1,role2
-admin=admin
+user=example-role
Modified: trunk/build/kits/jboss-container/teiid-examples/simpleclient/JDBCClient.java
===================================================================
---
trunk/build/kits/jboss-container/teiid-examples/simpleclient/JDBCClient.java 2011-01-11
23:59:41 UTC (rev 2834)
+++
trunk/build/kits/jboss-container/teiid-examples/simpleclient/JDBCClient.java 2011-01-12
17:28:31 UTC (rev 2835)
@@ -31,6 +31,7 @@
@SuppressWarnings("nls")
public class JDBCClient {
+
public static void main(String[] args) throws Exception {
if (args.length < 4) {
System.out.println("usage: JDBCClient <host> <port> <vdb>
<sql-command>");
@@ -50,14 +51,14 @@
String url =
"jdbc:teiid:"+vdb+"@mm://"+host+":"+port+";showplan=on";
//note showplan setting
Class.forName("org.teiid.jdbc.TeiidDriver");
- return DriverManager.getConnection(url,"admin", "teiid");
+ return DriverManager.getConnection(url,"user", "user");
}
static Connection getDataSourceConnection(String host, String port, String vdb) throws
Exception {
TeiidDataSource ds = new TeiidDataSource();
ds.setDatabaseName(vdb);
- ds.setUser("admin");
- ds.setPassword("teiid");
+ ds.setUser("user");
+ ds.setPassword("user");
ds.setServerName(host);
ds.setPortNumber(Integer.valueOf(port));
Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- trunk/build/kits/jboss-container/teiid-releasenotes.html 2011-01-11 23:59:41 UTC (rev
2834)
+++ trunk/build/kits/jboss-container/teiid-releasenotes.html 2011-01-12 17:28:31 UTC (rev
2835)
@@ -47,9 +47,12 @@
<li>TRANSLATE/HAS CRITERIA has been deprecated. An alternative approach to
update procedures will be introduced in a subsequent version.
<li>Support for named parameter syntax using param=value has been deprecated,
since it is ambiguous with a comparison predicate boolean value expression.
param<b>=></b>value should be used instead.
</ul>
+<h4>from 7.2</h4>
+<ul>
+ <li>The default JDBC credentials are user/user - not admin/teiid
+</ul>
<h4>from 7.1</h4>
<ul>
- <li>The default JDBC credentials are user/user - not admin/teiid
<li>Subqueries are no longer allowed to be SELECT INTO.
<li>INSERT/UPDATE/DELETE cannot be used to create implicit return cursors in
non-update virtual procedures. You can instead use "UPDATE ...; SELECT
VARIABLES.ROWCOUNT;".
<li>The SYSADMIN schema was created to hold procedures and tables that should not
be generally accessible. SYS and pg_catalog are now always accessible - permissions do
not apply to these schemas. The SYS.getBinaryVDBResource, SYS.getCharacterVDBResource,
and SYS.getVDBResourcePaths have been replaced with the
Modified: trunk/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml
===================================================================
---
trunk/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml 2011-01-11
23:59:41 UTC (rev 2834)
+++
trunk/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml 2011-01-12
17:28:31 UTC (rev 2835)
@@ -154,7 +154,7 @@
<section>
<title>teiid-examples</title>
<para>This directory contains some examples of how Teiid can be used.
Contains artifacts
- need by the Getting Started Guide. Also contains some sample XML files to define
the connectors.</para>
+ need by the Quick Start Example. Also contains some sample XML files to define
the connectors.</para>
</section>
<section>
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 2011-01-11
23:59:41 UTC (rev 2834)
+++
trunk/documentation/quick-start-example/src/main/docbook/en-US/content/buildvdb.xml 2011-01-12
17:28:31 UTC (rev 2835)
@@ -7,7 +7,7 @@
for this example purpose we will use the a dynamic VDB. If you would like to use the
Designer to build your VDB, check out the Designer examples. If you need to build any
view layers using your source,
you must use Designer based approach to building the VDB. A sample Designer based VDB
is
- available in the "teiid-examples/portfolio/PortfolioModel"
directory.</para>
+ available in the "teiid-examples/dynamicvdb-portfolio/PortfolioModel"
directory.</para>
<section id="dynamic_vdb">
<title>Building Dynamic VDB</title>
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 2011-01-11
23:59:41 UTC (rev 2834)
+++
trunk/documentation/quick-start-example/src/main/docbook/en-US/content/connect-vdb.xml 2011-01-12
17:28:31 UTC (rev 2835)
@@ -84,7 +84,7 @@
To execute this demonstration, follow these steps:</para>
<orderedlist numeration="arabic">
<listitem><para>Ensure Derby is running</para></listitem>
- <listitem><para>Change to the
${jboss-install}/server/profile/teiid-examples/portfolio
directory</para></listitem>
+ <listitem><para>Change to the
${jboss-install}/server/profile/teiid-examples/simpleclient
directory</para></listitem>
<listitem><para>Execute the run script (either for Linux or
Windows)</para></listitem>
</orderedlist>
<para>Depending on the VDB you deployed, see the relevant README file for
example queries. If you are using a graphical client, such
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 2011-01-11
23:59:41 UTC (rev 2834)
+++
trunk/documentation/quick-start-example/src/main/docbook/en-US/content/deployment.xml 2011-01-12
17:28:31 UTC (rev 2835)
@@ -19,11 +19,12 @@
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 (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/portfolio-ds.xml
-${teiid-examples}/portfolio/marketdata-file-ds.xml]]> </programlisting>
- <para>files into "${jboss-install}/server/{profile}/deploy"
directory.</para>
+ <para>Access to Derby first requires that the the Derby client jar
(${derby-install}/lib/derbyclient.jar) be placed in the
${jboss-install}/server/{profile}/lib directory.</para>
+
+ <para>See or copy the following:</para>
+
<programlisting><![CDATA[${teiid-examples}/dynamicvdb-portfolio/portfolio-ds.xml
+${teiid-examples}/dynamicvdb-portfolio/marketdata-file-ds.xml]]>
</programlisting>
+ <para>files into "${jboss-install}/server/{profile}/deploy"
directory to create the Derby and File data sources respectively.</para>
</listitem>
<listitem>
<para>The above data sources provide the data to your VDB. Now to deploy
your VDBl place your VDB file (either the dynamicvdb-portfolio/portfolio-vdb.xml file or
the full .vdb file) in a the "${jboss-install}/server/{profile}/deploy"
directory.
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 2011-01-11
23:59:41 UTC (rev 2834)
+++
trunk/documentation/quick-start-example/src/main/docbook/en-US/content/example-explained.xml 2011-01-12
17:28:31 UTC (rev 2835)
@@ -69,7 +69,7 @@
</programlisting>
<para>This starts the Derby in network mode. Now, start another terminal and we
will use Derby''s 'ij' tool
(like SQL*PLus for Oracle) to create the schema, using the
"customer-schema.sql" file in
- "examples/portfolio" directory</para>
+ "examples/dynamicvdb-portfolio" directory</para>
<programlisting><![CDATA[export DERBY_HOME=`pwd`
./bin/ij /path/to/customer-schema.sql]]>
</programlisting>
@@ -107,7 +107,7 @@
<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>
+ is shown below. The complete sample file is
"examples/dynamicvdb-portfolio/marketdata-price.txt".</para>
<programlisting><![CDATA[
SYMBOL,PRICE
IBM,83.46