teiid SVN: r3623 - in trunk: documentation/admin-guide/src/main/docbook/en-US/content and 3 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2011-11-09 13:09:23 -0500 (Wed, 09 Nov 2011)
New Revision: 3623
Modified:
trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml
trunk/documentation/admin-guide/src/main/docbook/en-US/content/security.xml
trunk/engine/src/main/java/org/teiid/dqp/service/SessionService.java
trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java
trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java
Log:
TEIID-1610: rename public facing proeprty from krb5 to gss
Modified: trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml
===================================================================
--- trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml 2011-11-09 18:03:26 UTC (rev 3622)
+++ trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml 2011-11-09 18:09:23 UTC (rev 3623)
@@ -16,7 +16,7 @@
<!-- authentication type are CLEARTEXT, GSS (default:CLEARTEXT) -->
<property name="authenticationType">CLEARTEXT</property>
<!-- When authenticationType=GSS, then it requires a kerberos security domain to authorize first before teiid-security takes over -->
- <property name="krb5SecurityDomain">teiid-krb5</property>
+ <property name="gssSecurityDomain">teiid-krb5</property>
</bean>
<bean name="BufferService" class="org.teiid.services.BufferServiceImpl">
Modified: trunk/documentation/admin-guide/src/main/docbook/en-US/content/security.xml
===================================================================
--- trunk/documentation/admin-guide/src/main/docbook/en-US/content/security.xml 2011-11-09 18:03:26 UTC (rev 3622)
+++ trunk/documentation/admin-guide/src/main/docbook/en-US/content/security.xml 2011-11-09 18:09:23 UTC (rev 3623)
@@ -183,7 +183,7 @@
<programlisting><![CDATA[<!-- Sets the authentication Type -->
<property name="authenticationType">GSS</property>
<!-- Security domain used for kerberos authentication -->
-<property name="krb5SecurityDomain">teiid-krb5</property>]]></programlisting>
+<property name="gssSecurityDomain">teiid-krb5</property>]]></programlisting>
Now we need to define a security domain context for kerberos with the name mentioned in above.
Since kerberos authorization cannot define authorization roles, we'll define them using another login context.
Modified: trunk/engine/src/main/java/org/teiid/dqp/service/SessionService.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/service/SessionService.java 2011-11-09 18:03:26 UTC (rev 3622)
+++ trunk/engine/src/main/java/org/teiid/dqp/service/SessionService.java 2011-11-09 18:09:23 UTC (rev 3623)
@@ -146,7 +146,7 @@
AuthenticationType getAuthType();
- String getKrb5SecurityDomain();
+ String getGssSecurityDomain();
void associateSubjectInContext(String securityDomain, Subject subject);
Modified: trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java 2011-11-09 18:03:26 UTC (rev 3622)
+++ trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java 2011-11-09 18:09:23 UTC (rev 3623)
@@ -82,7 +82,7 @@
private long sessionMaxLimit = DEFAULT_MAX_SESSIONS;
private long sessionExpirationTimeLimit = DEFAULT_SESSION_EXPIRATION;
private String authenticationType = AuthenticationType.CLEARTEXT.name();
- private String krb5SecurityDomain;
+ private String gssSecurityDomain;
/*
* Injected state
@@ -438,12 +438,12 @@
return this.securityHelper.getSubjectInContext(securityDomain);
}
- public void setKrb5SecurityDomain(String domain) {
- this.krb5SecurityDomain = domain;
+ public void setGssSecurityDomain(String domain) {
+ this.gssSecurityDomain = domain;
}
@Override
- public String getKrb5SecurityDomain(){
- return this.krb5SecurityDomain;
+ public String getGssSecurityDomain(){
+ return this.gssSecurityDomain;
}
}
Modified: trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java 2011-11-09 18:03:26 UTC (rev 3622)
+++ trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java 2011-11-09 18:09:23 UTC (rev 3623)
@@ -66,8 +66,8 @@
}
public LogonResult logon(Properties connProps) throws LogonException, TeiidComponentException, CommunicationException {
- if (this.service.getKrb5SecurityDomain() != null && connProps.get(ILogon.KRB5TOKEN) != null) {
- Subject user = this.service.getSubjectInContext(this.service.getKrb5SecurityDomain());
+ if (this.service.getGssSecurityDomain() != null && connProps.get(ILogon.KRB5TOKEN) != null) {
+ Subject user = this.service.getSubjectInContext(this.service.getGssSecurityDomain());
if (user == null) {
throw new LogonException(RuntimePlugin.Util.getString("krb5_user_not_found")); //$NON-NLS-1$
}
@@ -161,7 +161,7 @@
String password = connProps.getProperty(TeiidURL.CONNECTION.PASSWORD);
try {
- String securityDomain = service.getKrb5SecurityDomain();
+ String securityDomain = service.getGssSecurityDomain();
if (securityDomain == null) {
throw new LogonException(RuntimePlugin.Util.getString("no_security_domains")); //$NON-NLS-1$
}
12 years, 6 months
- 1
- 0
teiid SVN: r3622 - in trunk: client/src/main/java/org/teiid/net and 8 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2011-11-09 13:03:26 -0500 (Wed, 09 Nov 2011)
New Revision: 3622
Modified:
trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml
trunk/client/src/main/java/org/teiid/net/TeiidURL.java
trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
trunk/documentation/admin-guide/src/main/docbook/en-US/content/security.xml
trunk/engine/src/main/java/org/teiid/dqp/service/SessionService.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/AssosiateCallerIdentityLoginModule.java
trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java
trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java
trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties
Log:
TEIID-1610: Fixing an issue with ODBC GSS login, where after the GSS negotiation the subject not placed in the security context, and also it uses JDBC login with GSS auth-type, but there is no logic opening to allow this user to proceed.
Modified: trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml
===================================================================
--- trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml 2011-11-09 10:23:35 UTC (rev 3621)
+++ trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml 2011-11-09 18:03:26 UTC (rev 3622)
@@ -13,9 +13,9 @@
<property name="sessionMaxLimit">5000</property>
<!-- Max allowed time before the session is terminated by the system, 0 indicates unlimited (default 0) -->
<property name="sessionExpirationTimeLimit">0</property>
- <!-- authentication type are CLEARTEXT, KRB5 (default:CLEARTEXT) -->
+ <!-- authentication type are CLEARTEXT, GSS (default:CLEARTEXT) -->
<property name="authenticationType">CLEARTEXT</property>
- <!-- When authenticationType=KRB5, then it requires a kerberos security domain to authorize first before teiid-security takes over -->
+ <!-- When authenticationType=GSS, then it requires a kerberos security domain to authorize first before teiid-security takes over -->
<property name="krb5SecurityDomain">teiid-krb5</property>
</bean>
Modified: trunk/client/src/main/java/org/teiid/net/TeiidURL.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/TeiidURL.java 2011-11-09 10:23:35 UTC (rev 3621)
+++ trunk/client/src/main/java/org/teiid/net/TeiidURL.java 2011-11-09 18:03:26 UTC (rev 3622)
@@ -90,7 +90,7 @@
public static final String KERBEROS_SERVICE_PRINCIPLE_NAME = "kerberosServicePrincipleName"; //$NON-NLS-1$
public enum AuthenticationType {
- CLEARTEXT,KRB5
+ CLEARTEXT,GSS
};
}
Modified: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java 2011-11-09 10:23:35 UTC (rev 3621)
+++ trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java 2011-11-09 18:03:26 UTC (rev 3622)
@@ -176,7 +176,7 @@
if (AuthenticationType.CLEARTEXT.equals(authType)) {
newResult = newLogon.logon(connProps);
}
- else if (AuthenticationType.KRB5.equals(authType)) {
+ else if (AuthenticationType.GSS.equals(authType)) {
newResult = MakeGSS.authenticate(newLogon, connProps);
}
Modified: trunk/documentation/admin-guide/src/main/docbook/en-US/content/security.xml
===================================================================
--- trunk/documentation/admin-guide/src/main/docbook/en-US/content/security.xml 2011-11-09 10:23:35 UTC (rev 3621)
+++ trunk/documentation/admin-guide/src/main/docbook/en-US/content/security.xml 2011-11-09 18:03:26 UTC (rev 3622)
@@ -181,7 +181,7 @@
<title>Remote Connections</title>
<para>On the server, edit the &jboss-beans; under the "SessionService" bean definition, as follows:
<programlisting><![CDATA[<!-- Sets the authentication Type -->
-<property name="authenticationType">KRB5</property>
+<property name="authenticationType">GSS</property>
<!-- Security domain used for kerberos authentication -->
<property name="krb5SecurityDomain">teiid-krb5</property>]]></programlisting>
Modified: trunk/engine/src/main/java/org/teiid/dqp/service/SessionService.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/service/SessionService.java 2011-11-09 10:23:35 UTC (rev 3621)
+++ trunk/engine/src/main/java/org/teiid/dqp/service/SessionService.java 2011-11-09 18:03:26 UTC (rev 3622)
@@ -149,4 +149,6 @@
String getKrb5SecurityDomain();
void associateSubjectInContext(String securityDomain, Subject subject);
+
+ Subject getSubjectInContext(String securityDomain);
}
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/AssosiateCallerIdentityLoginModule.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/AssosiateCallerIdentityLoginModule.java 2011-11-09 10:23:35 UTC (rev 3621)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/AssosiateCallerIdentityLoginModule.java 2011-11-09 18:03:26 UTC (rev 3622)
@@ -33,6 +33,8 @@
import org.jboss.security.SecurityContext;
import org.jboss.security.SubjectInfo;
import org.jboss.security.auth.spi.AbstractServerLoginModule;
+import org.teiid.logging.LogConstants;
+import org.teiid.logging.LogManager;
/**
* This login modules simply takes the subject in the current context and adds
@@ -69,6 +71,8 @@
return true;
}
+ LogManager.logDetail(LogConstants.CTX_SECURITY, "Adding Passthrough principal="+principal.getName()); //$NON-NLS-1$
+
// Put the principal name into the sharedState map
sharedState.put("javax.security.auth.login.name", principal.getName()); //$NON-NLS-1$
sharedState.put("javax.security.auth.login.password", ""); //$NON-NLS-1$ //$NON-NLS-2$
Modified: trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2011-11-09 10:23:35 UTC (rev 3621)
+++ trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2011-11-09 18:03:26 UTC (rev 3622)
@@ -189,7 +189,7 @@
if (this.authType.equals(AuthenticationType.CLEARTEXT)) {
this.client.useClearTextAuthentication();
}
- else if (this.authType.equals(AuthenticationType.KRB5)) {
+ else if (this.authType.equals(AuthenticationType.GSS)) {
this.client.useAuthenticationGSS();
}
}
@@ -205,17 +205,21 @@
if (authType.equals(AuthenticationType.CLEARTEXT)) {
password = data.readString();
}
- else if (authType.equals(AuthenticationType.KRB5)) {
+ else if (authType.equals(AuthenticationType.GSS)) {
byte[] serviceToken = data.readServiceToken();
LogonResult result = this.logon.neogitiateGssLogin(this.props, serviceToken, false);
- if (!Boolean.TRUE.equals(result.getProperty(ILogon.KRB5_ESTABLISHED))) {
- serviceToken = (byte[])result.getProperty(ILogon.KRB5TOKEN);
+ serviceToken = (byte[])result.getProperty(ILogon.KRB5TOKEN);
+ if (Boolean.TRUE.equals(result.getProperty(ILogon.KRB5_ESTABLISHED))) {
+ passthroughAuthentication = ";PassthroughAuthentication=true;authenticationType=KRB5"; //$NON-NLS-1$
+ info.put(ILogon.KRB5TOKEN, serviceToken);
+ }
+ else {
this.client.authenticationGSSContinue(serviceToken);
- return;
+ return;
}
- passthroughAuthentication = ";PassthroughAuthentication=true"; //$NON-NLS-1$
}
+ // this is local connection
String url = "jdbc:teiid:"+databaseName+";ApplicationName=ODBC"+passthroughAuthentication; //$NON-NLS-1$ //$NON-NLS-2$
if (password != null) {
Modified: trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java 2011-11-09 10:23:35 UTC (rev 3621)
+++ trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java 2011-11-09 18:03:26 UTC (rev 3622)
@@ -433,6 +433,11 @@
this.securityHelper.associateSecurityContext(securityDomain, this.securityHelper.createSecurityContext(securityDomain, principal, null, subject));
}
+ @Override
+ public Subject getSubjectInContext(String securityDomain) {
+ return this.securityHelper.getSubjectInContext(securityDomain);
+ }
+
public void setKrb5SecurityDomain(String domain) {
this.krb5SecurityDomain = domain;
}
Modified: trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java 2011-11-09 10:23:35 UTC (rev 3621)
+++ trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java 2011-11-09 18:03:26 UTC (rev 3622)
@@ -66,6 +66,14 @@
}
public LogonResult logon(Properties connProps) throws LogonException, TeiidComponentException, CommunicationException {
+ if (this.service.getKrb5SecurityDomain() != null && connProps.get(ILogon.KRB5TOKEN) != null) {
+ Subject user = this.service.getSubjectInContext(this.service.getKrb5SecurityDomain());
+ if (user == null) {
+ throw new LogonException(RuntimePlugin.Util.getString("krb5_user_not_found")); //$NON-NLS-1$
+ }
+ return logon(connProps, (byte[])connProps.get(ILogon.KRB5TOKEN));
+ }
+
if (!AuthenticationType.CLEARTEXT.equals(service.getAuthType())) {
throw new LogonException(RuntimePlugin.Util.getString("wrong_logon_type_jaas")); //$NON-NLS-1$
}
@@ -145,7 +153,7 @@
@Override
public LogonResult neogitiateGssLogin(Properties connProps, byte[] serviceTicket, boolean createSession) throws LogonException {
- if (!AuthenticationType.KRB5.equals(service.getAuthType())) {
+ if (!AuthenticationType.GSS.equals(service.getAuthType())) {
throw new LogonException(RuntimePlugin.Util.getString("wrong_logon_type_krb5")); //$NON-NLS-1$
}
@@ -165,6 +173,11 @@
if (result == null) {
throw new LogonException(RuntimePlugin.Util.getString("krb5_login_failed")); //$NON-NLS-1$
}
+
+ if (result.context.isEstablished()) {
+ service.associateSubjectInContext(securityDomain, subject);
+ }
+
if (!result.context.isEstablished() || !createSession) {
LogonResult logonResult = new LogonResult(new SessionToken(0, "temp"), "internal", 0, "internal"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
logonResult.addProperty(ILogon.KRB5TOKEN, result.serviceTicket);
@@ -174,7 +187,6 @@
LogManager.logDetail(LogConstants.CTX_SECURITY, "Kerberos context established"); //$NON-NLS-1$
//connProps.setProperty(TeiidURL.CONNECTION.PASSTHROUGH_AUTHENTICATION, "true"); //$NON-NLS-1$
- service.associateSubjectInContext(securityDomain, subject);
return logon(connProps, result.serviceTicket);
} catch (LoginException e) {
throw new LogonException(e, RuntimePlugin.Util.getString("krb5_login_failed")); //$NON-NLS-1$
Modified: trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties
===================================================================
--- trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2011-11-09 10:23:35 UTC (rev 3621)
+++ trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2011-11-09 18:03:26 UTC (rev 3622)
@@ -97,4 +97,5 @@
wrong_logon_type_jaas = Wrong logon method is being used. Server is not set up for JAAS based authentication. Correct your client's 'AuthenticationType' property.
wrong_logon_type_krb5 = Wrong logon method is being used. Server is not set up for Kerberos based authentication. Correct your client's 'AuthenticationType' property.
krb5_login_failed=Kerberos context login failed
-no_security_domains=No security domain configured for Kerberos authentication. Can not authenticate.
\ No newline at end of file
+no_security_domains=No security domain configured for Kerberos authentication. Can not authenticate.
+krb5_user_not_found=GSS authentication is in use, however authenticated user not found in the context to proceed.
\ No newline at end of file
12 years, 6 months
- 1
- 0
teiid SVN: r3621 - in trunk/engine/src: main/java/org/teiid/query/resolver/util and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-11-09 05:23:35 -0500 (Wed, 09 Nov 2011)
New Revision: 3621
Modified:
trunk/engine/src/main/java/org/teiid/query/resolver/command/SimpleQueryResolver.java
trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java
trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java
trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java
Log:
TEIID-1818 fix for prepared context item type
Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/SimpleQueryResolver.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/resolver/command/SimpleQueryResolver.java 2011-11-08 19:02:22 UTC (rev 3620)
+++ trunk/engine/src/main/java/org/teiid/query/resolver/command/SimpleQueryResolver.java 2011-11-09 10:23:35 UTC (rev 3621)
@@ -343,6 +343,7 @@
visitNodes(obj.getPassing());
postTableFunctionReference(obj, saved);
try {
+ ResolverUtil.setDesiredType(obj.getPassing(), obj);
obj.compileXqueryExpression();
for (XMLTable.XMLColumn column : obj.getColumns()) {
if (column.getDefaultExpression() == null) {
Modified: trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java 2011-11-08 19:02:22 UTC (rev 3620)
+++ trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java 2011-11-09 10:23:35 UTC (rev 3621)
@@ -74,6 +74,7 @@
import org.teiid.query.sql.symbol.AggregateSymbol;
import org.teiid.query.sql.symbol.AliasSymbol;
import org.teiid.query.sql.symbol.Constant;
+import org.teiid.query.sql.symbol.DerivedColumn;
import org.teiid.query.sql.symbol.ElementSymbol;
import org.teiid.query.sql.symbol.Expression;
import org.teiid.query.sql.symbol.ExpressionSymbol;
@@ -288,6 +289,15 @@
return conversion;
}
+
+ public static void setDesiredType(List<DerivedColumn> passing, LanguageObject obj) throws QueryResolverException {
+ for (DerivedColumn dc : passing) {
+ if (dc.getAlias() == null) {
+ ResolverUtil.setDesiredType(dc.getExpression(), DataTypeManager.DefaultDataClasses.XML, obj);
+ break;
+ }
+ }
+ }
/**
* Utility to set the type of an expression if it is a Reference and has a null type.
Modified: trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java 2011-11-08 19:02:22 UTC (rev 3620)
+++ trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java 2011-11-09 10:23:35 UTC (rev 3621)
@@ -402,6 +402,7 @@
@Override
public void visit(XMLQuery obj) {
try {
+ ResolverUtil.setDesiredType(obj.getPassing(), obj);
obj.compileXqueryExpression();
} catch (QueryResolverException e) {
handleException(e);
Modified: trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2011-11-08 19:02:22 UTC (rev 3620)
+++ trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2011-11-09 10:23:35 UTC (rev 3621)
@@ -94,6 +94,8 @@
import org.teiid.query.sql.symbol.GroupSymbol;
import org.teiid.query.sql.symbol.Reference;
import org.teiid.query.sql.symbol.SingleElementSymbol;
+import org.teiid.query.sql.symbol.XMLQuery;
+import org.teiid.query.sql.util.SymbolMap;
import org.teiid.query.sql.visitor.CommandCollectorVisitor;
import org.teiid.query.sql.visitor.ElementCollectorVisitor;
import org.teiid.query.sql.visitor.FunctionCollectorVisitor;
@@ -2986,5 +2988,15 @@
@Test public void testTrim1() {
helpResolve("select trim('x' from e1) from pm1.g1");
}
+
+ @Test public void testXmlTableWithParam() {
+ helpResolve("select * from xmltable('/a' passing ?) as x");
+ }
+
+ @Test public void testXmlQueryWithParam() {
+ Query q = (Query)helpResolve("select xmlquery('/a' passing ?)");
+ XMLQuery ex = (XMLQuery) SymbolMap.getExpression((Expression) q.getSelect().getSymbols().get(0));
+ assertEquals(DataTypeManager.DefaultDataClasses.XML, ex.getPassing().get(0).getExpression().getType());
+ }
}
\ No newline at end of file
12 years, 6 months
- 1
- 0
teiid SVN: r3620 - in trunk: client/src/main/java/org/teiid/jdbc and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-11-08 14:02:22 -0500 (Tue, 08 Nov 2011)
New Revision: 3620
Modified:
trunk/api/src/main/java/org/teiid/translator/ExecutionContext.java
trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java
trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
Log:
removing possibly out of date javadocs and updating the javadoc for ExecutionContext.addWarning
Modified: trunk/api/src/main/java/org/teiid/translator/ExecutionContext.java
===================================================================
--- trunk/api/src/main/java/org/teiid/translator/ExecutionContext.java 2011-11-08 17:48:30 UTC (rev 3619)
+++ trunk/api/src/main/java/org/teiid/translator/ExecutionContext.java 2011-11-08 19:02:22 UTC (rev 3620)
@@ -23,6 +23,7 @@
package org.teiid.translator;
import java.io.Serializable;
+import java.sql.Statement;
import javax.security.auth.Subject;
@@ -130,7 +131,9 @@
int getBatchSize();
/**
- * Add an exception as a warning to this Execution.
+ * Add an exception as a warning to this Execution. If the exception is not an instance of a SQLWarning
+ * it will be wrapped by a SQLWarning for the client. The warnings can be consumed through the
+ * {@link Statement#getWarnings()} method.
* @param ex
*/
void addWarning(Exception ex);
Modified: trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java 2011-11-08 17:48:30 UTC (rev 3619)
+++ trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java 2011-11-08 19:02:22 UTC (rev 3620)
@@ -286,13 +286,6 @@
setAsciiStream(parameterIndex, in);
}
- /**
- * <p>Sets the IN parameter at paramaterIndex to a BigDecimal object. The parameter
- * type is set to NUMERIC
- * @param parameterIndex of the parameter whose value is to be set
- * @param BigDecimal object to which the parameter value is to be set.
- * @throws SQLException, should not occur
- */
public void setBigDecimal (int parameterIndex, java.math.BigDecimal value) throws SQLException {
setObject(parameterIndex, value);
}
@@ -301,43 +294,18 @@
setBlob(parameterIndex, in);
}
- /**
- * <p>Sets the parameter in position parameterIndex to a Blob object.
- * @param parameterIndex of the parameter whose value is to be set
- * @param Blob object to which the parameter value is to be set.
- * @throws SQLException if parameter type/datatype do not match
- */
public void setBlob (int parameterIndex, Blob x) throws SQLException {
setObject(parameterIndex, x);
}
- /**
- * <p>Sets parameter number parameterIndex to b, a Java boolean value. The parameter
- * type is set to BIT
- * @param parameterIndex of the parameter whose value is to be set
- * @param boolean value to which the parameter value is to be set.
- * @throws SQLException, if parameter type/datatype do not match
- */
public void setBoolean (int parameterIndex, boolean value) throws SQLException {
setObject(parameterIndex, value);
}
- /**
- * <p>Sets parameter number parameterIndex to x, a Java byte value. The parameter
- * type is set to TINYINT
- * @param parameterIndex of the parameter whose value is to be set
- * @param byte value to which the parameter value is to be set.
- * @throws SQLException, if parameter type/datatype do not match
- */
public void setByte(int parameterIndex, byte value) throws SQLException {
setObject(parameterIndex, Byte.valueOf(value));
}
- /**
- * <p>Sets parameter number parameterIndex to x[], a Java array of bytes.
- * @param parameterIndex of the parameter whose value is to be set
- * @param bytes array to which the parameter value is to be set.
- */
public void setBytes(int parameterIndex, byte bytes[]) throws SQLException {
setObject(parameterIndex, new SerialBlob(bytes));
}
@@ -346,35 +314,14 @@
setCharacterStream(parameterIndex, reader);
}
- /**
- * <p>Sets the parameter in position parameterIndex to a Clob object.
- * @param parameterIndex of the parameter whose value is to be set
- * @param Clob object to which the parameter value is to be set.
- * @throws SQLException if parameter type/datatype do not match.
- */
public void setClob (int parameterIndex, Clob x) throws SQLException {
setObject(parameterIndex, x);
}
- /**
- * <p>Sets parameter number parameterIndex to x, a java.sql.Date object. The parameter
- * type is set to DATE
- * @param parameterIndex of the parameter whose value is to be set
- * @param Date object to which the parameter value is to be set.
- * @throws SQLException, if parameter type/datatype do not match
- */
public void setDate(int parameterIndex, java.sql.Date value) throws SQLException {
setDate(parameterIndex, value, null);
}
- /**
- * <p>Sets parameter number parameterIndex to x, a java.sql.Date object. The parameter
- * type is set to DATE
- * @param parameterIndex of the parameter whose value is to be set
- * @param Date object to which the parameter value is to be set.
- * @param Calendar object to constrct date(useful to get include timezone info)
- * @throws SQLException, if parameter type/datatype do not match
- */
public void setDate(int parameterIndex, java.sql.Date x ,java.util.Calendar cal) throws SQLException {
if (cal == null || x == null) {
@@ -386,79 +333,30 @@
setObject(parameterIndex, TimestampWithTimezone.createDate(x, cal.getTimeZone(), getDefaultCalendar()));
}
- /**
- * <p>Sets parameter number parameterIndex to x, a double value. The parameter
- * type is set to DOUBLE
- * @param parameterIndex of the parameter whose value is to be set
- * @param double value to which the parameter value is to be set.
- * @throws SQLException, if parameter type/datatype do not match
- */
public void setDouble(int parameterIndex, double value) throws SQLException {
setObject(parameterIndex, new Double(value));
}
- /**
- * <p>Sets parameter number parameterIndex to value, a float value. The parameter
- * type is set to FLOAT
- * @param parameterIndex of the parameter whose value is to be set
- * @param float value to which the parameter value is to be set.
- * @throws SQLException, if parameter type/datatype do not match
- */
public void setFloat(int parameterIndex, float value) throws SQLException {
setObject(parameterIndex, new Float(value));
}
- /**
- * <p>Sets parameter number parameterIndex to value, a int value. The parameter
- * type is set to INTEGER
- * @param parameterIndex of the parameter whose value is to be set
- * @param int value to which the parameter value is to be set.
- * @throws SQLException, if parameter type/datatype do not match
- */
public void setInt(int parameterIndex, int value) throws SQLException {
setObject(parameterIndex, Integer.valueOf(value));
}
- /**
- * <p>Sets parameter number parameterIndex to x, a long value. The parameter
- * type is set to BIGINT
- * @param parameterIndex of the parameter whose value is to be set
- * @param long value to which the parameter value is to be set.
- * @throws SQLException, if parameter type/datatype do not match
- */
public void setLong(int parameterIndex, long value) throws SQLException {
setObject(parameterIndex, Long.valueOf(value));
}
- /**
- * <p>Sets parameter number parameterIndex to a null value.
- * @param parameterIndex of the parameter whose value is to be set
- * @param jdbc type of the parameter whose value is to be set to null
- * @throws SQLException, if parameter type/datatype do not match
- */
public void setNull(int parameterIndex, int jdbcType) throws SQLException {
setObject(parameterIndex, null);
}
- /**
- * <p>Sets parameter number parameterIndex to a null value.
- * @param parameterIndex of the parameter whose value is to be set
- * @param jdbc type of the parameter whose value is to be set to null
- * @param fully qualifies typename of the parameter being set.
- * @throws SQLException, if parameter type/datatype do not match
- */
public void setNull(int parameterIndex, int jdbcType, String typeName) throws SQLException {
setObject(parameterIndex, null);
}
- /**
- * <p>Sets parameter number parameterIndex to an object value
- * @param parameterIndex of the parameter whose value is to be set
- * @param an object value to which the parameter value is to be set.
- * @param int value giving the JDBC type to conver the object to
- * @param int value giving the scale to be set if the type is DECIMAL or NUMERIC
- * @throws SQLException, if there is an error setting the parameter value
- */
public void setObject (int parameterIndex, Object value, int targetJdbcType, int scale) throws SQLException {
if(value == null) {
@@ -527,12 +425,6 @@
setObject(parameterIndex, targetObject);
}
- /**
- * <p>Sets parameter number parameterIndex to an object value
- * @param parameterIndex of the parameter whose value is to be set
- * @param an object value to which the parameter value is to be set.
- * @throws SQLException, if there is an error setting the parameter value
- */
public void setObject(int parameterIndex, Object value) throws SQLException {
ArgCheck.isPositive(parameterIndex, JDBCPlugin.Util.getString("MMPreparedStatement.Invalid_param_index")); //$NON-NLS-1$
@@ -546,47 +438,18 @@
parameterMap.put(parameterIndex, value);
}
- /**
- * <p>Sets parameter number parameterIndex to x, a short value. The parameter
- * type is set to TINYINT
- * @param parameterIndex of the parameter whose value is to be set
- * @param short value to which the parameter value is to be set.
- * @throws SQLException, if there is an error setting the parameter value
- */
public void setShort(int parameterIndex, short value) throws SQLException {
setObject(parameterIndex, value);
}
- /**
- * <p>Sets parameter number parameterIndex to x, a String value. The parameter
- * type is set to VARCHAR
- * @param parameterIndex of the parameter whose value is to be set
- * @param String object to which the parameter value is to be set.
- * @throws SQLException
- */
public void setString(int parameterIndex, String value) throws SQLException {
setObject(parameterIndex, value);
}
- /**
- * <p>Sets parameter number parameterIndex to x, a java.sql.Time object. The parameter
- * type is set to TIME
- * @param parameterIndex of the parameter whose value is to be set
- * @param Time object to which the parameter value is to be set.
- * @throws SQLException, if parameter type/datatype do not match
- */
public void setTime(int parameterIndex, java.sql.Time value) throws SQLException {
setTime(parameterIndex, value, null);
}
- /**
- * <p>Sets parameter number parameterIndex to x, a java.sql.Time object. The parameter
- * type is set to TIME
- * @param parameterIndex of the parameter whose value is to be set
- * @param Time object to which the parameter value is to be set.
- * @param Calendar object to constrct Time(useful to get include timezone info)
- * @throws SQLException, if parameter type/datatype do not match
- */
public void setTime(int parameterIndex, java.sql.Time x, java.util.Calendar cal) throws SQLException {
if (cal == null || x == null) {
@@ -598,25 +461,10 @@
setObject(parameterIndex, TimestampWithTimezone.createTime(x, cal.getTimeZone(), getDefaultCalendar()));
}
- /**
- * <p>Sets parameter number parameterIndex to x, a java.sql.Timestamp object. The
- * parameter type is set to TIMESTAMP
- * @param parameterIndex of the parameter whose value is to be set
- * @param Timestamp object to which the parameter value is to be set.
- * @throws SQLException, if parameter type/datatype do not match
- */
public void setTimestamp(int parameterIndex, java.sql.Timestamp value) throws SQLException {
setTimestamp(parameterIndex, value, null);
}
- /**
- * <p>Sets parameter number parameterIndex to x, a java.sql.Timestamp object. The
- * parameter type is set to TIMESTAMP
- * @param parameterIndex of the parameter whose value is to be set
- * @param Timestamp object to which the parameter value is to be set.
- * @param Calendar object to constrct timestamp(useful to get include timezone info)
- * @throws SQLException, if parameter type/datatype do not match
- */
public void setTimestamp(int parameterIndex, java.sql.Timestamp x, java.util.Calendar cal) throws SQLException {
if (cal == null || x == null) {
@@ -628,13 +476,6 @@
setObject(parameterIndex, TimestampWithTimezone.createTimestamp(x, cal.getTimeZone(), getDefaultCalendar()));
}
- /**
- * Sets the designated parameter to the given java.net.URL value. The driver
- * converts this to an SQL DATALINK value when it sends it to the database.
- * @param parameter int index
- * @param x URL to be set
- * @throws SQLException
- */
public void setURL(int parameterIndex, URL x) throws SQLException {
setObject(parameterIndex, x);
}
Modified: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2011-11-08 17:48:30 UTC (rev 3619)
+++ trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2011-11-08 19:02:22 UTC (rev 3620)
@@ -655,55 +655,22 @@
return reqMessage;
}
- /**
- * Retreives the fetch direction this Statement object set as a performance hint
- * to the driver. The int returned will be one of the following constants from
- * the ResultSet interface: FETCH_FORWARD, FETCH_REVERSE, or FETCH_UNKNOWN.
- * @return int value indicating the direction in which results need to be fetched
- * @throws SQLException should never occur.
- */
public int getFetchDirection() throws SQLException {
return this.fetchDirection;
}
- /**
- * Retreives the fetch size this Statement object set as a performance hint
- * to the driver. This is the number of rows the server fetches at a time when
- * the result set needs more rows.
- * @return int value indicating the number of rows the server fetches
- * @throws SQLException should never occur.
- */
public int getFetchSize() throws SQLException {
return fetchSize;
}
- /**
- * Retreives the maximum number of bytes that a result set column may contain.
- * @return int value giving the maximum size of a field
- * @throws SQLException should never occur.
- */
public int getMaxFieldSize() throws SQLException {
return maxFieldSize;
}
- /**
- * Retrives the maximum number of rows that a ResultSet object may contain.
- * If the limit is exceeded the excess rows are dropped.
- * @return Max limit on rows on ResultSet.
- * @throws SQLException should never iccure.
- */
public int getMaxRows() throws SQLException {
return maxRows;
}
- /**
- * Moves to this Statement object's next result, returns true if
- * it is a ResultSet object, and implicitly closes any current
- * ResultSet object(s) obtained with the method #getResultSet.
- * @return true if the next result is a ResultSet object;
- * false if it is an update count or there are no more results
- * @throws SQLException if there is an error in database.
- */
public boolean getMoreResults() throws SQLException {
//Check to see the statement is closed and throw an exception
checkStatement();
@@ -719,17 +686,6 @@
return false;
}
- /**
- * Moves to this Statement object's next result, deals with any current
- * ResultSet object(s) according to the instructions specified by the
- * given flag, and returns true if the next result is a ResultSet object.
- * @param current flag that gives instruction on what should happen
- * to current ResultSet objects obtained using the method getResultSet(
- * CLOSE_CURRENT_RESULT, KEEP_CURRENT_RESULT, or CLOSE_ALL_RESULTS).
- * @return true if the next result is a ResultSet object; false if it
- * is an update count or there are no more results
- * @throws SQLException if there is an error in database.
- */
public boolean getMoreResults(int current) throws SQLException {
checkStatement();
@@ -748,26 +704,12 @@
return false;
}
-
- /**
- * Return the number of seconds the driver will wait for a statement object
- * to execute
- * @return int value giving the query timeout in seconds
- * @throws SQLException should never occur
- */
public int getQueryTimeout() throws SQLException {
//Check to see the statement is closed and throw an exception
checkStatement();
return (int)this.queryTimeoutMS/1000;
}
- /**
- * Returns a ResultSet object that was produced by a call to the method execute.
- * We currently do not support execute method which could return multiple result
- * sets.
- * @return ResultSet object giving the next available ResultSet
- * @throws SQLException should never occur
- */
public ResultSetImpl getResultSet() throws SQLException {
//Check to see the statement is closed and throw an exception
checkStatement();
@@ -777,32 +719,14 @@
return resultSet;
}
- /**
- * Retrieves the concurrency mode for the ResultSet objects generated from
- * queries that this Statement object executes. All ResultSets are currently
- * read only.
- * @return intvalue giving the ResultSet concurrency
- * @throws SQLException should never occur
- */
public int getResultSetConcurrency() throws SQLException {
return this.resultSetConcurrency;
}
- /**
- * Retrieves the type of the ResultSet objects generated from queries that this
- * statement executes.
- * @return int value indicating the type of the ResultSet
- * @throws SQLException should never occur
- */
public int getResultSetType() {
return this.resultSetType;
}
- /**
- * This method returns the number of rows affected by a statement modifying a table.
- * @return Number of rows affected.
- * @throws SQLException should never occur
- */
public int getUpdateCount() throws SQLException {
checkStatement();
if (this.updateCounts == null) {
@@ -821,11 +745,6 @@
this.serverWarnings.addAll(serverWarnings);
}
- /**
- * This method returns warnings returned by server.
- * @return null value as there are no warnings
- * @throws SQLException should never occur
- */
public SQLWarning getWarnings() throws SQLException {
//Check to see the statement is closed and throw an exception
checkStatement();
@@ -836,13 +755,6 @@
return null;
}
- /**
- * This method enbles/disables escape processing. When escape processing is
- * enabled the driver will scan any escape syntax and do escape substitution
- * before sending the escaped sql statement to the server
- * @param enable boolean value indicating if the escape processing should be turned on
- * @throws SQLException should never occur
- */
public void setEscapeProcessing(boolean enable) throws SQLException {
//Check to see the statement is closed and throw an exception
checkStatement();
@@ -868,24 +780,12 @@
}
}
- /**
- * Sets the limit on the maximum number of rows in a ResultSet object. This
- * method is currently implemented to throw an exception as it is not possible
- * to limit the number of rows.
- * @param maxRows int value indicating maximum rows that can be returned in a ResultSet
- */
public void setMaxRows(int maxRows) throws SQLException {
//Check to see the statement is closed and throw an exception
checkStatement();
this.maxRows = maxRows;
}
- /**
- * This sets to seconds the time limit for the number of seconds for a driver
- * to wait for a statement object to be executed.
- * @param seconds Maximum number of seconds for a statement object to execute.
- * throws SQLException, should never occur
- */
public void setQueryTimeout(int seconds) throws SQLException {
//Check to see the statement is closed and throw an exception
checkStatement();
@@ -985,20 +885,6 @@
}
}
- /**
- * Set the per-statement security payload. This optional payload will
- * accompany each request to the data source(s) so that the connector
- * will have access to it.
- * <br>Once the payload is set, it will be used for each statment
- * execution until it is set to <code>null</code>, a new payload is set on
- * the statement or the statement is closed.</br>
- *
- * <p>To remove an existing payload from a statement, call this method
- * with a <code>null</code> argument.</p>
- * @param payload The payload that is to accompany requests executed
- * from this statement.
- * @since 4.2
- */
public void setPayload(Serializable payload) {
this.payload = payload;
}
@@ -1015,15 +901,6 @@
return this.currentRequestID;
}
- /**
- * Get Query plan description.
- * If the Statement has a resultSet, we get the plan description from the result set
- * If that plan description is null, though, we return the very first plan description
- * that was created from the resultsMessage in the method: setAnalysisInfo.
- * The plan description from the result set can be null if the resultsMsg stored in the
- * result set hasn't been created when getPlanDescription is called.
- * @return Query plan description, if it exists, otherwise null
- */
public PlanNode getPlanDescription() {
if(this.resultSet != null) {
return this.resultSet.getUpdatedPlanDescription();
@@ -1034,18 +911,10 @@
return null;
}
- /**
- * Get query planner debug log.
- * @return Query planner debug log, or null if it doesn't exist
- */
public String getDebugLog() {
return this.debugLog;
}
- /**
- * Get annotations
- * @return Query planner annotations - Collection of Annotation
- */
public Collection<Annotation> getAnnotations() {
return this.annotations;
}
@@ -1057,10 +926,6 @@
return null;
}
- /**
- * Check is the statement is closed. Used primarily by the unit tests.
- * @return true if the statement is closed; false otherwise.
- */
public boolean isClosed() {
return this.isClosed;
}
12 years, 6 months
- 1
- 0
teiid SVN: r3619 - trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-11-08 12:48:30 -0500 (Tue, 08 Nov 2011)
New Revision: 3619
Modified:
trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java
Log:
TEIID-1673 giving each vdb its own cluster name
Modified: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java
===================================================================
--- trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java 2011-11-08 13:42:58 UTC (rev 3618)
+++ trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java 2011-11-08 17:48:30 UTC (rev 3619)
@@ -297,6 +297,9 @@
}
public void stop(Object object) {
+ if (!Proxy.isProxyClass(object.getClass())) {
+ return;
+ }
ReplicatedInvocationHandler<?> handler = (ReplicatedInvocationHandler<?>) Proxy.getInvocationHandler(object);
Channel c = handler.disp.getChannel();
handler.disp.stop();
@@ -423,24 +426,30 @@
});
T replicatedProxy = (T) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class[] {iface}, proxy);
-
- channel.connect(clusterName);
- if (object instanceof ReplicatedObject) {
- ((ReplicatedObject)object).setLocalAddress(channel.getLocalAddress());
- boolean getState = channel.getState(null, startTimeout);
- if (getState) {
- boolean loaded = proxy.state_promise.getResult(startTimeout);
- if (loaded) {
- LogManager.logDetail(LogConstants.CTX_RUNTIME, object, "loaded"); //$NON-NLS-1$
+ boolean success = false;
+ try {
+ channel.connect(mux_id);
+ if (object instanceof ReplicatedObject) {
+ ((ReplicatedObject)object).setLocalAddress(channel.getLocalAddress());
+ boolean getState = channel.getState(null, startTimeout);
+ if (getState) {
+ boolean loaded = proxy.state_promise.getResult(startTimeout);
+ if (loaded) {
+ LogManager.logDetail(LogConstants.CTX_RUNTIME, object, "loaded"); //$NON-NLS-1$
+ } else {
+ LogManager.logWarning(LogConstants.CTX_RUNTIME, object + " load timeout"); //$NON-NLS-1$
+ }
} else {
- LogManager.logWarning(LogConstants.CTX_RUNTIME, object + " load timeout"); //$NON-NLS-1$
+ LogManager.logInfo(LogConstants.CTX_RUNTIME, object + " first member or timeout exceeded"); //$NON-NLS-1$
}
- } else {
- LogManager.logInfo(LogConstants.CTX_RUNTIME, object + " first member or timeout exceeded"); //$NON-NLS-1$
}
+ success = true;
+ return replicatedProxy;
+ } finally {
+ if (!success) {
+ channel.close();
+ }
}
-
- return replicatedProxy;
}
}
12 years, 6 months
- 1
- 0
teiid SVN: r3618 - trunk/metadata/src/main/java/org/teiid/metadata/index.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-11-08 08:42:58 -0500 (Tue, 08 Nov 2011)
New Revision: 3618
Modified:
trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java
trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java
Log:
TEIID-1803 optimization of index metadata loading
Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java 2011-11-07 16:04:44 UTC (rev 3617)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java 2011-11-08 13:42:58 UTC (rev 3618)
@@ -78,8 +78,7 @@
char c = record[0];
switch (c) {
case MetadataConstants.RECORD_TYPE.ANNOTATION: {
- final String str = new String(record);
- final List<String> tokens = RecordFactory.getStrings(str, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
+ final List<String> tokens = RecordFactory.getStrings(record, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
// Extract the index version information from the record
int indexVersion = recordFactory.getIndexVersion(record);
@@ -98,8 +97,7 @@
return null;
}
case MetadataConstants.RECORD_TYPE.PROPERTY: {
- final String str = new String(record);
- final List<String> tokens = RecordFactory.getStrings(str, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
+ final List<String> tokens = RecordFactory.getStrings(record, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
String uuid = tokens.get(1);
LinkedHashMap<String, String> result = extensionCache.get(uuid);
Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java 2011-11-07 16:04:44 UTC (rev 3617)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java 2011-11-08 13:42:58 UTC (rev 3618)
@@ -24,13 +24,11 @@
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import org.teiid.core.id.UUID;
import org.teiid.core.index.IEntryResult;
import org.teiid.core.util.Assertion;
-import org.teiid.core.util.StringUtil;
import org.teiid.internal.core.index.EntryResult;
import org.teiid.internal.core.index.IIndexConstants;
import org.teiid.metadata.AbstractMetadataRecord;
@@ -302,8 +300,7 @@
* Create a ModelRecord instance from the specified index record
*/
public Schema createModelRecord(final char[] record) {
- final String str = new String(record);
- final List<String> tokens = getStrings(str, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
+ final List<String> tokens = getStrings(record, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
final Schema model = new Schema();
// The tokens are the standard header values
@@ -335,8 +332,7 @@
* Create a TransformationRecord instance from the specified index record
*/
public TransformationRecordImpl createTransformationRecord(final char[] record) {
- final String str = new String(record);
- final List<String> tokens = getStrings(str, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
+ final List<String> tokens = getStrings(record, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
final TransformationRecordImpl transform = new TransformationRecordImpl();
// Extract the index version information from the record
@@ -388,8 +384,7 @@
* Create a TableRecord instance from the specified index record
*/
public Table createTableRecord(final char[] record) {
- final String str = new String(record);
- final List<String> tokens = getStrings(str, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
+ final List<String> tokens = getStrings(record, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
final Table table = new Table();
// Extract the index version information from the record
@@ -460,8 +455,7 @@
* Create a ColumnRecord instance from the specified index record
*/
public Column createColumnRecord(final char[] record) {
- final String str = new String(record);
- final List<String> tokens = getStrings(str, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
+ final List<String> tokens = getStrings(record, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
final Column column = new Column();
// Extract the index version information from the record
@@ -547,8 +541,7 @@
* Create a ColumnSetRecord instance from the specified index record
*/
public ColumnSet createColumnSetRecord(final char[] record, ColumnSet columnSet) {
- final String str = new String(record);
- final List<String> tokens = getStrings(str, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
+ final List<String> tokens = getStrings(record, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
// Extract the index version information from the record
int indexVersion = getIndexVersion(record);
@@ -577,8 +570,7 @@
* Create a ForeignKeyRecord instance from the specified index record
*/
public ForeignKey createForeignKeyRecord(final char[] record) {
- final String str = new String(record);
- final List<String> tokens = getStrings(str, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
+ final List<String> tokens = getStrings(record, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
final ForeignKey fkRecord = new ForeignKey();
// Extract the index version information from the record
@@ -607,8 +599,7 @@
* Create a DatatypeRecord instance from the specified index record
*/
public Datatype createDatatypeRecord(final char[] record) {
- final String str = new String(record);
- final List<String> tokens = getStrings(str, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
+ final List<String> tokens = getStrings(record, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
final Datatype dt = new Datatype();
// Extract the index version information from the record
@@ -690,9 +681,7 @@
* Create a ProcedureRecord instance from the specified index record
*/
public Procedure createProcedureRecord(final char[] record) {
-
- final String str = new String(record);
- final List<String> tokens = getStrings(str, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
+ final List<String> tokens = getStrings(record, IndexConstants.RECORD_STRING.RECORD_DELIMITER);
final Procedure procRd = new Procedure();
// Extract the index version information from the record
@@ -851,26 +840,35 @@
}
return false;
}
+
+ public static List<String> getStrings(final String record, final char listDelimiter) {
+ return getStrings(record.toCharArray(), listDelimiter);
+ }
- public static List<String> getStrings(final String values, final char listDelimiter) {
- if (StringUtil.isEmpty(values)) {
+ public static List<String> getStrings(final char[] record, final char listDelimiter) {
+ if (record == null || record.length == 0) {
return Collections.emptyList();
}
- if (values.length() == 1 && values.charAt(0) == IndexConstants.RECORD_STRING.SPACE) {
+ if (record.length == 1 && record[0] == IndexConstants.RECORD_STRING.SPACE) {
return Collections.emptyList();
}
- final List<String> tokens = StringUtil.split(values,String.valueOf(listDelimiter));
- final List<String> result = new ArrayList<String>(tokens.size());
- for (Iterator<String> iter = tokens.iterator(); iter.hasNext();) {
- String token = iter.next();
- if (token != null) {
- result.add(new String(token));
- }
+ List<String> result = new ArrayList<String>();
+ int start = 0;
+ for (int i = 0; i < record.length; i++) {
+ if (record[i] == listDelimiter) {
+ if (i != start) {
+ result.add(new String(record, start, i - start));
+ }
+ start = i+1;
+ }
}
+ if (start < record.length) {
+ result.add(new String(record, start, record.length - start));
+ }
return result;
}
-
- public char getListDelimiter(final int indexVersionNumber) {
+
+ public char getListDelimiter(final int indexVersionNumber) {
if (indexVersionNumber < DELIMITER_INDEX_VERSION) {
return IndexConstants.RECORD_STRING.LIST_DELIMITER_OLD;
}
12 years, 6 months
- 1
- 0
teiid SVN: r3617 - in branches/as7: build/kits/jboss-as7/bin and 8 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2011-11-07 11:04:44 -0500 (Mon, 07 Nov 2011)
New Revision: 3617
Added:
branches/as7/build/kits/jboss-as7/bin/
branches/as7/build/kits/jboss-as7/bin/scripts/
branches/as7/build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli
branches/as7/build/kits/jboss-as7/docs/teiid/examples/
branches/as7/build/kits/jboss-as7/docs/teiid/licenses/
branches/as7/build/kits/jboss-as7/docs/teiid/licenses/LICENSE-lgpl-2.1.txt
branches/as7/build/kits/jboss-as7/docs/teiid/licenses/MPL-1.0.html
branches/as7/build/kits/jboss-as7/docs/teiid/licenses/MPL-1.1.html
branches/as7/build/kits/jboss-as7/docs/teiid/licenses/PostgreSQL-BSD.txt
branches/as7/build/kits/jboss-as7/docs/teiid/licenses/apache-2.0 - LICENSE-2.0.txt
Modified:
branches/as7/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml
branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/adminshell.xml
branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/clustering.xml
branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml
branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/logging.xml
branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/performance.xml
branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/security.xml
branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/vdb-deployment.xml
branches/as7/engine/src/main/resources/org/teiid/query/i18n.properties
branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java
branches/as7/runtime/src/main/resources/org/teiid/runtime/i18n.properties
Log:
TEIID-1720: Admin Guide documentation changes
Added: branches/as7/build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli
===================================================================
Added: branches/as7/build/kits/jboss-as7/docs/teiid/licenses/LICENSE-lgpl-2.1.txt
===================================================================
--- branches/as7/build/kits/jboss-as7/docs/teiid/licenses/LICENSE-lgpl-2.1.txt (rev 0)
+++ branches/as7/build/kits/jboss-as7/docs/teiid/licenses/LICENSE-lgpl-2.1.txt 2011-11-07 16:04:44 UTC (rev 3617)
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
Property changes on: branches/as7/build/kits/jboss-as7/docs/teiid/licenses/LICENSE-lgpl-2.1.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/as7/build/kits/jboss-as7/docs/teiid/licenses/MPL-1.0.html
===================================================================
--- branches/as7/build/kits/jboss-as7/docs/teiid/licenses/MPL-1.0.html (rev 0)
+++ branches/as7/build/kits/jboss-as7/docs/teiid/licenses/MPL-1.0.html 2011-11-07 16:04:44 UTC (rev 3617)
@@ -0,0 +1,421 @@
+<html><head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Mozilla Public License version 1.0</title>
+</head><body link="#0000ee" text="#000000" vlink="#551a8b" alink="#ff0000" bgcolor="#ffffff">
+
+<p align="CENTER">
+ <font size="+2"><b>MOZILLA PUBLIC LICENSE</b></font><br>
+ <b>Version 1.0</b>
+</p>
+
+<p></p><hr width="20%"><p>
+
+</p><p><b>1. Definitions.</b>
+</p><ul>
+
+ <b>1.1. ``Contributor''</b> means each entity that creates or contributes
+ to the creation of Modifications.
+
+ <p><b>1.2. ``Contributor Version''</b> means the combination of the
+ Original Code, prior Modifications used by a Contributor, and the
+ Modifications made by that particular Contributor.
+
+ </p><p><b>1.3. ``Covered Code''</b> means the Original Code or Modifications
+ or the combination of the Original Code and Modifications, in each case
+ including portions thereof<b>.</b>
+
+ </p><p><b>1.4. ``Electronic Distribution Mechanism''</b> means a mechanism
+ generally accepted in the software development community for the
+ electronic transfer of data.
+
+ </p><p><b>1.5. ``Executable''</b> means Covered Code in any form other than
+ Source Code.
+
+ </p><p><b>1.6. ``Initial Developer''</b> means the individual or entity
+ identified as the Initial Developer in the Source Code notice required by
+ <b>Exhibit A</b>.
+
+ </p><p><b>1.7. ``Larger Work''</b> means a work which combines Covered Code
+ or portions thereof with code not governed by the terms of this License.
+
+ </p><p><b>1.8. ``License''</b> means this document.
+
+ </p><p><b>1.9. ``Modifications''</b> means any addition to or deletion from
+ the substance or structure of either the Original Code or any previous
+ Modifications. When Covered Code is released as a series of files, a
+ Modification is:
+
+ </p><ul>
+
+ <p><b>A.</b> Any addition to or deletion from the contents of a file
+ containing Original Code or previous Modifications.
+
+ </p><p><b>B.</b> Any new file that contains any part of the Original
+ Code or previous Modifications.
+
+ </p></ul>
+
+ <p><b>1.10. ``Original Code''</b> means Source Code of computer software
+ code which is described in the Source Code notice required by <b>Exhibit
+ A</b> as Original Code, and which, at the time of its release under this
+ License is not already Covered Code governed by this License.
+
+ </p><p><b>1.11. ``Source Code''</b> means the preferred form of the Covered
+ Code for making modifications to it, including all modules it contains,
+ plus any associated interface definition files, scripts used to control
+ compilation and installation of an Executable, or a list of source code
+ differential comparisons against either the Original Code or another well
+ known, available Covered Code of the Contributor's choice. The Source
+ Code can be in a compressed or archival form, provided the appropriate
+ decompression or de-archiving software is widely available for no charge.
+
+ </p><p><b>1.12. ``You''</b> means an individual or a legal entity exercising
+ rights under, and complying with all of the terms of, this License or a
+ future version of this License issued under Section 6.1. For legal
+ entities, ``You'' includes any entity which controls, is controlled by,
+ or is under common control with You. For purposes of this definition,
+ ``control'' means (a) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or otherwise,
+ or (b) ownership of fifty percent (50%) or more of the outstanding shares
+ or beneficial ownership of such entity.
+
+</p></ul>
+<b>2. Source Code License.</b>
+<ul>
+
+ <b>2.1. The Initial Developer Grant.</b>
+
+ <br>The Initial Developer hereby grants You a world-wide, royalty-free,
+ non-exclusive license, subject to third party intellectual property
+ claims:
+
+ <ul>
+
+ <p><b>(a)</b> to use, reproduce, modify, display, perform, sublicense
+ and distribute the Original Code (or portions thereof) with or
+ without Modifications, or as part of a Larger Work; and
+
+ </p><p><b>(b)</b> under patents now or hereafter owned or controlled by
+ Initial Developer, to make, have made, use and sell (``Utilize'') the
+ Original Code (or portions thereof), but solely to the extent that
+ any such patent is reasonably necessary to enable You to Utilize the
+ Original Code (or portions thereof) and not to any greater extent
+ that may be necessary to Utilize further Modifications or
+ combinations.
+ </p></ul>
+
+ <p><b>2.2. Contributor Grant.</b>
+
+ <br>Each Contributor hereby grants You a world-wide, royalty-free,
+ non-exclusive license, subject to third party intellectual property
+ claims:
+
+ </p><ul>
+
+ <p><b>(a)</b> to use, reproduce, modify, display, perform, sublicense and
+ distribute the Modifications created by such Contributor (or portions
+ thereof) either on an unmodified basis, with other Modifications, as
+ Covered Code or as part of a Larger Work; and
+
+ </p><p><b>(b)</b> under patents now or hereafter owned or controlled by
+ Contributor, to Utilize the Contributor Version (or portions thereof),
+ but solely to the extent that any such patent is reasonably necessary to
+ enable You to Utilize the Contributor Version (or portions thereof), and
+ not to any greater extent that may be necessary to Utilize further
+ Modifications or combinations.
+
+ </p></ul>
+
+</ul>
+<b>3. Distribution Obligations.</b>
+<ul>
+
+ <b>3.1. Application of License.</b>
+
+ <br>The Modifications which You create or to which You contribute are
+ governed by the terms of this License, including without limitation
+ Section <b>2.2</b>. The Source Code version of Covered Code may be
+ distributed only under the terms of this License or a future version of
+ this License released under Section <b>6.1</b>, and You must include a
+ copy of this License with every copy of the Source Code You
+ distribute. You may not offer or impose any terms on any Source Code
+ version that alters or restricts the applicable version of this License
+ or the recipients' rights hereunder. However, You may include an
+ additional document offering the additional rights described in Section
+ <b>3.5</b>.
+
+ <p><b>3.2. Availability of Source Code.</b>
+
+ <br>Any Modification which You create or to which You contribute must be
+ made available in Source Code form under the terms of this License either
+ on the same media as an Executable version or via an accepted Electronic
+ Distribution Mechanism to anyone to whom you made an Executable version
+ available; and if made available via Electronic Distribution Mechanism,
+ must remain available for at least twelve (12) months after the date it
+ initially became available, or at least six (6) months after a subsequent
+ version of that particular Modification has been made available to such
+ recipients. You are responsible for ensuring that the Source Code version
+ remains available even if the Electronic Distribution Mechanism is
+ maintained by a third party.
+
+ </p><p><b>3.3. Description of Modifications.</b>
+
+ <br>You must cause all Covered Code to which you contribute to contain a
+ file documenting the changes You made to create that Covered Code and the
+ date of any change. You must include a prominent statement that the
+ Modification is derived, directly or indirectly, from Original Code
+ provided by the Initial Developer and including the name of the Initial
+ Developer in (a) the Source Code, and (b) in any notice in an Executable
+ version or related documentation in which You describe the origin or
+ ownership of the Covered Code.
+
+ </p><p><b>3.4. Intellectual Property Matters</b>
+ </p><ul>
+
+ <p><b>(a) Third Party Claims</b>.
+
+ <br>If You have knowledge that a party claims an intellectual
+ property right in particular functionality or code (or its
+ utilization under this License), you must include a text file with
+ the source code distribution titled ``LEGAL'' which describes the
+ claim and the party making the claim in sufficient detail that a
+ recipient will know whom to contact. If you obtain such knowledge
+ after You make Your Modification available as described in Section
+ <b>3.2</b>, You shall promptly modify the LEGAL file in all copies
+ You make available thereafter and shall take other steps (such as
+ notifying appropriate mailing lists or newsgroups) reasonably
+ calculated to inform those who received the Covered Code that new
+ knowledge has been obtained.
+
+ </p><p><b>(b) Contributor APIs</b>.
+
+ <br>If Your Modification is an application programming interface and
+ You own or control patents which are reasonably necessary to
+ implement that API, you must also include this information in the
+ LEGAL file.
+
+ </p></ul>
+
+ <p><b>3.5. Required Notices.</b>
+
+ <br>You must duplicate the notice in <b>Exhibit A</b> in each file of the
+ Source Code, and this License in any documentation for the Source Code,
+ where You describe recipients' rights relating to Covered Code. If You
+ created one or more Modification(s), You may add your name as a
+ Contributor to the notice described in <b>Exhibit A</b>. If it is not
+ possible to put such notice in a particular Source Code file due to its
+ structure, then you must include such notice in a location (such as a
+ relevant directory file) where a user would be likely to look for such a
+ notice. You may choose to offer, and to charge a fee for, warranty,
+ support, indemnity or liability obligations to one or more recipients of
+ Covered Code. However, You may do so only on Your own behalf, and not on
+ behalf of the Initial Developer or any Contributor. You must make it
+ absolutely clear than any such warranty, support, indemnity or liability
+ obligation is offered by You alone, and You hereby agree to indemnify the
+ Initial Developer and every Contributor for any liability incurred by the
+ Initial Developer or such Contributor as a result of warranty, support,
+ indemnity or liability terms You offer.
+
+ </p><p><b>3.6. Distribution of Executable Versions.</b>
+
+ <br>You may distribute Covered Code in Executable form only if the
+ requirements of Section <b>3.1-3.5</b> have been met for that Covered
+ Code, and if You include a notice stating that the Source Code version of
+ the Covered Code is available under the terms of this License, including
+ a description of how and where You have fulfilled the obligations of
+ Section <b>3.2</b>. The notice must be conspicuously included in any
+ notice in an Executable version, related documentation or collateral in
+ which You describe recipients' rights relating to the Covered Code. You
+ may distribute the Executable version of Covered Code under a license of
+ Your choice, which may contain terms different from this License,
+ provided that You are in compliance with the terms of this License and
+ that the license for the Executable version does not attempt to limit or
+ alter the recipient's rights in the Source Code version from the rights
+ set forth in this License. If You distribute the Executable version under
+ a different license You must make it absolutely clear that any terms
+ which differ from this License are offered by You alone, not by the
+ Initial Developer or any Contributor. You hereby agree to indemnify the
+ Initial Developer and every Contributor for any liability incurred by the
+ Initial Developer or such Contributor as a result of any such terms You
+ offer.
+
+ </p><p><b>3.7. Larger Works.</b>
+
+ <br>You may create a Larger Work by combining Covered Code with other
+ code not governed by the terms of this License and distribute the Larger
+ Work as a single product. In such a case, You must make sure the
+ requirements of this License are fulfilled for the Covered Code.
+
+</p></ul>
+<b>4. Inability to Comply Due to Statute or Regulation.</b>
+<ul>
+
+ <p>If it is impossible for You to comply with any of the terms of this
+ License with respect to some or all of the Covered Code due to statute or
+ regulation then You must: (a) comply with the terms of this License to
+ the maximum extent possible; and (b) describe the limitations and the
+ code they affect. Such description must be included in the LEGAL file
+ described in Section <b>3.4</b> and must be included with all
+ distributions of the Source Code. Except to the extent prohibited by
+ statute or regulation, such description must be sufficiently detailed for
+ a recipient of ordinary skill
+ to be able to understand it.
+
+</p></ul>
+<b>5. Application of this License.</b>
+<ul>
+
+ This License applies to code to which the Initial Developer has attached
+ the notice in <b>Exhibit A</b>, and to related Covered Code.
+
+</ul>
+<b>6. Versions of the License.</b>
+<ul>
+
+ <b>6.1. New Versions</b>.
+
+ <br>Netscape Communications Corporation (``Netscape'') may publish
+ revised and/or new versions of the License from time to time. Each
+ version will be given a distinguishing version number.
+
+ <p><b>6.2. Effect of New Versions</b>.
+
+ <br>Once Covered Code has been published under a particular version of
+ the License, You may always continue to use it under the terms of that
+ version. You may also choose to use such Covered Code under the terms of
+ any subsequent version of the License published by Netscape. No one other
+ than Netscape has the right to modify the terms applicable to Covered
+ Code created under this License.
+
+ </p><p><b>6.3. Derivative Works</b>.
+
+ <br>If you create or use a modified version of this License (which you
+ may only do in order to apply it to code which is not already Covered
+ Code governed by this License), you must (a) rename Your license so that
+ the phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL''
+ or any confusingly similar phrase do not appear anywhere in your license
+ and (b) otherwise make it clear that your version of the license contains
+ terms which differ from the Mozilla Public License and Netscape Public
+ License. (Filling in the name of the Initial Developer, Original Code or
+ Contributor in the notice described in <b>Exhibit A</b> shall not of
+ themselves be deemed to be modifications of this License.)
+
+</p></ul>
+<b>7. DISCLAIMER OF WARRANTY.</b>
+<ul>
+
+ COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS,
+ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS,
+ MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE
+ RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH
+ YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+ INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
+ NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
+ CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE
+ IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+</ul>
+<b>8. TERMINATION.</b>
+<ul>
+
+ This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to cure
+ such breach within 30 days of becoming aware of the breach. All
+ sublicenses to the Covered Code which are properly granted shall survive
+ any termination of this License. Provisions which, by their nature, must
+ remain in effect beyond the termination of this License shall survive.
+
+</ul>
+<b>9. LIMITATION OF LIABILITY.</b>
+<ul>
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+ NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY
+ OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF
+ ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER
+ INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
+ STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+ COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED
+ OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL
+ NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH
+ PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH
+ LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION
+ OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION
+ MAY NOT APPLY TO YOU.
+
+</ul>
+<b>10. U.S. GOVERNMENT END USERS.</b>
+<ul>
+
+ The Covered Code is a ``commercial item,'' as that term is defined in 48
+ C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer software''
+ and ``commercial computer software documentation,'' as such terms are
+ used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212
+ and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all
+ U.S. Government End Users acquire Covered Code with only those rights set
+ forth herein.
+
+</ul>
+<b>11. MISCELLANEOUS.</b>
+<ul>
+
+ This License represents the complete agreement concerning subject matter
+ hereof. If any provision of this License is held to be unenforceable,
+ such provision shall be reformed only to the extent necessary to make it
+ enforceable. This License shall be governed by California law provisions
+ (except to the extent applicable law, if any, provides otherwise),
+ excluding its conflict-of-law provisions. With respect to disputes in
+ which at least one party is a citizen of, or an entity chartered or
+ registered to do business in, the United States of America: (a) unless
+ otherwise agreed in writing, all disputes relating to this License
+ (excepting any dispute relating to intellectual property rights) shall be
+ subject to final and binding arbitration, with the losing party paying
+ all costs of arbitration; (b) any arbitration relating to this Agreement
+ shall be held in Santa Clara County, California, under the auspices of
+ JAMS/EndDispute; and (c) any litigation relating to this Agreement shall
+ be subject to the jurisdiction of the Federal Courts of the Northern
+ District of California, with venue lying in Santa Clara County,
+ California, with the losing party responsible for costs, including
+ without limitation, court costs and reasonable attorneys fees and
+ expenses. The application of the United Nations Convention on Contracts
+ for the International Sale of Goods is expressly excluded. Any law or
+ regulation which provides that the language of a contract shall be
+ construed against the drafter shall not apply to this License.
+
+</ul>
+<b>12. RESPONSIBILITY FOR CLAIMS.</b>
+<ul>
+
+ Except in cases where another Contributor has failed to comply with
+ Section <b>3.4</b>, You are responsible for damages arising, directly or
+ indirectly, out of Your utilization of rights under this License, based
+ on the number of copies of Covered Code you made available, the revenues
+ you received from utilizing such rights, and other relevant factors. You
+ agree to work with affected parties to distribute responsibility on an
+ equitable basis.
+
+</ul>
+<b>EXHIBIT A.</b>
+<ul>
+
+ ``The contents of this file are subject to the Mozilla Public License
+ Version 1.0 (the "License"); you may not use this file except in
+ compliance with the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+
+ <p>Software distributed under the License is distributed on an "AS IS"
+ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ License for the specific language governing rights and limitations under
+ the License.
+
+ </p><p>The Original Code is ______________________________________.
+
+ </p><p>The Initial Developer of the Original Code is
+ ________________________. Portions created by ______________________ are
+ Copyright (C) ______ _______________________. All Rights Reserved.
+
+ </p><p>Contributor(s): ______________________________________.''
+
+</p></ul>
+</body></html>
\ No newline at end of file
Property changes on: branches/as7/build/kits/jboss-as7/docs/teiid/licenses/MPL-1.0.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/as7/build/kits/jboss-as7/docs/teiid/licenses/MPL-1.1.html
===================================================================
--- branches/as7/build/kits/jboss-as7/docs/teiid/licenses/MPL-1.1.html (rev 0)
+++ branches/as7/build/kits/jboss-as7/docs/teiid/licenses/MPL-1.1.html 2011-11-07 16:04:44 UTC (rev 3617)
@@ -0,0 +1,389 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en"><head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+
+
+ <title>Mozilla Public License version 1.1</title>
+ <style type="text/css">
+ .very-strong{
+ text-transform:uppercase;
+ }
+ dt{
+ font-weight:bold;
+ }
+ dd p{
+ margin:0;
+ }
+ </style>
+</head><body>
+ <p><small>(<a href="http://www.mozilla.org/MPL/MPL-1.1.txt">Plain text version</a>)</small></p>
+ <h1>Mozilla Public License Version 1.1</h1>
+ <h2 id="section-1">1. Definitions.</h2>
+ <dl>
+ <dt id="section-1.0.1">1.0.1. "Commercial Use"
+ </dt><dd>means distribution or otherwise making the Covered Code available to a third party.
+ </dd><dt id="section-1.1">1.1. "Contributor"
+ </dt><dd>means each entity that creates or contributes to the creation of Modifications.
+ </dd><dt id="section-1.2">1.2. "Contributor Version"
+ </dt><dd>means the combination of the Original Code, prior Modifications used by a Contributor,
+ and the Modifications made by that particular Contributor.
+ </dd><dt id="section-1.3">1.3. "Covered Code"
+ </dt><dd>means the Original Code or Modifications or the combination of the Original Code and
+ Modifications, in each case including portions thereof.
+ </dd><dt id="section-1.4">1.4. "Electronic Distribution Mechanism"
+ </dt><dd>means a mechanism generally accepted in the software development community for the
+ electronic transfer of data.
+ </dd><dt id="section-1.5">1.5. "Executable"
+ </dt><dd>means Covered Code in any form other than Source Code.
+ </dd><dt id="section-1.6">1.6. "Initial Developer"
+ </dt><dd>means the individual or entity identified as the Initial Developer in the Source Code
+ notice required by <a href="#exhibit-a">Exhibit A</a>.
+ </dd><dt id="section-1.7">1.7. "Larger Work"
+ </dt><dd>means a work which combines Covered Code or portions thereof with code not governed
+ by the terms of this License.
+ </dd><dt id="section-1.8">1.8. "License"
+ </dt><dd>means this document.
+ </dd><dt id="section-1.8.1">1.8.1. "Licensable"
+ </dt><dd>means having the right to grant, to the maximum extent possible, whether at the
+ time of the initial grant or subsequently acquired, any and all of the rights
+ conveyed herein.
+ </dd><dt id="section-1.9">1.9. "Modifications"
+ </dt><dd>
+ <p>means any addition to or deletion from the substance or structure of either the
+ Original Code or any previous Modifications. When Covered Code is released as a
+ series of files, a Modification is:
+ </p><ol type="a">
+ <li id="section-1.9-a">Any addition to or deletion from the contents of a file
+ containing Original Code or previous Modifications.
+ </li><li id="section-1.9-b">Any new file that contains any part of the Original Code or
+ previous Modifications.
+ </li></ol>
+ </dd><dt id="section-1.10">1.10. "Original Code"
+ </dt><dd>means Source Code of computer software code which is described in the Source Code
+ notice required by <a href="#exhibit-a">Exhibit A</a> as Original Code, and which,
+ at the time of its release under this License is not already Covered Code governed
+ by this License.
+ </dd><dt id="section-1.10.1">1.10.1. "Patent Claims"
+ </dt><dd>means any patent claim(s), now owned or hereafter acquired, including without
+ limitation, method, process, and apparatus claims, in any patent Licensable by
+ grantor.
+ </dd><dt id="section-1.11">1.11. "Source Code"
+ </dt><dd>means the preferred form of the Covered Code for making modifications to it,
+ including all modules it contains, plus any associated interface definition files,
+ scripts used to control compilation and installation of an Executable, or source
+ code differential comparisons against either the Original Code or another well known,
+ available Covered Code of the Contributor's choice. The Source Code can be in a
+ compressed or archival form, provided the appropriate decompression or de-archiving
+ software is widely available for no charge.
+ </dd><dt id="section-1.12">1.12. "You" (or "Your")
+ </dt><dd>means an individual or a legal entity exercising rights under, and complying with
+ all of the terms of, this License or a future version of this License issued under
+ <a href="#section-6.1">Section 6.1.</a> For legal entities, "You" includes any entity
+ which controls, is controlled by, or is under common control with You. For purposes of
+ this definition, "control" means (a) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or otherwise, or (b)
+ ownership of more than fifty percent (50%) of the outstanding shares or beneficial
+ ownership of such entity.
+ </dd></dl>
+ <h2 id="section-2">2. Source Code License.</h2>
+ <h3 id="section-2.1">2.1. The Initial Developer Grant.</h3>
+ <p>The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive
+ license, subject to third party intellectual property claims:
+ </p><ol type="a">
+ <li id="section-2.1-a">under intellectual property rights (other than patent or
+ trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform,
+ sublicense and distribute the Original Code (or portions thereof) with or without
+ Modifications, and/or as part of a Larger Work; and
+ </li><li id="section-2.1-b">under Patents Claims infringed by the making, using or selling
+ of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or
+ otherwise dispose of the Original Code (or portions thereof).
+ </li><li id="section-2.1-c">the licenses granted in this Section 2.1
+ (<a href="#section-2.1-a">a</a>) and (<a href="#section-2.1-b">b</a>) are effective on
+ the date Initial Developer first distributes Original Code under the terms of this
+ License.
+ </li><li id="section-2.1-d">Notwithstanding Section 2.1 (<a href="#section-2.1-b">b</a>)
+ above, no patent license is granted: 1) for code that You delete from the Original Code;
+ 2) separate from the Original Code; or 3) for infringements caused by: i) the
+ modification of the Original Code or ii) the combination of the Original Code with other
+ software or devices.
+ </li></ol>
+ <h3 id="section-2.2">2.2. Contributor Grant.</h3>
+ <p>Subject to third party intellectual property claims, each Contributor hereby grants You
+ a world-wide, royalty-free, non-exclusive license
+ </p><ol type="a">
+ <li id="section-2.2-a">under intellectual property rights (other than patent or trademark)
+ Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and
+ distribute the Modifications created by such Contributor (or portions thereof) either on
+ an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger
+ Work; and
+ </li><li id="section-2.2-b">under Patent Claims infringed by the making, using, or selling of
+ Modifications made by that Contributor either alone and/or in combination with its
+ Contributor Version (or portions of such combination), to make, use, sell, offer for
+ sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor
+ (or portions thereof); and 2) the combination of Modifications made by that Contributor
+ with its Contributor Version (or portions of such combination).
+ </li><li id="section-2.2-c">the licenses granted in Sections 2.2
+ (<a href="#section-2.2-a">a</a>) and 2.2 (<a href="#section-2.2-b">b</a>) are effective
+ on the date Contributor first makes Commercial Use of the Covered Code.
+ </li><li id="section-2.2-d">Notwithstanding Section 2.2 (<a href="#section-2.2-b">b</a>)
+ above, no patent license is granted: 1) for any code that Contributor has deleted from
+ the Contributor Version; 2) separate from the Contributor Version; 3) for infringements
+ caused by: i) third party modifications of Contributor Version or ii) the combination of
+ Modifications made by that Contributor with other software (except as part of the
+ Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code
+ in the absence of Modifications made by that Contributor.
+ </li></ol>
+ <h2 id="section-3">3. Distribution Obligations.</h2>
+ <h3 id="section-3.1">3.1. Application of License.</h3>
+ <p>The Modifications which You create or to which You contribute are governed by the terms
+ of this License, including without limitation Section <a href="#section-2.2">2.2</a>. The
+ Source Code version of Covered Code may be distributed only under the terms of this License
+ or a future version of this License released under Section <a href="#section-6.1">6.1</a>,
+ and You must include a copy of this License with every copy of the Source Code You
+ distribute. You may not offer or impose any terms on any Source Code version that alters or
+ restricts the applicable version of this License or the recipients' rights hereunder.
+ However, You may include an additional document offering the additional rights described in
+ Section <a href="#section-3.5">3.5</a>.
+ </p><h3 id="section-3.2">3.2. Availability of Source Code.</h3>
+ <p>Any Modification which You create or to which You contribute must be made available in
+ Source Code form under the terms of this License either on the same media as an Executable
+ version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an
+ Executable version available; and if made available via Electronic Distribution Mechanism,
+ must remain available for at least twelve (12) months after the date it initially became
+ available, or at least six (6) months after a subsequent version of that particular
+ Modification has been made available to such recipients. You are responsible for ensuring
+ that the Source Code version remains available even if the Electronic Distribution
+ Mechanism is maintained by a third party.
+ </p><h3 id="section-3.3">3.3. Description of Modifications.</h3>
+ <p>You must cause all Covered Code to which You contribute to contain a file documenting the
+ changes You made to create that Covered Code and the date of any change. You must include a
+ prominent statement that the Modification is derived, directly or indirectly, from Original
+ Code provided by the Initial Developer and including the name of the Initial Developer in
+ (a) the Source Code, and (b) in any notice in an Executable version or related documentation
+ in which You describe the origin or ownership of the Covered Code.
+ </p><h3 id="section-3.4">3.4. Intellectual Property Matters</h3>
+ <h4 id="section-3.4-a">(a) Third Party Claims</h4>
+ <p>If Contributor has knowledge that a license under a third party's intellectual property
+ rights is required to exercise the rights granted by such Contributor under Sections
+ <a href="#section-2.1">2.1</a> or <a href="#section-2.2">2.2</a>, Contributor must include a
+ text file with the Source Code distribution titled "LEGAL" which describes the claim and the
+ party making the claim in sufficient detail that a recipient will know whom to contact. If
+ Contributor obtains such knowledge after the Modification is made available as described in
+ Section <a href="#section-3.2">3.2</a>, Contributor shall promptly modify the LEGAL file in
+ all copies Contributor makes available thereafter and shall take other steps (such as
+ notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who
+ received the Covered Code that new knowledge has been obtained.
+ </p><h4 id="section-3.4-b">(b) Contributor APIs</h4>
+ <p>If Contributor's Modifications include an application programming interface and Contributor
+ has knowledge of patent licenses which are reasonably necessary to implement that
+ <abbr>API</abbr>, Contributor must also include this information in the
+ <strong class="very-strong">legal</strong> file.
+ </p><h4 id="section-3.4-c">(c) Representations.</h4>
+ <p>Contributor represents that, except as disclosed pursuant to Section 3.4
+ (<a href="#section-3.4-a">a</a>) above, Contributor believes that Contributor's Modifications
+ are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the
+ rights conveyed by this License.
+ </p><h3 id="section-3.5">3.5. Required Notices.</h3>
+ <p>You must duplicate the notice in <a href="#exhibit-a">Exhibit A</a> in each file of the
+ Source Code. If it is not possible to put such notice in a particular Source Code file due to
+ its structure, then You must include such notice in a location (such as a relevant directory)
+ where a user would be likely to look for such a notice. If You created one or more
+ Modification(s) You may add your name as a Contributor to the notice described in
+ <a href="#exhibit-a">Exhibit A</a>. You must also duplicate this License in any documentation
+ for the Source Code where You describe recipients' rights or ownership rights relating to
+ Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity
+ or liability obligations to one or more recipients of Covered Code. However, You may do so
+ only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You
+ must make it absolutely clear than any such warranty, support, indemnity or liability
+ obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer
+ and every Contributor for any liability incurred by the Initial Developer or such Contributor
+ as a result of warranty, support, indemnity or liability terms You offer.
+ </p><h3 id="section-3.6">3.6. Distribution of Executable Versions.</h3>
+ <p>You may distribute Covered Code in Executable form only if the requirements of Sections
+ <a href="#section-3.1">3.1</a>, <a href="#section-3.2">3.2</a>,
+ <a href="#section-3.3">3.3</a>, <a href="#section-3.4">3.4</a> and
+ <a href="#section-3.5">3.5</a> have been met for that Covered Code, and if You include a
+ notice stating that the Source Code version of the Covered Code is available under the terms
+ of this License, including a description of how and where You have fulfilled the obligations
+ of Section <a href="#section-3.2">3.2</a>. The notice must be conspicuously included in any
+ notice in an Executable version, related documentation or collateral in which You describe
+ recipients' rights relating to the Covered Code. You may distribute the Executable version of
+ Covered Code or ownership rights under a license of Your choice, which may contain terms
+ different from this License, provided that You are in compliance with the terms of this
+ License and that the license for the Executable version does not attempt to limit or alter the
+ recipient's rights in the Source Code version from the rights set forth in this License. If
+ You distribute the Executable version under a different license You must make it absolutely
+ clear that any terms which differ from this License are offered by You alone, not by the
+ Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and
+ every Contributor for any liability incurred by the Initial Developer or such Contributor as
+ a result of any such terms You offer.
+ </p><h3 id="section-3.7">3.7. Larger Works.</h3>
+ <p>You may create a Larger Work by combining Covered Code with other code not governed by the
+ terms of this License and distribute the Larger Work as a single product. In such a case,
+ You must make sure the requirements of this License are fulfilled for the Covered Code.
+ </p><h2 id="section-4">4. Inability to Comply Due to Statute or Regulation.</h2>
+ <p>If it is impossible for You to comply with any of the terms of this License with respect to
+ some or all of the Covered Code due to statute, judicial order, or regulation then You must:
+ (a) comply with the terms of this License to the maximum extent possible; and (b) describe
+ the limitations and the code they affect. Such description must be included in the
+ <strong class="very-strong">legal</strong> file described in Section
+ <a href="#section-3.4">3.4</a> and must be included with all distributions of the Source Code.
+ Except to the extent prohibited by statute or regulation, such description must be
+ sufficiently detailed for a recipient of ordinary skill to be able to understand it.
+ </p><h2 id="section-5">5. Application of this License.</h2>
+ <p>This License applies to code to which the Initial Developer has attached the notice in
+ <a href="#exhibit-a">Exhibit A</a> and to related Covered Code.
+ </p><h2 id="section-6">6. Versions of the License.</h2>
+ <h3 id="section-6.1">6.1. New Versions</h3>
+ <p>Netscape Communications Corporation ("Netscape") may publish revised and/or new versions
+ of the License from time to time. Each version will be given a distinguishing version number.
+ </p><h3 id="section-6.2">6.2. Effect of New Versions</h3>
+ <p>Once Covered Code has been published under a particular version of the License, You may
+ always continue to use it under the terms of that version. You may also choose to use such
+ Covered Code under the terms of any subsequent version of the License published by Netscape.
+ No one other than Netscape has the right to modify the terms applicable to Covered Code
+ created under this License.
+ </p><h3 id="section-6.3">6.3. Derivative Works</h3>
+ <p>If You create or use a modified version of this License (which you may only do in order to
+ apply it to code which is not already Covered Code governed by this License), You must (a)
+ rename Your license so that the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "MPL",
+ "NPL" or any confusingly similar phrase do not appear in your license (except to note that
+ your license differs from this License) and (b) otherwise make it clear that Your version of
+ the license contains terms which differ from the Mozilla Public License and Netscape Public
+ License. (Filling in the name of the Initial Developer, Original Code or Contributor in the
+ notice described in <a href="#exhibit-a">Exhibit A</a> shall not of themselves be deemed to
+ be modifications of this License.)
+ </p><h2 id="section-7">7. <strong class="very-strong">Disclaimer of warranty</strong></h2>
+ <p><strong class="very-strong">Covered code is provided under this license on an "as is"
+ basis, without warranty of any kind, either expressed or implied, including, without
+ limitation, warranties that the covered code is free of defects, merchantable, fit for a
+ particular purpose or non-infringing. The entire risk as to the quality and performance of
+ the covered code is with you. Should any covered code prove defective in any respect, you
+ (not the initial developer or any other contributor) assume the cost of any necessary
+ servicing, repair or correction. This disclaimer of warranty constitutes an essential part
+ of this license. No use of any covered code is authorized hereunder except under this
+ disclaimer.</strong>
+ </p><h2 id="section-8">8. Termination</h2>
+ <p id="section-8.1">8.1. This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to cure such breach
+ within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which
+ are properly granted shall survive any termination of this License. Provisions which, by
+ their nature, must remain in effect beyond the termination of this License shall survive.
+ </p><p id="section-8.2">8.2. If You initiate litigation by asserting a patent infringement
+ claim (excluding declatory judgment actions) against Initial Developer or a Contributor
+ (the Initial Developer or Contributor against whom You file such action is referred to
+ as "Participant") alleging that:
+ </p><ol type="a">
+ <li id="section-8.2-a">such Participant's Contributor Version directly or indirectly
+ infringes any patent, then any and all rights granted by such Participant to You under
+ Sections <a href="#section-2.1">2.1</a> and/or <a href="#section-2.2">2.2</a> of this
+ License shall, upon 60 days notice from Participant terminate prospectively, unless if
+ within 60 days after receipt of notice You either: (i) agree in writing to pay
+ Participant a mutually agreeable reasonable royalty for Your past and future use of
+ Modifications made by such Participant, or (ii) withdraw Your litigation claim with
+ respect to the Contributor Version against such Participant. If within 60 days of
+ notice, a reasonable royalty and payment arrangement are not mutually agreed upon in
+ writing by the parties or the litigation claim is not withdrawn, the rights granted by
+ Participant to You under Sections <a href="#section-2.1">2.1</a> and/or
+ <a href="#section-2.2">2.2</a> automatically terminate at the expiration of the 60 day
+ notice period specified above.
+ </li><li id="section-8.2-b">any software, hardware, or device, other than such Participant's
+ Contributor Version, directly or indirectly infringes any patent, then any rights
+ granted to You by such Participant under Sections 2.1(<a href="#section-2.1-b">b</a>)
+ and 2.2(<a href="#section-2.2-b">b</a>) are revoked effective as of the date You first
+ made, used, sold, distributed, or had made, Modifications made by that Participant.
+ </li></ol>
+ <p id="section-8.3">8.3. If You assert a patent infringement claim against Participant
+ alleging that such Participant's Contributor Version directly or indirectly infringes
+ any patent where such claim is resolved (such as by license or settlement) prior to the
+ initiation of patent infringement litigation, then the reasonable value of the licenses
+ granted by such Participant under Sections <a href="#section-2.1">2.1</a> or
+ <a href="#section-2.2">2.2</a> shall be taken into account in determining the amount or
+ value of any payment or license.
+ </p><p id="section-8.4">8.4. In the event of termination under Sections
+ <a href="#section-8.1">8.1</a> or <a href="#section-8.2">8.2</a> above, all end user
+ license agreements (excluding distributors and resellers) which have been validly
+ granted by You or any distributor hereunder prior to termination shall survive
+ termination.
+ </p><h2 id="section-9">9. <strong class="very-strong">Limitation of liability</strong></h2>
+ <p><strong class="very-strong">Under no circumstances and under no legal theory, whether
+ tort (including negligence), contract, or otherwise, shall you, the initial developer,
+ any other contributor, or any distributor of covered code, or any supplier of any of
+ such parties, be liable to any person for any indirect, special, incidental, or
+ consequential damages of any character including, without limitation, damages for loss
+ of goodwill, work stoppage, computer failure or malfunction, or any and all other
+ commercial damages or losses, even if such party shall have been informed of the
+ possibility of such damages. This limitation of liability shall not apply to liability
+ for death or personal injury resulting from such party's negligence to the extent
+ applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion
+ or limitation of incidental or consequential damages, so this exclusion and limitation
+ may not apply to you.</strong>
+ </p><h2 id="section-10">10. <abbr title="United States">U.S.</abbr> government end users</h2>
+ <p>The Covered Code is a "commercial item," as that term is defined in 48
+ <abbr>C.F.R.</abbr> 2.101 (<abbr title="October">Oct.</abbr> 1995), consisting of
+ "commercial computer software" and "commercial computer software documentation," as such
+ terms are used in 48 <abbr>C.F.R.</abbr> 12.212 (<abbr title="September">Sept.</abbr>
+ 1995). Consistent with 48 <abbr>C.F.R.</abbr> 12.212 and 48 <abbr>C.F.R.</abbr>
+ 227.7202-1 through 227.7202-4 (June 1995), all <abbr>U.S.</abbr> Government End Users
+ acquire Covered Code with only those rights set forth herein.
+ </p><h2 id="section-11">11. Miscellaneous</h2>
+ <p>This License represents the complete agreement concerning subject matter hereof. If
+ any provision of this License is held to be unenforceable, such provision shall be
+ reformed only to the extent necessary to make it enforceable. This License shall be
+ governed by California law provisions (except to the extent applicable law, if any,
+ provides otherwise), excluding its conflict-of-law provisions. With respect to
+ disputes in which at least one party is a citizen of, or an entity chartered or
+ registered to do business in the United States of America, any litigation relating to
+ this License shall be subject to the jurisdiction of the Federal Courts of the
+ Northern District of California, with venue lying in Santa Clara County, California,
+ with the losing party responsible for costs, including without limitation, court
+ costs and reasonable attorneys' fees and expenses. The application of the United
+ Nations Convention on Contracts for the International Sale of Goods is expressly
+ excluded. Any law or regulation which provides that the language of a contract
+ shall be construed against the drafter shall not apply to this License.
+ </p><h2 id="section-12">12. Responsibility for claims</h2>
+ <p>As between Initial Developer and the Contributors, each party is responsible for
+ claims and damages arising, directly or indirectly, out of its utilization of rights
+ under this License and You agree to work with Initial Developer and Contributors to
+ distribute such responsibility on an equitable basis. Nothing herein is intended or
+ shall be deemed to constitute any admission of liability.
+ </p><h2 id="section-13">13. Multiple-licensed code</h2>
+ <p>Initial Developer may designate portions of the Covered Code as
+ "Multiple-Licensed". "Multiple-Licensed" means that the Initial Developer permits
+ you to utilize portions of the Covered Code under Your choice of the <abbr>MPL</abbr>
+ or the alternative licenses, if any, specified by the Initial Developer in the file
+ described in <a href="#exhibit-a">Exhibit A</a>.
+ </p><h2 id="exhibit-a">Exhibit A - Mozilla Public License.</h2>
+ <pre>"The contents of this file are subject to the Mozilla Public License
+Version 1.1 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS"
+basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+License for the specific language governing rights and limitations
+under the License.
+
+The Original Code is ______________________________________.
+
+The Initial Developer of the Original Code is ________________________.
+Portions created by ______________________ are Copyright (C) ______
+_______________________. All Rights Reserved.
+
+Contributor(s): ______________________________________.
+
+Alternatively, the contents of this file may be used under the terms
+of the _____ license (the "[___] License"), in which case the
+provisions of [______] License are applicable instead of those
+above. If you wish to allow use of your version of this file only
+under the terms of the [____] License and not to allow others to use
+your version of this file under the MPL, indicate your decision by
+deleting the provisions above and replace them with the notice and
+other provisions required by the [___] License. If you do not delete
+the provisions above, a recipient may use your version of this file
+under either the MPL or the [___] License."</pre>
+ <p>NOTE: The text of this Exhibit A may differ slightly from the text of
+ the notices in the Source Code files of the Original Code. You should
+ use the text of this Exhibit A rather than the text found in the
+ Original Code Source Code for Your Modifications.
+</p></body></html>
\ No newline at end of file
Property changes on: branches/as7/build/kits/jboss-as7/docs/teiid/licenses/MPL-1.1.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/as7/build/kits/jboss-as7/docs/teiid/licenses/PostgreSQL-BSD.txt
===================================================================
--- branches/as7/build/kits/jboss-as7/docs/teiid/licenses/PostgreSQL-BSD.txt (rev 0)
+++ branches/as7/build/kits/jboss-as7/docs/teiid/licenses/PostgreSQL-BSD.txt 2011-11-07 16:04:44 UTC (rev 3617)
@@ -0,0 +1,26 @@
+Copyright (c) 1997-2010, PostgreSQL Global Development Group
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+3. Neither the name of the PostgreSQL Global Development Group nor the names
+ of its contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
Property changes on: branches/as7/build/kits/jboss-as7/docs/teiid/licenses/PostgreSQL-BSD.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/as7/build/kits/jboss-as7/docs/teiid/licenses/apache-2.0 - LICENSE-2.0.txt
===================================================================
--- branches/as7/build/kits/jboss-as7/docs/teiid/licenses/apache-2.0 - LICENSE-2.0.txt (rev 0)
+++ branches/as7/build/kits/jboss-as7/docs/teiid/licenses/apache-2.0 - LICENSE-2.0.txt 2011-11-07 16:04:44 UTC (rev 3617)
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Property changes on: branches/as7/build/kits/jboss-as7/docs/teiid/licenses/apache-2.0 - LICENSE-2.0.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/as7/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml
===================================================================
--- branches/as7/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2011-11-07 13:37:11 UTC (rev 3616)
+++ branches/as7/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2011-11-07 16:04:44 UTC (rev 3617)
@@ -442,6 +442,7 @@
<transport name="embedded"/>
<transport name="jdbc" protocol="teiid" socket-binding="teiid-jdbc">
+ <ssl mode="login"/>
<authentication security-domain="teiid-security"/>
</transport>
<transport name="odbc" protocol="pg" socket-binding="teiid-odbc">
Modified: branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/adminshell.xml
===================================================================
--- branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/adminshell.xml 2011-11-07 13:37:11 UTC (rev 3616)
+++ branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/adminshell.xml 2011-11-07 16:04:44 UTC (rev 3617)
@@ -21,7 +21,7 @@
</listitem>
<listitem>
<para>quick administrative tool. The user can connect to a running Teiid Server and invoke any of
- the AdminAPI methods, such as "deployVDB" or "stopConnectionFactory", to control the Teiid System.
+ the AdminAPI methods, such as "deploy" or "createDataSource", to control the Teiid System.
Since this can be script driven, these tasks can be automated and re-run at a later time.</para>
</listitem>
<listitem>
@@ -96,7 +96,7 @@
declared inside "(" and ")". A function may have more than
one parameter. String parameters can be wrapped in double or single quotes. Example:</para>
<programlisting><![CDATA[
- connectAsAdmin("mm://localhost:34413", "user", "password")
+ connectAsAdmin("localhost", "9999", "user", "password", "conn1")
]]></programlisting>
</listitem>
<listitem>
@@ -136,7 +136,7 @@
/*
*Deploy a VDB from file
*/
-void deployVDB(
+void deploy(
String /* file name */)
throws AdminException
throws FileNotFoundException]]></programlisting>
@@ -207,13 +207,14 @@
connection properties with which user can connect to Teiid system. The following properties can be
defined using this file</para>
<programlisting><![CDATA[
-admin.url = <server host name or ip address>
-admin.name = <user name>
-admin.password = <password>
+jdbc.user=user
+jdbc.password=user
+jdbc.url=jdbc:teiid:admin@mm://localhost:31000;
-jdbc.url = <server host name or ip address>
-jdbc.user = <user name>
-jdbc.password = <password>
+admin.host=localhost
+admin.port=9999
+admin.user=admin
+admin.password=admin
]]></programlisting>
<para>A call to "connect()" or "connectionAsAdmin()" without any input parameters, will connect to
the Teiid system using the properties defined in properties file. However, a user can always pass in
@@ -259,14 +260,14 @@
//capture the connection name
conn1 = getConnectionName();
-deployVDB("file.vdb")
+deploy("file.vdb")
// creates a second connection
connectAsAdmin();
conn2 = getConnectionName();
-deployVDB("file.vdb")
+deploy("file.vdb")
// switch the connection to "conn1"
useConnection(conn1);
Modified: branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/clustering.xml
===================================================================
--- branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/clustering.xml 2011-11-07 13:37:11 UTC (rev 3616)
+++ branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/clustering.xml 2011-11-07 16:04:44 UTC (rev 3617)
@@ -2,12 +2,11 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="clustering">
<title>Clustering in Teiid</title>
- <para>Since Teiid is installed in JBoss AS, there is no separate configuration needed on the part of the user to cluster the Teiid instances.
- To cluster JBoss AS instances use these <ulink url="http://www.jboss.org/jbossas/docs/5-x.html">instructions</ulink> then Teiid instances
- are clustered as well. Just make sure that you installed Teiid in every JBoss AS node before starting the cluster.
- There is one specific configuration that needs to be done for enabling the replicated (distributed) cache in Teiid.
- To enable distributed caching, rename the "<jboss-as>/server/<profile>/deploy/teiid/teiid-cache-manager-jboss-beans-rename-me.xml" file
- to "<jboss-as>/server/<profile>/deploy/teiid/teiid-cache-manager-jboss-beans.xml".
+ <para>Since Teiid is installed in JBoss AS, there is no separate configuration needed on the part of the user to cluster
+ the Teiid instances.
+ To cluster JBoss AS instances use these <ulink url="https://docs.jboss.org/author/display/AS7/Documentation">instructions</ulink> then Teiid instances
+ are clustered as well. Just make sure that you installed Teiid in every JBoss AS node and started JBoss AS instances in the
+ Domain mode before starting the cluster.
</para>
<para>
@@ -20,11 +19,7 @@
</orderedlist>
</para>
- <para>If would like a clustered deployment of the VDB and data-source artifacts, i.e. deploy artifacts to a central
- location and let the system propagate deployments every where, then look into
- <ulink url="http://community.jboss.org/wiki/JBossFarmDeployment">JBoss Farm Deployment</ulink>. Note that this only supports hot deployments.
- Take look at some commonly asked questions <ulink url="http://community.jboss.org/wiki/JoinTheClusterBeforeUpdatingTheFarmDirectory">here</ulink>.
- If you need more fine grained control, you can use script based deployment, where you control the deployment of artifacts into each node, or
- JBoss AS "deploy" folder can be configured as a <emphasis>shared</emphasis> folder among all the clustered JBoss AS nodes to achieve farming.</para>
+ <para>In the domain mode, the only way user can deploy any artifacts is using either CLI or using the Admin API or Admin Shell.
+ Copying VDB directly into the "deployments" directory is not supported. </para>
</chapter>
\ No newline at end of file
Modified: branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml
===================================================================
--- branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml 2011-11-07 13:37:11 UTC (rev 3616)
+++ branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml 2011-11-07 16:04:44 UTC (rev 3617)
@@ -17,23 +17,38 @@
<orderedlist numeration="arabic">
<para>Steps to install Teiid</para>
<listitem>
- <para>Download the <ulink url="http://www.jboss.org/jbossas/downloads.html">JBoss AS 5.1.0</ulink> application server.
- Install the server by unzipping into a known location. Ex: /apps/jboss-5.1.0
- <note><para>You may also choose to use an existing AS installation. However if a previous version of Teiid was already installed, you must remove the old teiid distribution artifacts before installing the new version.</para></note></para>
+ <para>Download the <ulink url="http://www.jboss.org/jbossas/downloads.html">JBoss AS 7.1.0</ulink> application server.
+ Install the server by unzipping into a known location. Ex: /apps/jboss-7.1.0
+ <note><para>You may also choose to use an existing AS installation. However if a previous version of Teiid
+ was already installed, you must remove the old teiid distribution artifacts before installing the new version.</para>
+ </note></para>
</listitem>
<listitem>
- <para>Download <ulink url="http://www.jboss.org/teiid/downloads.html">Teiid &versionNumber;</ulink>. Unzip the downloaded artifact inside any "profile"
- in the JBoss AS installation. Teiid &versionNumber; uses a JBoss AS service called the "profile service" that
- is only installed in "default" and "all" profiles, so installing into one of these
- profiles is required. The default profile is the typical installation location, for example "<jboss-install>/server/default".
- The Teiid runtime directory structure matches JBoss profiles directly - it is just an overlay.
+ <para>Download <ulink url="http://www.jboss.org/teiid/downloads.html">Teiid &versionNumber;</ulink>.
+ Unzip the downloaded artifact inside the JBoss AS installation. Teiid &versionNumber; directory structure matches
+ JBoss profiles directly - it is just an overlay. This will add necessary modules and configuration files to install Teiid
+ in JBoss AS 7.x. Teiid works in both Standalone and Domain modes. Teiid provides separate configuration files
+ (standalone-teiid.xml and domain-teiid.xml) for both modes apart from the default configuration files come with JBoss AS 7.x
</para>
- <para>The all profile is recommended in a clustered environment to take advantage of clustered caching and cluster safe distribution of events.</para>
+ <para>The "Domain" mode recommended in a clustered environment to take advantage of clustered caching
+ and cluster safe distribution of events.</para>
</listitem>
<listitem>
- <para>Start the JBoss AS server by executing "<jboss-install>/bin/run.sh" if you installed in the
- "default" profile. Otherwise use "<jboss-install>/bin/run.sh -c <profilename>"
+ <para>Start the JBoss AS server by executing
+ <programlisting><![CDATA[
+ <jboss-install>/bin/standalone.sh --server-config=standalone-teiid.xml
+ ]]></programlisting>
+ if you want to start the "standalone" profile. To start the server in "Domain" mode execute command
+ <programlisting><![CDATA[
+ <jboss-install>/bin/domain.sh --domain-config=domain-teiid.xml
+ ]]></programlisting>
+ To complete the installion for the domain mode, after the server has been started run the following command. Note that
+ this only needs to be run for once per whole domain install. Since in domain mode you can not statically deploy resources,
+ this script deploys default resources required for Teiid once the server starts using the CLI interface.
+ <programlisting><![CDATA[
+ <jboss-install>/bin/jboss-admin.sh --file=scripts/teiid-domain-mode-install.cli
+ ]]></programlisting>
</para>
</listitem>
@@ -42,78 +57,68 @@
</listitem>
<listitem>
- <para>Once VDBs have been deployed, users can now connect their JDBC applications to Teiid. If you need help on connecting your application to the
- Teiid using JDBC check out the "Client Developer's Guide".
+ <para>Once VDBs have been deployed, users can now connect their JDBC applications to Teiid. If you need help
+ on connecting your application to the Teiid using JDBC check out the "Client Developer's Guide".
</para>
</listitem>
</orderedlist>
</section>
- <section>
- <title>CXF Installation</title>
- <para>The usage of CXF is expected for utilizing Salesforce and Web Services connectivity through Teiid. If you do not plan on integrating either of these features, then you may leave JBoss AS with the default "native" web services stack.</para>
- <orderedlist>
- <listitem>
- <para>Download <ulink url="http://www.jboss.org/jbossws/downloads/">JBossWS-CXF 3.1.2</ulink> and unzip to a temporary location.</para>
- </listitem>
- <listitem>
- <para>From the jbossws-cxf-bin-dist directory, save the ant.properties.example file as ant.properties and change the values for jboss510.home, jbossws.integration.target, jboss.server.instance, jboss.bind.address accordingly:
- <programlisting>
-...
-jboss510.home=<jboss-install>
-# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss600]
-jbossws.integration.target=jboss510
-
-# The JBoss settings
-jboss.server.instance=<profile>
-jboss.bind.address=<bind address>
-</programlisting> The jboss-install location should be the root directory of your AS installation, profile (typically default) should indicate the profile selected for your Teiid installation, and the bind address should be the bind address used when launching JBoss AS (use the value localhost if you do not set the bind address when launching JBoss AS).</para>
- </listitem>
- <listitem>
- <para>From the jbossws-cxf-bin-dist directory, install JBossWS-CXF by running the ANT build script: <programlisting>$ant deploy-jboss510</programlisting></para>
- </listitem>
- <listitem>
- <para>Optionally run tests to verify that there are no errors with the installation: <programlisting>$ant tests</programlisting></para>
- </listitem>
- </orderedlist>
- </section>
<section>
<title>Directory Structure Explained</title>
<example>
<title>Directory Structure</title>
<para>This shows the contents of the Teiid &versionNumber; deployment. The directory
structure is exactly the same under any JBoss profile.</para>
- <programlisting><![CDATA[teiid
- /conf
- /props
- teiid-security-roles.properties
- teiid-security-users.properties
- jboss-teiid-log4j.xml
- /deploy
+ <programlisting><![CDATA[
+ /bin
+ /scripts
+ /docs
/teiid
- /connectors
- teiid-jboss-beans.xml
- teiid-connector-templates-jboss-beans.xml
- admin-console.war
- /deployers
- /teiid.deployer
- /lib
- /teiid-examples
- /tmp/teiid]]></programlisting>
+ /datsources
+ /schema
+ /examples
+ /domain
+ /configuration
+ domain-teiid.xml
+ /modules
+ /org/jboss/teiid/*
+ /standalone
+ /configuration
+ standalone-teiid.xml
+ /deployments
+ teiid-*.rar
+ ]]></programlisting>
</example>
<section>
- <title>/deploy/teiid/teiid-jboss-beans.xml</title>
- <para>Master configuration file for Teiid system. This file contains its own documentation,
- so refer to the file for all the available properties to configure.</para>
+ <title>bin/scripts</title>
+ <para>Has installation and utility CLI scripts.</para>
</section>
+ <section>
+ <title>docs/teiid</title>
+ <para>Has documents, examples, sample data source XML fragments and schema files. Contains artifacts
+ need by the Quick Start Example.</para>
+ </section>
+
+ <section>
+ <title>/standalone/configuration/standalone-teiid.xml</title>
+ <para>Master configuration file for Teiid system. This file contains Teiid subsystem in addtion to standard
+ JBoss AS web profile subsystems</para>
+ </section>
<section>
- <title>/deploy/teiid/connectors</title>
- <para>This directory contains all the translator JAR and connector RAR files that are supplied as part of the Teiid installation.</para>
+ <title>/standalone/deployments</title>
+ <para>This directory contains all the resource-adapter RAR files that are supplied as part of the Teiid installation. Note
+ that resource adaptors are not installed by default for the domain mode. </para>
</section>
+
+ <section>
+ <title>modules</title>
+ <para>This directory defines the modules for JBoss As system</para>
+ </section>
<section>
- <title>/conf/props</title>
+ <title>/modules/org/jboss/teiid/main/conf</title>
<itemizedlist>
<para>Relevant Files</para>
<listitem>
@@ -128,51 +133,31 @@
</section>
<section>
- <title>/conf/jboss-teiid-log4j.xml</title>
- <para>This file contains the Teiid specific logging contexts to be included in the "jboss-log4j.xml" file.
- If you need to turn ON or OFF specific logging in Teiid,
- then copy the contents of this file into "jboss-log4j.xml" in the
- installation directory. See the Developers Guide for more on customizing logging.</para>
+ <title>/domain/configuration/domain-teiid.xml</title>
+ <para>Master configuration file for Domain mode. This file contains Teiid subsystem in addtion to standard
+ JBoss AS web profile subsystems.</para>
</section>
-
- <section>
- <title>admin-console.war</title>
- <para>This file has the required files for Teiid JOPR plugin. To see the
- Teiid's "admin-console", go to http://<host>:<port>/admin-console</para>
- </section>
- <section>
- <title>/deployers/teiid.deployer</title>
- <para>This directory contains Teiid runtime specific configuration files and its libraries.
- These configuration files define VDB deployers, connector binding deployers etc.
- Typically user never need to edit any files in this directory.</para>
- </section>
-
<section>
- <title>lib</title>
+ <title>modules/org/jboss/teiid/client</title>
<para>This directory contains Teiid client libraries. It has the Teiid JDBC driver jar, "teiid-&versionNumber;-client.jar",
and also contains "teiid-hibernate-dialect-&versionNumber;.jar" that contains Teiid's Hibernate dialect.</para>
</section>
<section>
- <title>teiid-examples</title>
- <para>This directory contains some examples of how Teiid can be used. Contains artifacts
- need by the Quick Start Example. Also contains some sample XML files to define the connectors.</para>
- </section>
-
- <section>
- <title>teiid-docs</title>
- <para>This directory contains the PDF documents related Teiid and Teiid development. </para>
- </section>
-
- <section>
- <title>tmp/teiid</title>
+ <title>{standlaone or domain}tmp/teiid</title>
<para>This directory contains temporary files created by Teiid. These are mostly created by the buffer manager.
These files are not needed across a VM restart. Creation of Teiid lob values (for example through SQL/XML) will typically create one file per lob once it exceeds the allowable
in memory size of 8KB. In heavy usage scenarios, consider pointing the buffer directory at a partition that is routinely defragmented.
</para>
</section>
+ <section>
+ <title>{standlaone or domain}data/teiid-data</title>
+ <para>This directory contains cached vdb metadata files. Do not edit them manually.
+ </para>
+ </section>
+
</section>
</chapter>
\ No newline at end of file
Modified: branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/logging.xml
===================================================================
--- branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/logging.xml 2011-11-07 13:37:11 UTC (rev 3616)
+++ branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/logging.xml 2011-11-07 16:04:44 UTC (rev 3617)
@@ -12,8 +12,7 @@
control logging level, contexts, and log locations, you should be
familiar with
<ulink url="http://logging.apache.org/log4j/">log4j</ulink>
- and the container's jboss-log4j.xml configuration file.
- Teiid also provides a <profile>/conf/jboss-teiid-log4j.xml containing much of information from chapter.
+ and the container's standalone-teiid/domin-teiid.xml configuration file.
</para>
<para>
All the logs
@@ -28,7 +27,7 @@
system. Note that logs originating from third-party code, including
integrated org.jboss components, will be logged through their
respective contexts and not through org.teiid. See the table below for information on contexts
- relevant to Teiid. See the container's jboss-log4j.xml for a more
+ relevant to Teiid. See the container's standalone-teiid.xml for a more
complete listing of logging contexts used in the container.
</para>
<informaltable frame="all">
@@ -185,20 +184,22 @@
To enable command logging to an alternative file location,
configure a separate file appender for the DETAIL logging of the
org.teiid.COMMAND_LOG context. An example of this is shown below and
- can also be found in the jboss-log4j.xml distributed with Teiid.
- <programlisting><![CDATA[<appender name="COMMAND" class="org.apache.log4j.RollingFileAppender">
- <param name="File" value="log/command.log"/>
- <param name="MaxFileSize" value="1000KB"/>
- <param name="MaxBackupIndex" value="25"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %p [%t] %c - %m%n"/>
- </layout>
- </appender>
+ can also be found in the standalone-teiid.xml distributed with Teiid.
+ <programlisting><![CDATA[<periodic-rotating-file-handler name="COMMAND_FILE">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ <file relative-to="jboss.server.log.dir" path="command.log"/>
+ <suffix value=".yyyy-MM-dd"/>
+ </periodic-rotating-file-handler>
- <category name="org.teiid.COMMAND_LOG">
- <priority value="INFO"/>
- <appender-ref ref="COMMAND"/>
- </category>]]></programlisting>
+ <logger category="org.teiid.COMMAND_LOG">
+ <level name="INFO"/>
+ <handlers>
+ <handler name="COMMAND_FILE"/>
+ </handlers>
+ </logger>]]></programlisting>
See the Developer's Guide to develop a custom logging solution if file based, or any other built-in Log4j, logging is not sufficient.
</para>
@@ -213,7 +214,7 @@
context.</para>
<para>To enable audit logging to an alternative file location,
configure a separate file appender for the DETAIL logging of the
- org.teiid.AUDIT_LOG context. An example of this is already in
- the log4j.xml distributed with Teiid. See the Developer's Guide to develop a custom logging solution if file based, or any other built-in Log4j, logging is not sufficient.</para>
+ org.teiid.AUDIT_LOG context. See the Developer's Guide to develop a custom logging
+ solution if file based, or any other built-in Log4j, logging is not sufficient.</para>
</section>
</chapter>
\ No newline at end of file
Modified: branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/performance.xml
===================================================================
--- branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/performance.xml 2011-11-07 13:37:11 UTC (rev 3616)
+++ branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/performance.xml 2011-11-07 16:04:44 UTC (rev 3617)
@@ -9,7 +9,7 @@
<title>Memory Management</title>
<para>The BufferManager is responsible for tracking both memory and disk usage
by Teiid. Configuring the BufferManager properly is one of the most
- important parts of ensuring high performance. See the &jboss-beans;
+ important parts of ensuring high performance. See the
file for all BufferManager settings.
</para>
<para>
@@ -37,20 +37,26 @@
</para>
<note>
<para>Memory consumption can be significantly more or less than the nominal target
- depending upon actual column values and whether value caching is enabled. Large non built-in type objects can exceed their default size estimate.
- If an out of memory errors occur, then set a lower the max-reserve-kb value. Also note that source lob values are held by memory references that are not cleared when a batch is persisted.
- With heavy lob usage you should ensure that buffers of other memory associated with lob references are appropiately sized.
+ depending upon actual column values and whether value caching is enabled. Large non built-in type objects can
+ exceed their default size estimate.
+ If an out of memory errors occur, then set a lower the max-reserve-kb value. Also note that source lob values
+ are held by memory references that are not cleared when a batch is persisted.
+ With heavy lob usage you should ensure that buffers of other memory associated with lob references are
+ appropriately sized.
</para>
</note>
<para>
The <code>max-processing-kb</code>
- setting determines the total size in kilobytes of batches that can be used by active plans regardless of the memory held based on <code>max-reserve-kb</code>.
- The default value of -1 will auto-calculate a typical max based upon the max heap available to the VM and max active plans.
+ setting determines the total size in kilobytes of batches that can be used by active plans regardless of the
+ memory held based on <code>max-reserve-kb</code>.
+ The default value of -1 will auto-calculate a typical max based upon the max heap available to the VM and max
+ active plans.
The auto-calculated value assumes a 64bit architecture and will limit processing batch usage to 10% of memory
beyond the first 300 megabytes (which are assumed for use by the AS and other Teiid purposes).
</para>
<para>
- In systems where large intermediate results are normal (scrolling cursors or sorting over millions of rows) you can consider increasing the <code>max-processing-kb</code> and decreasing
+ In systems where large intermediate results are normal (scrolling cursors or sorting over millions of rows)
+ you can consider increasing the <code>max-processing-kb</code> and decreasing
the <code>max-reserve-kb</code> so that each request has access to an effectively smaller buffer space.
</para>
<para>
@@ -66,32 +72,51 @@
<section>
<title>Big Data/Memory</title>
<para>Usage of extremely large VM sizes and or datasets requires additional considerations.
- Teiid has a non-negligible amount of overhead per batch/table page on the order of 100-200 bytes. Depending on the data types involved each
- full batch/table page will represent a variable number of rows (a power of two multiple above or below the processor batch size). If you are dealing with datasets with billions of rows and you run into OutOfMemory issues, consider increasing the processor
- batch size in the &jboss-beans; file to force the allocation of larger batches and table pages. If the processor batch size is increased and/or you are dealing with extremely wide result sets (several hundred columns),
- then the default setting of 8MB for the max-storage-object-size in the &jboss-beans; file may be too low. The sizing for max-storage-object-size is terms of serialized size, which will be much
- closer to the raw data size then the Java memory footprint estimation used for maxReservedKB.
- max-storage-object-size should not be set too large relative to memory-buffer-space since it will reduce the performance of the memory buffer. The memory buffer supports only 1 concurrent writer for each max-storage-object-size of the memory-buffer-space.
+ Teiid has a non-negligible amount of overhead per batch/table page on the order of 100-200 bytes. Depending on the
+ data types involved each
+ full batch/table page will represent a variable number of rows (a power of two multiple above or below the processor
+ batch size). If you are dealing with datasets with billions of rows and you run into OutOfMemory issues, consider
+ increasing the processor-batch-size
+ in the &jboss-beans; file to force the allocation of larger batches and table pages. If the processor
+ batch size is increased and/or you are dealing with extremely wide result sets (several hundred columns),
+ then the default setting of 8MB for the max-storage-object-size in the &jboss-beans; file may be too low. The sizing
+ for max-storage-object-size is terms of serialized size, which will be much
+ closer to the raw data size then the Java memory footprint estimation used for max-reserved-kb.
+ max-storage-object-size should not be set too large relative to memory-buffer-space since it will reduce the
+ performance of the memory buffer. The memory buffer supports only 1 concurrent writer for each
+ max-storage-object-size of the memory-buffer-space.
</para>
<note><para>Teiid temporary tables (also used for internal materialization) can only support 2^31-1 rows per table.</para></note>
<para>
- The memory-buffer-space setting controls the amount of on or off heap memory allocated as byte buffers for use by the Teiid buffer manager. This setting defaults to -1, which automatically determines a setting based upon whether it is on or off heap and the value for max-reserve-kb.
+ The memory-buffer-space setting controls the amount of on or off heap memory allocated as byte buffers for
+ use by the Teiid buffer manager. This setting defaults to -1, which automatically determines a setting based
+ upon whether it is on or off heap and the value for max-reserve-kb.
</para>
- <para>You can take advantage of the buffer manager memory buffer to access system memory without allocating it to the heap. Setting memory-buffer-off-heap to true in &jboss-beans; will allocate the
- Teiid memory buffer off heap. Depending on whether your installation is dedicated to Teiid and the amount of system memory available, this may be perferable to on-heap allocation. The primary
- benefit is additional memory usage for Teiid without additional garbage collection tuning. This becomes especially important in situations where more than 32GB of memory is desired for the VM.
- Note that when using off-heap allocation, the memory must still be available to the java process and that setting the value of memory-buffer-space too high may cause the VM to swap rather than reside in memory.
- With large off-heap buffer sizes (greater than several gigabytes) you may also need to adjust VM settings. For Sun VMs the relevant VM settings are MaxDirectMemorySize and UseLargePages. For example adding:
+ <para>You can take advantage of the buffer manager memory buffer to access system memory without allocating it
+ to the heap. Setting memory-buffer-off-heap to true in &jboss-beans; will allocate the
+ Teiid memory buffer off heap. Depending on whether your installation is dedicated to Teiid and the amount of
+ system memory available, this may be preferable to on-heap allocation. The primary
+ benefit is additional memory usage for Teiid without additional garbage collection tuning. This becomes
+ especially important in situations where more than 32GB of memory is desired for the VM.
+ Note that when using off-heap allocation, the memory must still be available to the java process and that
+ setting the value of memory-buffer-space too high may cause the VM to swap rather than reside in memory.
+ With large off-heap buffer sizes (greater than several gigabytes) you may also need to adjust VM settings.
+ For Sun VMs the relevant VM settings are MaxDirectMemorySize and UseLargePages. For example adding:
<programlisting>-XX:MaxDirectMemorySize=12g -XX:+UseLargePages</programlisting>
- to the VM process arguments would allow for an effective allocation of approximately an 11GB Teiid memory buffer (the memory-buffer-space setting) accounting for any additional direct memory that may be needed
+ to the VM process arguments would allow for an effective allocation of approximately an 11GB Teiid memory
+ buffer (the memory-buffer-space setting) accounting for any additional direct memory that may be needed
by the AS or applications running in the AS.</para>
</section>
<section>
<title>Disk Usage</title>
- <para>For table page and result batches the buffer manager will we a limited number of files that are dedicated to a particular storage size.
- However, as mentioned in the installation, creation of Teiid lob values (for example through SQL/XML) will typically create one file per lob once the lob exceeds the allowable
- in memory size of 8KB. In heavy usage scenarios, consider pointing the buffer directory on a partition that is routinely defragmented.
- By default Teiid will use up to 50GB of disk space. This is tracked in terms of the number of bytes written by Teiid. For large data sets, you may need to increase the
+ <para>For table page and result batches the buffer manager will we a limited number of files that are dedicated
+ to a particular storage size.
+ However, as mentioned in the installation, creation of Teiid lob values (for example through SQL/XML) will
+ typically create one file per lob once the lob exceeds the allowable
+ in memory size of 8KB. In heavy usage scenarios, consider pointing the buffer directory on a partition that is
+ routinely defragmented.
+ By default Teiid will use up to 50GB of disk space. This is tracked in terms of the number of bytes written by
+ Teiid. For large data sets, you may need to increase the
'max-buffer-space' setting in the &jboss-beans; file.
</para>
</section>
@@ -121,27 +146,37 @@
</section>
<section>
<title>Cache Tuning</title>
- <para>Caching can be tuned for cached result (including user query results and procedure results) and prepared plans (including user and stored procedure plans).
- Even though it is possible to disable or otherwise severely constrain these caches, this would probably never be done in practice as it would lead to poor performance.
- </para><para>Cache statistics can be obtained through the Admin Console or Adminshell. The statistics can be used to help tune cache parameters and ensure a hit ratio.</para>
- <para>Plans are currently fully held in memory and may have a significant memory footprint. When making extensive use of prepared statements and/or virtual procedures,
+ <para>Caching can be tuned for cached result (including user query results and procedure results) and prepared
+ plans (including user and stored procedure plans).
+ Even though it is possible to disable or otherwise severely constrain these caches, this would probably never
+ be done in practice as it would lead to poor performance.
+ </para><para>Cache statistics can be obtained through the Admin Console or Adminshell. The statistics can be
+ used to help tune cache parameters and ensure a hit ratio.</para>
+ <para>Plans are currently fully held in memory and may have a significant memory footprint. When making
+ extensive use of prepared statements and/or virtual procedures,
the size of the plan cache may be increased proportionally to number of gigabytes intended for use by Teiid.
- </para><para>While the result cache parameters control the cache result entries (max number, eviction, etc.), the result batches themselves are accessed through the <link linkend="memory_management">BufferManager</link>.
- If the size of the result cache is increased, you may need to tune the BufferManager configuration to ensure there is enough buffer space.
+ </para><para>While the result cache parameters control the cache result entries (max number, eviction, etc.),
+ the result batches themselves are accessed through the <link linkend="memory_management">BufferManager</link>.
+ If the size of the result cache is increased, you may need to tune the BufferManager configuration to ensure
+ there is enough buffer space.
</para>
<para>Result set and prepared plan caches have their entries invalidated by data and metadata events.
By default these events are captured by running commands through Teiid. See the Developers Guide for further customization.
- Teiid stores compiled forms of update plans or trigger actions with the prepared plan, so it is recommended to leave the max-staleness of the prepared plan cache set to 0 so that metadata changes, for example disabling a trigger, may take effect immediately.
- The default staleness for result set caching is 60 seconds to improve efficiency with rapidly changing sources. Consider decreasing this value to make the result set cache more consistent with the underlying data. Even with a setting of 0 full transactional consistency is not guaranteed.
+ Teiid stores compiled forms of update plans or trigger actions with the prepared plan, so it is recommended to
+ leave the max-staleness of the prepared plan cache set to 0 so that metadata changes, for example disabling a trigger,
+ may take effect immediately.
+ The default staleness for result set caching is 60 seconds to improve efficiency with rapidly changing sources.
+ Consider decreasing this value to make the result set cache more consistent with the underlying data. Even with
+ a setting of 0 full transactional consistency is not guaranteed.
</para>
</section>
<section id="socket_transport">
<title>Socket Transports</title>
<para>Teiid separates the configuration of its socket transports for
- JDBC, ODBC, and Admin access.
+ JDBC ans ODBC.
Typical installations will not need to adjust the default thread and buffer size settings.
The default input output buffer sizes are set to 0, which will use the system default.
- Before adjusting this value keep in mind that each JDBC, ODBC, and Admin client will create a new socket connection.
+ Before adjusting this value keep in mind that each JDBC, ODBC will create a new socket connection.
Setting these values to a large buffer size should only be done if the number of client is constrained.
All JDBC/ODBC socket operations are non-blocking, so setting the number of max-threads
higher than the maximum effective parallelism of the machine should not result in greater performance.
Modified: branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/security.xml
===================================================================
--- branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/security.xml 2011-11-07 13:37:11 UTC (rev 3616)
+++ branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/security.xml 2011-11-07 16:04:44 UTC (rev 3617)
@@ -29,7 +29,7 @@
same security-domain and not force the user to re-authenticate for using Teiid. In this case Teiid looks for a authenticated
subject in the calling thread context and uses for its session and authorization purposes. To configure Teiid for this
pass-through authentication mechanism, you need change the Teiid's security-domain name to same name as your
- application's security domain name in the "teiid-jboss-beans.xml" file in the SessionService section.
+ application's security domain name in the "standalone-teiid.xml" file in the "transport" section.
Please note that for this to work, the security-domain
must be a JAAS based Login Module and your client application MUST obtain Teiid connection
using <emphasis>Local</emphasis> Connection, with <emphasis>PassthroughAuthentication=true</emphasis> flag set.</para>
@@ -83,12 +83,11 @@
domains were consulted, etc. will be in the server log with appropriate
levels of severity.</para>
<note>
- <para>The security-domain defined for the JDBC connection and Admin connections are separate.
- The default name of JDBC connection's security-domain is "teiid-security". The default name for Admin connection
- is "jmx-console". For the Admin connection's security domain, the user is allowed
- to change which LoginModule that "jmx-console" pointing to, however should not change the name of the domain, as this name is
- shared between the "admin-console" application. In existing installations an appropriate security domain may already be configured for use by administrative clients (typically "jmx-console").
- In this case it may be perfectly valid to reuse this existing security domain instead of creating a new teiid-security security domain.</para>
+ <para>The security-domain defined for each transport type is can be different. The JDBC connection .
+ The default name of JDBC connection's security-domain is "teiid-security". In existing installations
+ an appropriate security domain may already be configured for use by administrative clients (typically "admin-console").
+ If the admin connections (CLI and adminshell) are not secured, it is recommended that you secure that that interface
+ by executing one of scripts in the "bin/scripts" directory.</para>
</note>
<section>
@@ -102,19 +101,38 @@
<section id="text-login">
<title>Text Based LoginModule</title>
<para>The UsersRolesLoginModule utilizes simple text files to authenticate users and to define their groups.
-The teiid-jboss-beans.xml configuration file contains an example of how to use UsersRolesLoginModule.
-<note><para>The UsersRolesLoginModule is not recommended for production use and is strongly recommended that you replace this login module.</para></note>
+ The below XML fragment under "security" subsystem shows a Text based login module. Also see standalone-teiid.xml
+ configuration file contains an example of how to use UsersRolesLoginModule.
+ <programlisting><![CDATA[
+ <subsystem xmlns="urn:jboss:domain:security:1.1">
+ <security-domains>
+ <security-domain name="teiid-security" cache-type="default">
+ <authentication>
+ <login-module code="UsersRoles" flag="required">
+ <module-option name="usersProperties" value="teiid-security-users.properties"/>
+ <module-option name="rolesProperties" value="teiid-security-roles.properties"/>
+ </login-module>
+ </authentication>
+ </security-domain>
+ </security-domains>
+ </subsystem>]]></programlisting>
+ <note><para>The UsersRolesLoginModule is not recommended for production use and is strongly recommended
+ that you replace this login module.</para></note>
</para>
- <para>User names and passwords are stored in the <profile>conf/props/teiid-security-users.properties file.
-<example><title>Example user.properties file</title>
-<programlisting><![CDATA[# A users.properties file for use with the UsersRolesLoginModule
+ <para>User names and passwords are stored in the
+ <jboss-as>/modules/org/jboss/teiid/main/conf/teiid-security-users.properties file.
+ These files must be available on classpath
+ <example>
+ <title>Example user.properties file</title>
+ <programlisting><![CDATA[# A users.properties file for use with the UsersRolesLoginModule
# username=password
fred=password
george=password
-...]]></programlisting></example>
+...]]></programlisting>
+ </example>
-JAAS role assignments are stored in the <profile>conf/props/teiid-security-roles.properties file.
+JAAS role assignments are stored in the <jboss-as>/modules/org/jboss/teiid/main/conf/teiid-security-roles.properties file.
<example><title>Example user.properties file</title>
<programlisting><![CDATA[# A roles.properties file for use with the UsersRolesLoginModule
# username=role1,role2,...
@@ -136,26 +154,21 @@
</listitem>
<listitem><para>Include LDAP LoginModule in the JAAS Configuration</para>
- <para>Configure LDAP authentication by editing <profile>conf/login-config.xml. If you wish to configure specifically for teiid, then the security domain teiid-security will need to be created/altered.
- In new installations the more likely option is that you want to configure LDAP based authentication for the AS itself by modifying the "jmx-console" security domain.
+ <para>Configure LDAP authentication by editing standalone-teiid.xml under security subdomain. If you wish to configure specifically for teiid, then the security domain teiid-security will need to be created/altered.
You could do one of the following for Teiid:
<itemizedlist>
<listitem>
- <para>Reuse the jmx-console (or whatever name you choose) security domain for Teiid by changing the teiid configuration &jboss-beans; to point to jmx-console, rather than teiid-security.
+ <para>Reuse the teiid-security (or whatever name you choose) security domain for Teiid by changing the teiid configuration &jboss-beans; to point to teiid-security.
</para>
</listitem>
<listitem>
<para>Follow the same steps to configure an LDAP security domain named teiid-security.
</para>
</listitem>
- <listitem>
- <para>Leave Teiid to use the default file based LoginModule secuirty domain or create an entirely custom security domain configuration.
- </para>
- </listitem>
</itemizedlist>
</para></listitem>
<listitem><para>Obscure the LDAP Password</para><para>Finally, protect the password following <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Application_Platform/5...">these instructions.</ulink>
- Note that the salt must be 8 chars andd see also http://community.jboss.org/message/137756#137756 for more on securing passwords.
+ Note that the salt must be 8 chars and <ulink url="http://community.jboss.org/message/137756#137756">see</ulink> for more on securing passwords.
</para></listitem>
</orderedlist>
</para>
@@ -166,7 +179,7 @@
<title>Kerberos support through GSSAPI</title>
<para>Teiid supports kerberos authentication using GSSAPI, to be used with single sign-on applications.
This service ticket negotiation based authentication is supported through remote JDBC and ODBC drivers and LocalConnections.
- Client configuration is different for all connection types.</para>
+ Client configuration is different for based on connection you are using</para>
<section>
<title>LocalConnection</title>
@@ -179,46 +192,45 @@
<section>
<title>Remote Connections</title>
- <para>On the server, edit the &jboss-beans; under the "SessionService" bean definition, as follows:
- <programlisting><![CDATA[<!-- Sets the authentication Type -->
-<property name="authenticationType">KRB5</property>
-<!-- Security domain used for kerberos authentication -->
-<property name="krb5SecurityDomain">teiid-krb5</property>]]></programlisting>
+ <para>On the server, edit the &jboss-beans; under teiid subsystem on ""transport" definition, add follows:
+ <programlisting><![CDATA[
+<transport name="jdbc" protocol="teiid" socket-binding="teiid-jdbc"/>
+ <authentication security-domain="teiid-security" krb5-domain="krb5-domain"/>
+</transport>
+]]></programlisting>
- Now we need to define a security domain context for kerberos with the name mentioned in above.
+ Now we need to define a security domain context for kerberos with the name mentioned (kbr5-domain)in above.
Since kerberos authorization cannot define authorization roles, we'll define them using another login context.
Given below is a sample configuration to define roles using a UserRolesLoginModule.
<note><para>This configuration replaces the default Teiid login configuration, and you should change the principal
and key tab locations accordingly.</para></note>
<programlisting><![CDATA[<!--login module that negotiates the login conext for kerberos -->
-<application-policy xmlns="urn:jboss:security-beans:1.0" name="teiid-krb5">
- <authentication>
- <login-module code="com.sun.security.auth.module.Krb5LoginModule" flag="required">
- <module-option name="storeKey">true</module-option>
- <module-option name="useKeyTab">true</module-option>
- <module-option name="principal">demo(a)EXAMPLE.COM</module-option>
- <module-option name="keyTab">path/to/krb5.keytab</module-option>
- <module-option name="doNotPrompt">true</module-option>
- <module-option name="debug">false</module-option>
- </login-module>
- </authentication>
-</application-policy>
-
-<!-- teiid's default security domain, replace this with your own if needs to be any other JAAS domain -->
-<application-policy xmlns="urn:jboss:security-beans:1.0" name="teiid-security">
- <authentication>
- <!-- This module assosiates kerberos user with this login set of login modules -->
- <login-module code="org.teiid.jboss.AssosiateCallerIdentityLoginModule" flag="required"/>
- <!-- Login module used for defining roles for user authencated using kerberos, keep the users file empty
- but provide roles in the roles file for users -->
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required">
- <module-option name="password-stacking">useFirstPass</module-option>
- <module-option name="usersProperties">props/teiid-security-users.properties</module-option>
- <module-option name="rolesProperties">props/teiid-security-roles.properties</module-option>
- </login-module>
- </authentication>
-</application-policy>]]></programlisting>
- Edit the "run.conf" or "run.conf.bat" file depending upon the environment in the "${jboss-as}/bin" directory
+ <subsystem xmlns="urn:jboss:domain:security:1.1">
+ <security-domains>
+ <security-domain name="krb5-domain" cache-type="default">
+ <authentication>
+ <login-module code="Kerberos" flag="required">
+ <module-option name="storeKey">true</module-option>
+ <module-option name="useKeyTab">true</module-option>
+ <module-option name="principal">demo(a)EXAMPLE.COM</module-option>
+ <module-option name="keyTab">path/to/krb5.keytab</module-option>
+ <module-option name="doNotPrompt">true</module-option>
+ <module-option name="debug">false</module-option>
+ </login-module>
+ </authentication>
+ </security-domain>
+ <!-- teiid's default security domain, replace this with your own if needs to be any other JAAS domain -->
+ <security-domain name="teiid-security" cache-type="default">
+ <authentication>
+ <login-module code="UsersRoles" flag="required">
+ <module-option name="usersProperties" value="teiid-security-users.properties"/>
+ <module-option name="rolesProperties" value="teiid-security-roles.properties"/>
+ </login-module>
+ </authentication>
+ </security-domain>
+ </security-domains>
+ </subsystem>]]></programlisting>
+ Edit the "standalone.conf" file in the "${jboss-as}/bin" directory
and add the following JVM options (changing the realm and KDC settings according to your environment)
<programlisting><![CDATA[JAVA_OPTS = "$JAVA_OPTS -Djava.security.krb5.realm=EXAMPLE.COM -Djava.security.krb5.kdc=kerberos.example.com -Djavax.security.auth.useSubjectCredsOnly=false"]]></programlisting>
This finishes the configuration on the server side, restart the server and make sure that there were no errors during startup.
@@ -277,32 +289,35 @@
<para>If client wants to pass in simple text password or a certificate or a custom serialized object
as token credential to the data source, user can configure "CallerIdentity" login module.
Using this login module, user can pass-in same credential that user logged into Teiid security domain to the
- data source. Here is a sample configuration, this needs to be configured in "teiid-jboss-beans.xml" file.
+ data source. Here is a sample configuration, this needs to be configured in "standalone-teiid.xml" file.
</para>
- <programlisting><![CDATA[<application-policy xmlns="urn:jboss:security-beans:1.0" name="teiid-security">
- <authentication>
-
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required">
- <module-option name = "password-stacking">useFirstPass</module-option>
- <module-option name="usersProperties">props/teiid-security-users.properties</module-option>
- <module-option name="rolesProperties">props/teiid-security-roles.properties</module-option>
- </login-module>
-
- <login-module code="org.jboss.resource.security.CallerIdentityLoginModule" flag="required">
- <module-option name = "password-stacking">useFirstPass</module-option>
- <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
- </login-module>
+ <programlisting><![CDATA[<subsystem xmlns="urn:jboss:domain:security:1.1">
+ <security-domains>
+ <security-domain name="my-security-domain" cache-type="default">
+ <authentication>
+ <login-module code="UsersRoles" flag="required">
+ <module-option name = "password-stacking">useFirstPass</module-option>
+ <module-option name="usersProperties">props/teiid-security-users.properties</module-option>
+ <module-option name="rolesProperties">props/teiid-security-roles.properties</module-option>
+ </login-module>
+
+ <login-module code="org.jboss.resource.security.CallerIdentityLoginModule" flag="required">
+ <module-option name = "password-stacking">useFirstPass</module-option>
+ <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
+ </login-module>
- </authentication>
-</application-policy>]]></programlisting>
+ </authentication>
+ </security-domain>
+ </security-domains>
+ ]]></programlisting>
- <para>In the -ds.xml file that is defined as the "managedConnectionFactoryName" in the above configuration,
+ <para>In the datasource defined as the "managedConnectionFactoryName" in the above configuration,
you need to add the following element</para>
<programlisting><![CDATA[<security-domain>teiid-security</security-domain>]]></programlisting>
- <para>In the above configuration example, in the primary login module "UsersRolesLoginModule" is setup to hold the
+ <para>In the above configuration example, in the primary login module "UsersRoles" is setup to hold the
passwords in the file, and when user logs in with password, the same password will be also set on the logged in Subject after
authentication. This credentials can be extracted by the data source by asking for Subject's private credentials.</para>
@@ -325,24 +340,28 @@
map to different roles. If a user has multiple roles, the first role that has the credential will be chosen.
Below find the sample configuration.</para>
- <programlisting><![CDATA[<application-policy xmlns="urn:jboss:security-beans:1.0" name="teiid-security">
- <authentication>
+ <programlisting><![CDATA[<subsystem xmlns="urn:jboss:domain:security:1.1">
+ <security-domains>
+ <security-domain name="my-security-domain" cache-type="default">
+ <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required">
- <module-option name = "password-stacking">useFirstPass</module-option>
- <module-option name="usersProperties">props/teiid-security-users.properties</module-option>
- <module-option name="rolesProperties">props/teiid-security-roles.properties</module-option>
- </login-module>
-
- <login-module code="org.teiid.jboss.RoleBasedCredentialMapIdentityLoginModule" flag="required">
- <module-option name = "password-stacking">useFirstPass</module-option>
- <module-option name="credentialMap">props/teiid-credentialmap.properties</module-option>
- <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
- </login-module>
+ <login-module code="UsersRoles" flag="required">
+ <module-option name = "password-stacking">useFirstPass</module-option>
+ <module-option name="usersProperties">teiid-security-users.properties</module-option>
+ <module-option name="rolesProperties">teiid-security-roles.properties</module-option>
+ </login-module>
+
+ <login-module code="org.teiid.jboss.RoleBasedCredentialMapIdentityLoginModule" flag="required">
+ <module-option name = "password-stacking">useFirstPass</module-option>
+ <module-option name="credentialMap">teiid-credentialmap.properties</module-option>
+ <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
+ </login-module>
- </authentication>
-</application-policy>]]></programlisting>
- <para>In the -ds.xml file that is defined as the "managedConnectionFactoryName" in the above configuration,
+ </authentication>
+ </security-domain>
+ </security-domains>]]></programlisting>
+
+ <para>In the datasource that is defined as the "managedConnectionFactoryName" in the above configuration,
you need to add the following element</para>
<programlisting><![CDATA[<security-domain>teiid-security</security-domain>]]></programlisting>
@@ -380,50 +399,40 @@
<section id="ssl_config">
<title>Configuring SSL</title>
- <para>The Teiid's configuration file
- <code><jboss-install>/server/<profile>/deploy/teiid/teiid-jboss-beans.xml</code>,
- contains the properties to configure SSL per socket transport.</para>
+ <para>The Teiid's configuration file(s)
+ <code>standalone-teiid.xml/domain-teiid.xml</code>, contain transports defined for access to Teiid, and transport
+ contain the properties to configure SSL for socket per transport.</para>
<itemizedlist>
- <para>There are three socket transports, each with it's own SSL configuration:</para>
- <listitem><para>JDBC Connections - uses the <code>JdbcSslConfiguration</code> bean configuration. Defaults to only encrypt login traffic, none of the other properties are used.</para></listitem>
- <listitem><para>Admin Connections - uses the <code>AdminSslConfiguration</code> bean configuration. Defaults to encrypting all traffic with anonymous SSL, none of the other properties are used.</para></listitem>
- <listitem><para>ODBC Connections - uses the <code>OdbcSslConfiguration</code> bean configuration. Defaults to no SSL.</para></listitem>
+ <para>There are two types of transports, each with it's own SSL configuration:</para>
+ <listitem><para>"teiid" - Default configuration to only encrypt login traffic, none of the other properties are used.</para></listitem>
+ <listitem><para>"pg" type - Defaults to no SSL.</para></listitem>
</itemizedlist>
<example><title>Example Configuration</title>
- <programlisting><![CDATA[<bean name="JdbcSslConfiguration" class="org.teiid.transport.SSLConfiguration">
- <property name="mode">login</property>
- <property name="keystoreFilename">cert.keystore</property>
- <property name="keystorePassword">passwd</property>
- <property name="keystoreType">JKS</property>
- <property name="sslProtocol">SSLv3</property>
- <property name="keymanagementAlgorithm">false</property>
- <property name="truststoreFilename">cert.truststore</property>
- <property name="truststorePassword">passwd</property>
- <!-- 1-way, 2-way, anonymous -->
- <property name="authenticationMode">1-way</property>
- <!-- an optional property to constrain the cipher suites to be negotiated between server and client -->
- <property name="enabledCipherSuites">SSL_RSA_WITH_RC4_128_MD5,SSL_RSA_WITH_RC4_128_SHA</property>
-</bean>]]></programlisting>
+ <programlisting><![CDATA[<ssl mode="login" authentication-mode="1-way" ssl-protocol="SSLv3" keymanagement-algorithm="algo"
+ enabled-cipher-suites="SSL_RSA_WITH_RC4_128_MD5,SSL_RSA_WITH_RC4_128_SHA">
+ <keystore name="cert.keystore" password="passwd" type="JKS"/>
+ <truststore name="cert.truststore" password="passwd"/>
+ </ssl>]]></programlisting>
</example>
<itemizedlist>
<title>Properties</title>
<listitem><para>mode - diabled|login|enabled, disabled = no transport or message level security will be used.
login = only the login traffic will be encrypted at a message level using 128 bit AES with an ephemerial DH key exchange. No other config values are needed in this mode.
enabled = traffic will be secured using the other configuration properties.</para></listitem>
- <listitem><para>sslProtocol- Type of SSL protocol to be used. Default is TLSv1</para></listitem>
- <listitem><para>keystoreType - Keystore type created by the keytool. Default "JKS" is used.</para></listitem>
- <listitem><para>authenticationMode - anonymous|1-way|2-way, Type of <link linkend="ssl_auth">SSL Authentication Mode</link>.</para></listitem>
- <listitem><para>keymanagementAlgorithm - Type of key algorithm used. Default
+ <listitem><para>ssl-protocol- Type of SSL protocol to be used. Default is TLSv1</para></listitem>
+ <listitem><para>keystore/type - Keystore type created by the keytool. Default "JKS" is used.</para></listitem>
+ <listitem><para>authentication-mode - anonymous|1-way|2-way, Type of <link linkend="ssl_auth">SSL Authentication Mode</link>.</para></listitem>
+ <listitem><para>keymanagement-algorithm - Type of key algorithm used. Default
is based upon the VM, e.g. "SunX509"</para></listitem>
- <listitem><para>keystoreFilename - The file name of the keystore, which contains the
+ <listitem><para>keystore/name - The file name of the keystore, which contains the
private key of the Server. This must be available in the classpath of Teiid Server.</para></listitem>
<listitem><para>keystorePassword - password for the keystore.</para></listitem>
- <listitem><para>truststoreFilename - if "authenticationMode" is chosen
+ <listitem><para>truststore/name - if "authenticationMode" is chosen
as "2-way", then this property must be provided. This is the truststore that contains the
public key for the client. Depending upon how you created the keystore and truststores,
this may be same file as defined under "keystoreFilename" property.</para></listitem>
- <listitem><para>truststorePassword - password for the truststore. </para></listitem>
- <listitem><para>enabledCipherSuites - A comma separated list of cipher suites allowed for encryption between server and client. The values must be valid supported cipher suites otherwise SSL connections will fail.</para></listitem>
+ <listitem><para>truststore/password - password for the truststore. </para></listitem>
+ <listitem><para>enabled-cipher-suites - A comma separated list of cipher suites allowed for encryption between server and client. The values must be valid supported cipher suites otherwise SSL connections will fail.</para></listitem>
</itemizedlist>
<section id="ssl_auth">
<title>SSL Authentication Modes</title>
Modified: branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/vdb-deployment.xml
===================================================================
--- branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/vdb-deployment.xml 2011-11-07 13:37:11 UTC (rev 3616)
+++ branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/vdb-deployment.xml 2011-11-07 16:04:44 UTC (rev 3617)
@@ -22,22 +22,32 @@
<section>
<title>Direct File Deployment</title>
- <para>Copy the VDB file into the "<jboss-install>/server/<profile>/deploy" directory.
+ <para>Copy the VDB file into the "<jboss-install>/standalone/deployments" directory. Also, create file a
+ empty marker file with same name as the VDB with extension ".dodeploy" in the same directory.
Make sure that there are no other VDB files with the same name. If a VDB already exists with
the same name, then this VDB will be replaced with the new VDB. This is the simplest way to deploy a VDB. This is mostly
- designed for quick deployment during development, when the Teiid server is available
- locally on the developer machine.</para>
+ designed for quick deployment during development, when the Teiid server is available locally on the developer machine.</para>
+ <note><para>This only works in the Standalone mode. For domain mode, you can use any other available methods.</para>
+ </note>
</section>
<section>
<title>Admin Console Deployment (Web)</title>
- <para>Use the JOPR-based web console configuration system. Check out the JOPR plugin at:</para>
+ <para>Use the admin web console at:</para>
<programlisting><![CDATA[http://<host>:<port>/admin-console]]></programlisting>
- <para>More details for this can be found in the <link linkend="vdb_deploy">Admin Console VDB deployment section.</link>This is the easiest way
- to deploy a VDB to a remote server.</para>
+ <para>More details for this can be found in the <link linkend="vdb_deploy">Admin Console VDB deployment section.</link>
+ This is the easiest way to deploy a VDB to a remote server.</para>
</section>
+
+ <section>
+ <title>CLI based Deployment</title>
+ <para>JBoss AS provides command line interface (CLI) for doing any kind of administrative task.
+ Execute "bin/jboss-admin.sh --connect" command and run
+ <programlisting><![CDATA[deploy /path/to/my.vdb]]></programlisting>
+ to deploy the VDB. Check out CLI documentation for more general usage of the CLI.</para>
+ </section>
<section>
<title>AdminShell Deployment</title>
@@ -61,109 +71,126 @@
<title>Deploying VDB Dependencies</title>
<para>Apart from deploying the VDB, the user is also responsible for providing all the necessary
dependent libraries, configuration for creating the data sources that are needed by the models (schemas)
- defined in "META-INF/vdb.xml" file inside your VDB. For example, if you are trying to integrate Oracle and File sources in your VDB, then you are responsible for
- providing the JDBC driver for the Oracle source and any necessary documents and configuration that are needed by the File Translator.</para>
+ defined in "META-INF/vdb.xml" file inside your VDB. For example, if you are trying to integrate Oracle and File sources
+ in your VDB, then you are responsible for
+ providing the JDBC driver for the Oracle source and any necessary documents and configuration that are needed by
+ the File Translator.</para>
- <para>Data source instances may be used by only one VDB, or may be shared with as many VDBs or other applications as makes since for your deployments.
+ <para>Data source instances may be used by only one VDB, or may be shared with as many VDBs or other applications
+ as makes since for your deployments.
Consider sharing connections to sources that have heavy-weight and resource constrained connections.</para>
- <para>With the exception of JDBC, each of the data sources supported by has a corresponding .rar (zip format) file in <jboss-install>/server/<profile>/deploy/teiid/connectors.
- If not using JOPR or other tooling to create your -ds.xml files, you can consult the .rar files META-INF/ra.xml for a full description of how the source can be configured.
+ <para>With the exception of JDBC sources, other supported data sources have a corresponding .rar (zip format) file
+ in <jboss-install>/standalone/deployments directory.
+ Either directly edit the standalone-teiid.xml or use CLI or Admin API to create the required data sources.
+ You can consult the .rar files META-INF/ra.xml for a full description of how the RAR based source needs to be configured.
</para>
- <para>Some -ds.xml files may contain passwords or other sensitive information.
- See the WIKI article <ulink url="http://community.jboss.org/wiki/EncryptingDataSourcePasswords">EncryptingDataSourcePasswords</ulink> to not store passwords in plain text.</para>
+ <para>Some data sources may contain passwords or other sensitive information.
+ See the WIKI article <ulink url="http://community.jboss.org/wiki/EncryptingDataSourcePasswords">EncryptingDataSourcePasswords</ulink>
+ to not store passwords in plain text.</para>
- <para>Once the VDB and its dependencies are deployed, then client applications can connect using the JDBC API. If there are any errors in the deployment, a connection attempt will not be successful and a message will be logged.
- You can use the <link linkend="admin-console">admin-console</link> tool or check the log files for errors and correct them before proceeding.</para>
+ <para>Once the VDB and its dependencies are deployed, then client applications can connect using the JDBC API.
+ If there are any errors in the deployment, a connection attempt will not be successful and a message will be logged.
+ You can use the <link linkend="admin-console">admin-console</link> tool or check the log files for
+ errors and correct them before proceeding.</para>
<section>
<title>JDBC Data Sources</title>
- <para>The following is an example highlighting configuring an Oracle data source. The process is nearly identical regardless of the vendor.
- Typically only the client jar and the setting in the -ds.xml file change.</para>
- <para>There are templates for all the data sources in the "<jboss-install>/docs/examples/jca" directory.</para>
+ <para>The following is an example highlighting configuring an Oracle data source. The process is nearly
+ identical regardless of the database vendor. Typically only the client JDBC jar and the settings
+ like connection url and user credentails change.</para>
+ <para>There are templates for all the data sources in the "<jboss-install>/docs/teiid/datasources" directory.
+ A complete description how a data source can be added into JBoss AS7 is described
+ <ulink url="http://community.jboss.org/docs/DOC-16657">here</ulink>.</para>
<orderedlist>
- <listitem> <para>Copy the Oracle JDBC JAR file into "<jboss-install>/server/<profile>/lib" directory </para> </listitem>
- <listitem> <para>Create a "data source" to the Oracle instance in the JBoss container. This typically
- done by creating "xxx-ds.xml" file and copying this file to the "<jboss-install>/server/<profile>/deploy"
- directory. The following shows a "-ds.xml" file template for Oracle. You can also use admin-console to create this data source. </para>
- <programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
- <xa-datasource>
- <jndi-name>OracleDS</jndi-name>
- <!-- uncomment to enable interleaving <interleaving/> -->
- <isSameRM-override-value>false</isSameRM-override-value>
- <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
- <xa-datasource-property name="URL">jdbc:oracle:oci8:@tc</xa-datasource-property>
- <xa-datasource-property name="User">scott</xa-datasource-property>
- <xa-datasource-property name="Password">tiger</xa-datasource-property>
- <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
- <!--valid-connection-checker-class-name>
- org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker
- </valid-connection-checker-class-name-->
-
- <!-- Checks the Oracle error codes and messages for fatal errors -->
- <exception-sorter-class-name>
- org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter
- </exception-sorter-class-name>
-
- <!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
- <no-tx-separate-pools/>
- <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
- <metadata>
- <type-mapping>Oracle9i</type-mapping>
- </metadata>
- </xa-datasource>
-</datasources>]]></programlisting>
+ <listitem> <para>Copy the Oracle JDBC JAR file into "<jboss-install>/standalone/deployments" directory, or use CLI
+ and use "deploy" command to deploy the jar file.</para> </listitem>
+ <listitem> <para>Create a "data source" to the Oracle instance in the JBoss container. This typically is done
+ by using "admin-console" application or CLI applications. You can also use Admin API to create this data source.
+ You can manually copy the following xml fragment under "data source" subsystem in standlone-teiid.xml file </para>
+ <programlisting><![CDATA[
+ <datasource jndi-name="java:/OracleDS" pool-name="OracleDS" enabled="true" jta="true" use-java-context="true" use-ccm="true">
+ <connection-url>jdbc:oracle:thin:{host}:1521:orcl</connection-url>
+ <driver>ojdbc6.jar</driver>
+ <pool>
+ <prefill>false</prefill>
+ <use-strict-min>false</use-strict-min>
+ <flush-strategy>FailingConnectionOnly</flush-strategy>
+ </pool>
+ <security>
+ <user-name>{user}</user-name>
+ <password>{password}</password>
+ </security>
+ </datasource> ]]></programlisting>
</listitem>
</orderedlist>
- <para>Template files [xxx-ds.xml] for different databases can found at {jboss-as}/docs/examples/jca, and also
- additional sources like ingres, mondrian, intersystems-cache etc that Teiid suports can be found at
- {jboss-as}/server/{profile}/teiid-examples/jca directory. </para>
+ <para>Template files for different databases can found at {jboss-as}/docs/teiid/datasources directory</para>
</section>
<section>
<title>File Data Sources</title>
- <para>File data sources use a Teiid specific JCA connector. You need to create "-ds.xml" file and copy it to the
- "<jboss-install>/server/<profile>/deploy" directory.</para>
+ <para>File data sources use a Teiid specific JCA connector. You need to create following XML fragment, and copy it
+ under "resource-adapters" subsystem in standalone.xml file or use the CLI to create connection factory.</para>
<example>
<title>Template for creating a File based data source</title>
- <programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<connection-factories>
- <no-tx-connection-factory>
- <jndi-name>text-source</jndi-name>
- <rar-name>teiid-connector-file.rar</rar-name>
- <connection-definition>javax.resource.cci.ConnectionFactory</connection-definition>
- <config-property name="ParentDirectory">path-to-the-directory-of-data-file</config-property>
-
- <!-- Optional properties -->
-
- <!-- Set FileMapping to redirect specific relative paths (case sensitive) to alternative locations.
- The string value specifies a map in the format key=value(,key=value)*
- -->
- <!-- <config-property name="FileMapping" type="java.lang.String">file1.txt=fileX.txt,file2.txt=fileY.txt</config-property> -->
-
- <!-- Set AllowParentPaths to false to disallow .. in paths.
- This prevent requesting files that are not contained in the parent directory -->
- <config-property name="AllowParentPaths" type="java.lang.Boolean">true</config-property>
- </no-tx-connection-factory>
-</connection-factories>]]></programlisting></example>
+ <programlisting><![CDATA[<!-- If susbsytem is already defined, only copy the contents under it and edit to suit your needs -->
+<subsystem xmlns="urn:jboss:domain:resource-adapters:1.0">
+ <resource-adapters>
+ <resource-adapter>
+ <archive>teiid-connector-file.rar</archive>
+ <transaction-support>NoTransaction</transaction-support>
+ <connection-definitions>
+ <connection-definition class-name="org.teiid.resource.adapter.file.FileManagedConnectionFactory"
+ jndi-name="java:/fileDS"
+ enabled="true"
+ use-java-context="true"
+ pool-name="file-ds">
+
+ <!-- Directory where the data files are stored -->
+ <config-property name="ParentDirectory">/home/rareddy/testing/</config-property>
+
+ <!-- Optional properties -->
+
+ <!-- Set FileMapping to redirect specific relative paths (case sensitive) to alternative locations.
+ The string value specifies a map in the format key=value(,key=value)*
+ -->
+ <!-- <config-property name="FileMapping">file1.txt=fileX.txt,file2.txt=fileY.txt</config-property> -->
+
+ <!-- Set AllowParentPaths to false to disallow .. in paths.
+ This prevent requesting files that are not contained in the parent directory -->
+ <config-property name="AllowParentPaths">true</config-property>
+ </connection-definition>
+ </connection-definitions>
+ </resource-adapter>
+ </resource-adapters>
+</subsystem>]]></programlisting></example>
</section>
<section id="ws-ds">
<title>Web Service Data Sources</title>
- <para>Web service data sources use a Teiid specific JCA connector. You need to create "-ds.xml" file and copy it to the
- "<jboss-install>/server/<profile>/deploy" directory.</para>
+ <para>Web service data sources use a Teiid specific JCA connector. You need to create following XML fragment, and copy it
+ under "resource-adapters" subsystem in standalone.xml file or use the CLI to create connection factory.</para>
<example>
<title>Template for creating a web service based data source</title>
- <programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<connection-factories>
- <no-tx-connection-factory>
- <jndi-name>somewhere-ws-source</jndi-name>
- <rar-name>teiid-connector-ws.rar</rar-name>
- <connection-definition>javax.resource.cci.ConnectionFactory</connection-definition>
- <config-property name="EndPoint">http://somewhere.com</config-property>
- </no-tx-connection-factory>
-</connection-factories>]]></programlisting></example>
+ <programlisting><![CDATA[<!-- If susbsytem is already defined, only copy the contents under it and edit to suit your needs -->
+<subsystem xmlns="urn:jboss:domain:resource-adapters:1.0">
+ <resource-adapters>
+ <resource-adapter>
+ <archive>teiid-connector-ws.rar</archive>
+ <transaction-support>NoTransaction</transaction-support>
+ <connection-definitions>
+ <connection-definition class-name="org.teiid.resource.adapter.ws.WSManagedConnectionFactory"
+ jndi-name="java:/wsDS"
+ enabled="true"
+ use-java-context="true"
+ pool-name="ws-ds">
+
+ <config-property name="EndPoint">http://somewhere.com</config-property>
+ </connection-definition>
+ </connection-definitions>
+ </resource-adapter>
+ </resource-adapters>
+</subsystem>]]></programlisting></example>
<section>
<title>CXF Configuration</title>
<para>Each web service data source may choose a particular CXF config file and port configuration.
@@ -186,18 +213,28 @@
And just as with the general configuration, each data source is limited to specifing only a single port configration to use.</para>
<example>
<title>Example WS-Security enabled data source</title>
- <programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<connection-factories>
- <no-tx-connection-factory>
- <jndi-name>somewhere-ws-source</jndi-name>
- <rar-name>teiid-connector-ws.rar</rar-name>
- <connection-definition>javax.resource.cci.ConnectionFactory</connection-definition>
- <config-property name="EndPoint">http://somewhere.com</config-property>
- <config-property name="ConfigFile">${jboss.server.home.dir}/server/default/conf/xxx-jbossws-cxf.xml</config-property>
- <config-property name="ConfigName">port_x</config-property>
- <config-property name="SecurityType">WSSecurity</config-property>
- </no-tx-connection-factory>
-</connection-factories>]]></programlisting>
+ <programlisting><![CDATA[<!-- If susbsytem is already defined, only copy the contents under it and edit to suit your needs -->
+<subsystem xmlns="urn:jboss:domain:resource-adapters:1.0">
+ <resource-adapters>
+ <resource-adapter>
+ <archive>teiid-connector-ws.rar</archive>
+ <transaction-support>NoTransaction</transaction-support>
+ <connection-definitions>
+ <connection-definition class-name="org.teiid.resource.adapter.ws.WSManagedConnectionFactory"
+ jndi-name="java:/wsDS"
+ enabled="true"
+ use-java-context="true"
+ pool-name="ws-ds">
+
+ <config-property name="EndPoint">http://somewhere.com</config-property>
+ <config-property name="ConfigFile">${jboss.server.home.dir}/server/default/conf/xxx-jbossws-cxf.xml</config-property>
+ <config-property name="ConfigName">port_x</config-property>
+ <config-property name="SecurityType">WSSecurity</config-property>
+ </connection-definition>
+ </connection-definitions>
+ </resource-adapter>
+ </resource-adapters>
+</subsystem>]]></programlisting>
<para>Corresponding xxx-jbossws-cxf.xml file that adds a timestamp to the SOAP header</para>
<programlisting><![CDATA[<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -238,19 +275,29 @@
<para>The CXF config property may also be used to control the logging of requests and responses for specific or all ports. Logging, when enabled, will be performed at an INFO level to the org.apache.cxf.interceptor context.</para>
<example>
<title>Example logging data source</title>
- <programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<connection-factories>
- <no-tx-connection-factory>
- <jndi-name>somewhere-ws-source</jndi-name>
- <rar-name>teiid-connector-ws.rar</rar-name>
- <connection-definition>javax.resource.cci.ConnectionFactory</connection-definition>
- <config-property name="EndPoint">http://somewhere.com</config-property>
- <config-property name="ConfigFile">${jboss.server.home.dir}/server/default/conf/xxx-jbossws-cxf.xml</config-property>
- <config-property name="ConfigName">port_y</config-property>
- </no-tx-connection-factory>
-</connection-factories>]]></programlisting>
-<para>Corresponding xxx-jbossws-cxf.xml</para>
-<programlisting><![CDATA[<beans xmlns="http://www.springframework.org/schema/beans"
+ <programlisting><![CDATA[<!-- If susbsytem is already defined, only copy the contents under it and edit to suit your needs -->
+<subsystem xmlns="urn:jboss:domain:resource-adapters:1.0">
+ <resource-adapters>
+ <resource-adapter>
+ <archive>teiid-connector-ws.rar</archive>
+ <transaction-support>NoTransaction</transaction-support>
+ <connection-definitions>
+ <connection-definition class-name="org.teiid.resource.adapter.ws.WSManagedConnectionFactory"
+ jndi-name="java:/wsDS"
+ enabled="true"
+ use-java-context="true"
+ pool-name="ws-ds">
+
+ <config-property name="EndPoint">http://somewhere.com</config-property>
+ <config-property name="ConfigFile">${jboss.server.home.dir}/server/default/conf/xxx-jbossws-cxf.xml</config-property>
+ <config-property name="ConfigName">port_y</config-property>
+ </connection-definition>
+ </connection-definitions>
+ </resource-adapter>
+ </resource-adapters>
+</subsystem>]]></programlisting>
+ <para>Corresponding xxx-jbossws-cxf.xml</para>
+ <programlisting><![CDATA[<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxws="http://cxf.apache.org/jaxws"
xsi:schemaLocation="http://www.springframework.org/schema/beans
@@ -266,14 +313,14 @@
</jaxws:client>
</beans>]]></programlisting>
-</example>
+ </example>
</section>
<section>
<title>Transport Settings</title>
<para>The CXF config property may also be used to control low level aspects of the HTTP transport. See the <ulink url="http://cxf.apache.org/docs/client-http-transport-including-ssl-support.html">CXF documentation</ulink> for all possible options.</para>
<example>
<title>Example Disabling Hostname Verification</title>
-<programlisting><![CDATA[<beans xmlns="http://www.springframework.org/schema/beans"
+ <programlisting><![CDATA[<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
xsi:schemaLocation="http://cxf.apache.org/transports/http/configuration
@@ -286,29 +333,38 @@
<http-conf:tlsClientParameters disableCNcheck="true" />
</http-conf:conduit>
-</beans>
-]]></programlisting>
-</example>
- </section>
- </section>
+</beans>]]></programlisting>
+ </example>
+ </section>
+ </section>
- <section>
+ <section>
<title>Salesforce Data Sources</title>
- <para>Salesforce data sources use a Teiid specific JCA connector. You need to create "-ds.xml" file and copy it to the
- "<jboss-install>/server/<profile>/deploy" directory.</para>
+ <para>Salesforce data sources use a Teiid specific JCA connector. You need to create following XML fragment, and copy it
+ under "resource-adapters" subsystem in standalone.xml file or use the CLI to create connection factory.</para>
<example>
<title>Template for creating a Salesforce based data source</title>
- <programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<connection-factories>
- <no-tx-connection-factory>
- <jndi-name>sf-source</jndi-name>
- <rar-name>teiid-connector-salesforce.rar</rar-name>
- <connection-definition>javax.resource.cci.ConnectionFactory</connection-definition>
- <config-property name="URL">https://test.salesforce.com/services/Soap/u/10.0</config-property>
- <config-property name="username">username</config-property>
- <config-property name="password">password</config-property>
- </no-tx-connection-factory>
-</connection-factories>]]></programlisting></example>
+ <programlisting><![CDATA[<!-- If susbsytem is already defined, only copy the contents under it and edit to suit your needs -->
+<subsystem xmlns="urn:jboss:domain:resource-adapters:1.0">
+ <resource-adapters>
+ <resource-adapter>
+ <archive>teiid-connector-salesforce.rar</archive>
+ <transaction-support>NoTransaction</transaction-support>
+ <connection-definitions>
+ <connection-definition class-name="org.teiid.resource.adapter.salesforce.SalesForceManagedConnectionFactory"
+ jndi-name="java:/sfDS"
+ enabled="true"
+ use-java-context="true"
+ pool-name="sf-ds">
+
+ <config-property name="URL">https://test.salesforce.com/services/Soap/u/10.0</config-property>
+ <config-property name="username">username</config-property>
+ <config-property name="password">password</config-property>
+ </connection-definition>
+ </connection-definitions>
+ </resource-adapter>
+ </resource-adapters>
+</subsystem>]]></programlisting></example>
<section>
<title>CXF Configuration</title>
@@ -331,21 +387,31 @@
<section>
<title>LDAP Data Sources</title>
- <para>LDAP data sources use a Teiid specific JCA connector. You need to create "-ds.xml" file and copy it to the
- "<jboss-install>/server/<profile>/deploy" directory.</para>
+ <para>LDAP data sources use a Teiid specific JCA connector. You need to create following XML fragment, and copy it
+ under "resource-adapters" subsystem in standalone.xml file or use the CLI to create connection factory.</para>
<example>
<title>Template for creating an LDAP based data source</title>
- <programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<connection-factories>
- <no-tx-connection-factory>
- <jndi-name>ldap-source</jndi-name>
- <rar-name>teiid-connector-ldap.rar</rar-name>
- <connection-definition>javax.resource.cci.ConnectionFactory</connection-definition>
- <config-property name="LdapAdminUserDN">cn=x,ou=y,dc=z</config-property>
- <config-property name="LdapAdminUserPassword">password</config-property>
- <config-property name="LdapUrl">ldap://ldapServer:389</config-property>
- </no-tx-connection-factory>
-</connection-factories>]]></programlisting></example>
+ <programlisting><![CDATA[<!-- If susbsytem is already defined, only copy the contents under it and edit to suit your needs -->
+<subsystem xmlns="urn:jboss:domain:resource-adapters:1.0">
+ <resource-adapters>
+ <resource-adapter>
+ <archive>teiid-connector-ldap.rar</archive>
+ <transaction-support>NoTransaction</transaction-support>
+ <connection-definitions>
+ <connection-definition class-name="org.teiid.resource.adapter.ldap.LDAPManagedConnectionFactory"
+ jndi-name="java:/ldapDS"
+ enabled="true"
+ use-java-context="true"
+ pool-name="ldap-ds">
+
+ <config-property name="LdapAdminUserDN">cn=x,ou=y,dc=z</config-property>
+ <config-property name="LdapAdminUserPassword">password</config-property>
+ <config-property name="LdapUrl">ldap://ldapServer:389</config-property>
+ </connection-definition>
+ </connection-definitions>
+ </resource-adapter>
+ </resource-adapters>
+</subsystem>]]></programlisting></example>
</section>
</section>
Modified: branches/as7/engine/src/main/resources/org/teiid/query/i18n.properties
===================================================================
--- branches/as7/engine/src/main/resources/org/teiid/query/i18n.properties 2011-11-07 13:37:11 UTC (rev 3616)
+++ branches/as7/engine/src/main/resources/org/teiid/query/i18n.properties 2011-11-07 16:04:44 UTC (rev 3617)
@@ -753,7 +753,7 @@
SetClause.resolvingError=Cannot set symbol ''{1}'' with expected type {2} to expression ''{0}''
NewCalculateCostUtil.badCost=Unexpected format encountered for max or min value
-WorkerPool.Max_thread=Reached maximum thread count "{0}" for worker pool "{1}" with a queue size high of "{2}". Queued work waited {3} ms prior to executing. To avoid queuing of work you may consider increasing "max-threads" or decreasing the "max-active-plans" in the "teiid-jboss-beans.xml" file.
+WorkerPool.Max_thread=Reached maximum thread count "{0}" for worker pool "{1}" with a queue size high of "{2}". Queued work waited {3} ms prior to executing. To avoid queuing of work you may consider increasing "max-threads" or decreasing the "max-active-plans" in the "standalone-teiid.xml" file.
WorkerPool.uncaughtException=Uncaught exception processing work
Modified: branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java
===================================================================
--- branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java 2011-11-07 13:37:11 UTC (rev 3616)
+++ branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java 2011-11-07 16:04:44 UTC (rev 3617)
@@ -246,11 +246,13 @@
socket.setOutputBufferSize(Element.TRANSPORT_OUT_BUFFER_SIZE_ATTRIBUTE.asInt(node));
}
+ boolean sslEnabled = false;
SSLConfiguration ssl = new SSLConfiguration();
ssl.setAuthenticationMode(SSLConfiguration.ANONYMOUS);
if (Element.SSL_MODE_ATTRIBUTE.isDefined(node)) {
ssl.setMode(Element.SSL_MODE_ATTRIBUTE.asString(node));
+ sslEnabled = true;
}
if (Element.SSL_SSL_PROTOCOL_ATTRIBUTE.isDefined(node)) {
@@ -287,7 +289,9 @@
if (Element.SSL_TRUSTSTORE_PASSWORD_ATTRIBUTE.isDefined(node)) {
ssl.setTruststorePassword(Element.SSL_TRUSTSTORE_PASSWORD_ATTRIBUTE.asString(node));
}
- socket.setSSLConfiguration(ssl);
+ if (sslEnabled) {
+ socket.setSSLConfiguration(ssl);
+ }
return socket;
}
Modified: branches/as7/runtime/src/main/resources/org/teiid/runtime/i18n.properties
===================================================================
--- branches/as7/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2011-11-07 13:37:11 UTC (rev 3616)
+++ branches/as7/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2011-11-07 16:04:44 UTC (rev 3617)
@@ -31,7 +31,7 @@
# session service
SessionServiceImpl.invalid_session=The specified session ID "{0}" is invalid. It cannot be found in the userbase.
-SessionServiceImpl.reached_max_sessions = The server has reached the maximum number of sessions of {0} as defined by the property "session-max-limit". If more sessions are required, modify this property value in the "teiid-jboss-beans.xml" file.
+SessionServiceImpl.reached_max_sessions = The server has reached the maximum number of sessions of {0} as defined by the property "session-max-limit". If more sessions are required, modify this property value in the "standalone-teiid.xml" file.
SessionServiceImpl.expireSession = Expiring session {0}
SessionServiceImpl.keepaliveFailed = Keepalive failed for session {0}
SessionServiceImpl.The_username_0_and/or_password_are_incorrect=The username "{0}" and/or password and/or payload token could not be authenticated by any membership domain.
12 years, 6 months
- 1
- 0
teiid SVN: r3616 - trunk/runtime/src/main/java/org/teiid/services.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-11-07 08:37:11 -0500 (Mon, 07 Nov 2011)
New Revision: 3616
Modified:
trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java
Log:
TEIID-1750 making the type consistent for memoryBufferSpace
Modified: trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java 2011-11-04 21:29:50 UTC (rev 3615)
+++ trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java 2011-11-07 13:37:11 UTC (rev 3616)
@@ -264,8 +264,8 @@
}
@ManagementProperty(description="Memory buffer space used by the buffer manager in MB. -1 determines the setting automatically from the maxReserveKB (default -1). This value cannot be smaller than maxStorageObjectSize.")
- public long getMemoryBufferSpace() {
- return memoryBufferSpace;
+ public int getMemoryBufferSpace() {
+ return (int)memoryBufferSpace;
}
@ManagementProperty(description="The maximum size of a buffer managed object (typically a table page or a results batch) in bytes (default 8388608).")
12 years, 6 months
- 1
- 0
teiid SVN: r3615 - branches/as7/documentation/developer-guide/src/main/docbook/en-US/content.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2011-11-04 17:29:50 -0400 (Fri, 04 Nov 2011)
New Revision: 3615
Modified:
branches/as7/documentation/developer-guide/src/main/docbook/en-US/content/translator-api.xml
Log:
TEIID-1720: removing duplicate section id
Modified: branches/as7/documentation/developer-guide/src/main/docbook/en-US/content/translator-api.xml
===================================================================
--- branches/as7/documentation/developer-guide/src/main/docbook/en-US/content/translator-api.xml 2011-11-04 17:36:58 UTC (rev 3614)
+++ branches/as7/documentation/developer-guide/src/main/docbook/en-US/content/translator-api.xml 2011-11-04 21:29:50 UTC (rev 3615)
@@ -1538,7 +1538,7 @@
</section>
- <section id="dependencies">
+ <section>
<title>Adding Dependent Libraries</title>
<para>Add MANIFEST.MF file in the MATA-INF directory, and the following line to add the core Teiid API dependencies for
resource adapter. <emphasis>Dependencies: org.jboss.teiid.common-core,org.jboss.teiid.api,javax.api</emphasis>
12 years, 6 months
- 1
- 0
teiid SVN: r3614 - trunk/documentation/developer-guide/src/main/docbook/en-US/content.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2011-11-04 13:36:58 -0400 (Fri, 04 Nov 2011)
New Revision: 3614
Modified:
trunk/documentation/developer-guide/src/main/docbook/en-US/content/translator-api.xml
Log:
misc: fixing "code" tag
Modified: trunk/documentation/developer-guide/src/main/docbook/en-US/content/translator-api.xml
===================================================================
--- trunk/documentation/developer-guide/src/main/docbook/en-US/content/translator-api.xml 2011-11-04 14:57:30 UTC (rev 3613)
+++ trunk/documentation/developer-guide/src/main/docbook/en-US/content/translator-api.xml 2011-11-04 17:36:58 UTC (rev 3614)
@@ -257,17 +257,27 @@
<section>
<title>Asynchronous Executions</title>
- <para>In some scenarios, a translator needs to execute
- asynchronously and allow the executing thread to perform other work. To allow this, you should Throw a <code>DataNotAvailableExecption</code> during a retrival method, rather than explicitly waiting or sleeping for the results.
- <note><para>A <code>DataNotAvailableException</code> should not be thrown by the execute method.</para><note>
- The
- <code>DataNotAvailableException</code> may take a delay parameter in its
- constructor to indicate how long the system should wait befor polling
- for results. Any non-negative value indicates a time until the next polling should be performed.
- The <code>DataNotAvailableException.NO_POLLING</code> exception (or any DataNotAvailableException with a negative delay) can be thrown to indicate that
- the execution will call <code>ExecutionContext.dataAvailable<c/ode> to indicate processing should resume.
- </para>
- <note><para>Since the exection and the associated connection are not closed until the work has completed, care should be taken if using asynchronous executions that hold a lot of state.</para></note>
+ <para>
+ In some scenarios, a translator needs to execute
+ asynchronously and allow the executing thread to perform other work. To allow this, you should Throw a
+ <code>DataNotAvailableExecption</code>
+ during a retrival method, rather than explicitly waiting or sleeping for the results.
+ <note>
+ <para>
+ A <code>DataNotAvailableException</code> should not be thrown by the execute method. The
+ <code>DataNotAvailableException</code> may take a delay parameter in its
+ constructor to indicate how long the system should wait befor polling
+ for results. Any non-negative value indicates a time until the next polling should be performed.
+ The
+ <code>DataNotAvailableException.NO_POLLING</code>
+ exception (or any DataNotAvailableException with a negative delay) can be thrown to indicate that
+ the execution will call <code>ExecutionContext.dataAvailable</code> to indicate processing should resume.
+ </para>
+ </note>
+ </para>
+ <note>
+ <para>Since the exection and the associated connection are not closed until the work has completed, care should be taken if using asynchronous executions that hold a lot of state.</para>
+ </note>
</section>
<section>
12 years, 6 months
- 1
- 0