Author: rareddy Date: 2010-03-09 18:29:14 -0500 (Tue, 09 Mar 2010) New Revision: 1954 Added: trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java trunk/jboss-integration/src/main/resources/org/ trunk/jboss-integration/src/main/resources/org/teiid/ trunk/jboss-integration/src/main/resources/org/teiid/jboss/ trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties trunk/runtime/src/main/java/org/teiid/runtime/ trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java trunk/runtime/src/main/resources/org/ trunk/runtime/src/main/resources/org/teiid/ trunk/runtime/src/main/resources/org/teiid/runtime/ trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties Removed: trunk/jboss-integration/src/main/java/com/ trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/ trunk/runtime/src/main/resources/com/ Modified: trunk/common-core/src/main/java/com/metamatrix/core/vdb/VdbConstants.java trunk/engine/src/main/java/com/metamatrix/common/buffer/TupleBuffer.java trunk/engine/src/main/java/com/metamatrix/common/util/LogConstants.java trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/AdminProvider.java trunk/jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/ConnectorBindingDeployer.java trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/VDBMetadataComponentMapper.java trunk/runtime/src/main/java/org/teiid/deployers/BaseMultipleVFSParsingDeployer.java trunk/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java trunk/runtime/src/main/java/org/teiid/deployers/UDFMetaData.java trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java trunk/runtime/src/main/java/org/teiid/deployers/VDBParserDeployer.java trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java trunk/runtime/src/main/java/org/teiid/services/AuthorizationServiceImpl.java trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java trunk/runtime/src/main/java/org/teiid/services/TeiidLoginContext.java trunk/runtime/src/main/java/org/teiid/transport/ClientServiceRegistryImpl.java trunk/runtime/src/main/java/org/teiid/transport/ServerWorkItem.java trunk/runtime/src/main/java/org/teiid/transport/SocketTransport.java Log: TEIID-1013: Loading UDF files based on the information provided inside the vdb.xml file. Also, fixed lot iI8N issues with vdb deployer and admin code. Modified: trunk/common-core/src/main/java/com/metamatrix/core/vdb/VdbConstants.java =================================================================== --- trunk/common-core/src/main/java/com/metamatrix/core/vdb/VdbConstants.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/common-core/src/main/java/com/metamatrix/core/vdb/VdbConstants.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -34,5 +34,4 @@ public final static String INDEX_EXT = ".INDEX"; //$NON-NLS-1$ public final static String SEARCH_INDEX_EXT = ".SEARCH_INDEX"; //$NON-NLS-1$ public final static String MODEL_EXT = ".xmi"; //$NON-NLS-1$ - public final static String UDF_FILE_NAME = "FunctionDefinitions.xmi"; //$NON-NLS-1$ } Modified: trunk/engine/src/main/java/com/metamatrix/common/buffer/TupleBuffer.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/common/buffer/TupleBuffer.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/engine/src/main/java/com/metamatrix/common/buffer/TupleBuffer.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -22,7 +22,6 @@ package com.metamatrix.common.buffer; -import java.lang.ref.SoftReference; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -36,10 +35,10 @@ import com.metamatrix.common.log.LogManager; import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.common.types.Streamable; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.core.log.MessageLevel; import com.metamatrix.core.util.Assertion; import com.metamatrix.dqp.DQPPlugin; -import com.metamatrix.dqp.util.LogConstants; import com.metamatrix.query.sql.symbol.Expression; public class TupleBuffer { Modified: trunk/engine/src/main/java/com/metamatrix/common/util/LogConstants.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/common/util/LogConstants.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/engine/src/main/java/com/metamatrix/common/util/LogConstants.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -38,6 +38,7 @@ public static final String CTX_COMMANDLOGGING = "COMMAND_LOG"; //$NON-NLS-1$ public static final String CTX_AUDITLOGGING = "AUDIT_LOG"; //$NON-NLS-1$ public static final String CTX_ADMIN_API = "ADMIN_API"; //$NON-NLS-1$ + public static final String CTX_RUNTIME = "RUNTIME"; //$NON-NLS-1$ // Query contexts public static final String CTX_FUNCTION_TREE = CTX_QUERY_PLANNER + ".FUNCTION_TREE"; //$NON-NLS-1$ public static final String CTX_QUERY_RESOLVER = CTX_QUERY_PLANNER + ".RESOLVER"; //$NON-NLS-1$ Modified: trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -42,7 +42,6 @@ import org.jboss.deployers.spi.management.ManagementView; import org.jboss.deployers.spi.management.deploy.DeploymentManager; -import org.jboss.logging.Logger; import org.jboss.managed.api.ComponentType; import org.jboss.managed.api.DeploymentTemplateInfo; import org.jboss.managed.api.ManagedComponent; @@ -79,19 +78,20 @@ import org.teiid.adminapi.impl.SessionMetadata; import org.teiid.adminapi.impl.TransactionMetadata; import org.teiid.adminapi.impl.VDBMetaData; +import org.teiid.connector.api.Connector; +import org.teiid.jboss.IntegrationPlugin; import org.teiid.jboss.deployers.RuntimeEngineDeployer; public class Admin extends TeiidAdmin { - protected Logger log = Logger.getLogger(getClass()); private static final ProfileKey DEFAULT_PROFILE_KEY = new ProfileKey(ProfileKey.DEFAULT); - private static final String XA_DATA_SOURCE_TEMPLATE = "XADataSourceTemplate"; + private static final String XA_DATA_SOURCE_TEMPLATE = "XADataSourceTemplate"; //$NON-NLS-1$ private static final long serialVersionUID = 7081309086056911304L; - private static ComponentType VDBTYPE = new ComponentType("teiid", "vdb"); - private static ComponentType NOTXTYPE = new ComponentType("ConnectionFactory", "NoTx"); - private static ComponentType TXTYPE = new ComponentType("ConnectionFactory", "Tx"); - private static ComponentType DQPTYPE = new ComponentType("teiid", "dqp"); - private static ComponentType DSTYPE = new ComponentType("DataSource", "XA"); + private static ComponentType VDBTYPE = new ComponentType("teiid", "vdb");//$NON-NLS-1$ //$NON-NLS-2$ + private static ComponentType NOTXTYPE = new ComponentType("ConnectionFactory", "NoTx");//$NON-NLS-1$ //$NON-NLS-2$ + private static ComponentType TXTYPE = new ComponentType("ConnectionFactory", "Tx");//$NON-NLS-1$ //$NON-NLS-2$ + private static ComponentType DQPTYPE = new ComponentType("teiid", "dqp");//$NON-NLS-1$ //$NON-NLS-2$ + private static ComponentType DSTYPE = new ComponentType("DataSource", "XA");//$NON-NLS-1$ //$NON-NLS-2$ private static String DQPNAME = RuntimeEngineDeployer.class.getName(); private ManagementView view; @@ -115,7 +115,7 @@ private ManagementView getView() throws AdminProcessingException { if (this.view == null) { - throw new AdminProcessingException("The admin connection is already closed"); + throw new AdminProcessingException(IntegrationPlugin.Util.getString("admin_connection_closed")); //$NON-NLS-1$ } this.view.load(); return this.view; @@ -123,7 +123,7 @@ private DeploymentManager getDeploymentManager() throws AdminProcessingException{ if (this.deploymentMgr == null) { - throw new AdminProcessingException("The admin connection is already closed"); + throw new AdminProcessingException(IntegrationPlugin.Util.getString("admin_connection_closed")); //$NON-NLS-1$ } return this.deploymentMgr; } @@ -153,8 +153,8 @@ @Override public Collection<ConnectorBinding> getConnectorBindings() throws AdminException { ArrayList<ConnectorBinding> bindings = new ArrayList<ConnectorBinding>(); - findConnectorBindings(bindings, "NoTx"); - findConnectorBindings(bindings, "Tx"); + findConnectorBindings(bindings, "NoTx"); //$NON-NLS-1$ + findConnectorBindings(bindings, "Tx"); //$NON-NLS-1$ return bindings; } @@ -189,7 +189,7 @@ private ManagedComponent getConnectorBindingComponent(String deployedName) throws AdminProcessingException { try { - if (deployedName.startsWith("java:")) { + if (deployedName.startsWith("java:")) { //$NON-NLS-1$ deployedName = deployedName.substring(5); } ManagementView view = getView(); @@ -216,7 +216,7 @@ ConnectorBindingMetaData connector = new ConnectorBindingMetaData(); connector.setName(mc.getName()); connector.setComponentType(mc.getType()); - connector.addProperty("deployer-name", mc.getDeployment().getName()); + connector.addProperty("deployer-name", mc.getDeployment().getName());//$NON-NLS-1$ for (String key:mc.getProperties().keySet()) { ManagedProperty property = mc.getProperty(key); @@ -227,17 +227,17 @@ if(value.getMetaType().isSimple()) { connector.addProperty(key, ManagedUtil.stringValue(value)); } - else if (key.equals("config-property")) { + else if (key.equals("config-property")) { //$NON-NLS-1$ MapCompositeValueSupport v1 = (MapCompositeValueSupport)value; MapCompositeMetaType metaType = v1.getMetaType(); for (String configProperty:metaType.keySet()) { - if (!configProperty.endsWith(".type")) { + if (!configProperty.endsWith(".type")) { //$NON-NLS-1$ connector.addProperty(configProperty, ManagedUtil.stringValue(v1.get(configProperty))); } } } else { - log.info(key+" property is not added to connector properties"); + //log.info(key+" property is not added to connector properties"); } } } @@ -245,19 +245,19 @@ } private boolean isConnectorBinding(ManagedComponent mc) { - String connectionDefinition = ManagedUtil.getSimpleValue(mc, "connection-definition", String.class); - return "org.teiid.connector.api.Connector".equals(connectionDefinition); + String connectionDefinition = ManagedUtil.getSimpleValue(mc, "connection-definition", String.class); //$NON-NLS-1$ + return Connector.class.getName().equals(connectionDefinition); } private void findConnectorBindings(ArrayList<ConnectorBinding> bindings, String subType) throws AdminException { try { - ComponentType type = new ComponentType("ConnectionFactory", subType); + ComponentType type = new ComponentType("ConnectionFactory", subType); //$NON-NLS-1$ Set<ManagedComponent> jcaConnectors = getView().getComponentsForType(type); for(ManagedComponent mc:jcaConnectors) { - ManagedProperty mp = mc.getProperty("connection-definition"); + ManagedProperty mp = mc.getProperty("connection-definition"); //$NON-NLS-1$ SimpleValueSupport v = (SimpleValueSupport)mp.getValue(); - if (v.getValue().equals("org.teiid.connector.api.Connector")){ + if (v.getValue().equals(Connector.class.getName())){ bindings.add(buildConnectorBinding(mc)); } } @@ -269,9 +269,9 @@ @Override public void addConnectorBinding(String deploymentName, String typeName, Properties properties) throws AdminException { if (getConnectorBinding(deploymentName) != null) { - throw new AdminProcessingException("Connector binding with name "+deploymentName+" already exists."); + throw new AdminProcessingException(IntegrationPlugin.Util.getString("connector_binding_exists",deploymentName)); //$NON-NLS-1$; } - properties.setProperty("connection-definition", "org.teiid.connector.api.Connector"); + properties.setProperty("connection-definition", Connector.class.getName()); //$NON-NLS-1$ addConnectionfactory(deploymentName, typeName, properties); } @@ -279,7 +279,7 @@ public void setConnectorBindingProperty(String deployedName, String propertyName, String propertyValue) throws AdminException{ ManagedComponent mc = getConnectorBindingComponent(deployedName); if (mc == null) { - throw new AdminProcessingException("Connector binding with name "+deployedName+" does not exist."); + throw new AdminProcessingException(IntegrationPlugin.Util.getString("connector_binding_exists",deployedName)); //$NON-NLS-1$; } if (mc.getProperty(propertyName) != null) { mc.getProperty(propertyName).setValue(SimpleValueSupport.wrap(propertyValue)); @@ -287,9 +287,9 @@ else { Map<String, String> configProps = new HashMap<String, String>(); configProps.put(propertyName, propertyValue); - configProps.put(propertyValue+".type", "java.lang.String"); + configProps.put(propertyValue+".type", "java.lang.String"); //$NON-NLS-1$ //$NON-NLS-2$ MetaValue metaValue = ManagedUtil.compositeValueMap(configProps); - mc.getProperty("config-property").setValue(metaValue); + mc.getProperty("config-property").setValue(metaValue); //$NON-NLS-1$ } try { getView().updateComponent(mc); @@ -310,11 +310,11 @@ @Override public void startConnectorBinding(ConnectorBinding binding) throws AdminException { try { - String deployerName = binding.getPropertyValue("deployer-name"); + String deployerName = binding.getPropertyValue("deployer-name"); //$NON-NLS-1$ if (deployerName == null) { - throw new AdminProcessingException("Failed to find deployer name of the connector. Can not start!"); + throw new AdminProcessingException(IntegrationPlugin.Util.getString("failed_to_connector_deployer")); //$NON-NLS-1$ } - ManagedUtil.execute(getDeploymentManager().start(deployerName), "Failed to start Connector Binding = " + binding.getName()); + ManagedUtil.execute(getDeploymentManager().start(deployerName), IntegrationPlugin.Util.getString("failed_to_start_connector", binding.getName())); //$NON-NLS-1$ } catch (Exception e) { ManagedUtil.handleException(e); } @@ -323,11 +323,11 @@ @Override public void stopConnectorBinding(ConnectorBinding binding) throws AdminException { try { - String deployerName = binding.getPropertyValue("deployer-name"); + String deployerName = binding.getPropertyValue("deployer-name");//$NON-NLS-1$ if (deployerName == null) { - throw new AdminProcessingException("Failed to find deployer name of the connector. Can not stop!"); + throw new AdminProcessingException(IntegrationPlugin.Util.getString("failed_to_connector_deployer")); //$NON-NLS-1$ } - ManagedUtil.execute(getDeploymentManager().stop(deployerName), "Failed to Stop Connector Binding = " + binding.getName()); + ManagedUtil.execute(getDeploymentManager().stop(deployerName), IntegrationPlugin.Util.getString("failed_to_stop_connector", binding.getName())); //$NON-NLS-1$ } catch (Exception e) { ManagedUtil.handleException(e); } @@ -358,7 +358,7 @@ Set<String> names = getView().getTemplateNames(); HashSet<String> matched = new HashSet<String>(); for(String name:names) { - if (name.startsWith("connector-")) { + if (name.startsWith("connector-")) {//$NON-NLS-1$ matched.add(name); } } @@ -373,8 +373,8 @@ @Override public void deployVDB(String fileName, URL vdbURL) throws AdminException { - if (!fileName.endsWith(".vdb") && !fileName.endsWith("-vdb.xml")) { - throw new AdminProcessingException("The extension of the file name must be either .vdb designer vdbs or -vdb.xml for dynamic VDBs"); + if (!fileName.endsWith(".vdb") && !fileName.endsWith("-vdb.xml")) {//$NON-NLS-1$ //$NON-NLS-2$ + throw new AdminProcessingException(IntegrationPlugin.Util.getString("bad_vdb_extension")); //$NON-NLS-1$ } ManagedUtil.deployArchive(getDeploymentManager(), fileName, vdbURL, false); } @@ -410,8 +410,8 @@ try { Set<ManagedComponent> vdbComponents = getView().getComponentsForType(VDBTYPE); for (ManagedComponent mc: vdbComponents) { - String name = ManagedUtil.getSimpleValue(mc, "name", String.class); - int version = ManagedUtil.getSimpleValue(mc, "version", Integer.class); + String name = ManagedUtil.getSimpleValue(mc, "name", String.class);//$NON-NLS-1$ + int version = ManagedUtil.getSimpleValue(mc, "version", Integer.class);//$NON-NLS-1$ if (name.equals(vdbName) && version == vdbVersion) { return mc; } @@ -438,18 +438,18 @@ private VDBMetaData buildVDB(ManagedComponent mc) { VDBMetaData vdb = new VDBMetaData(); - vdb.setName(ManagedUtil.getSimpleValue(mc, "name", String.class)); - vdb.setDescription(ManagedUtil.getSimpleValue(mc, "description", String.class)); - String status = ManagedUtil.getSimpleValue(mc, "status", String.class); + vdb.setName(ManagedUtil.getSimpleValue(mc, "name", String.class));//$NON-NLS-1$ + vdb.setDescription(ManagedUtil.getSimpleValue(mc, "description", String.class));//$NON-NLS-1$ + String status = ManagedUtil.getSimpleValue(mc, "status", String.class);//$NON-NLS-1$ if (status != null) { vdb.setStatus(VDB.Status.valueOf(status)); } - vdb.setVersion(ManagedUtil.getSimpleValue(mc, "version", Integer.class)); + vdb.setVersion(ManagedUtil.getSimpleValue(mc, "version", Integer.class));//$NON-NLS-1$ vdb.setUrl(mc.getDeployment().getName()); - vdb.setProperties(ManagedUtil.getPropertiesValue(mc, "properties")); + vdb.setProperties(ManagedUtil.getPropertiesValue(mc, "properties"));//$NON-NLS-1$ // models - ManagedProperty mp = mc.getProperty("models"); + ManagedProperty mp = mc.getProperty("models");//$NON-NLS-1$ List<ManagedObject> models = (List<ManagedObject>)MetaValueFactory.getInstance().unwrap(mp.getValue()); for(ManagedObject mo:models) { vdb.addModel(buildModel(mo)); @@ -463,28 +463,28 @@ private ModelMetaData buildModel(ManagedObject mc) { ModelMetaData model = new ModelMetaData(); - model.setName(ManagedUtil.getSimpleValue(mc, "name", String.class)); - model.setVisible(ManagedUtil.getSimpleValue(mc, "visible", Boolean.class)); - model.setModelType(ManagedUtil.getSimpleValue(mc, "modelType", String.class)); - model.setProperties(ManagedUtil.getPropertiesValue(mc, "properties")); + model.setName(ManagedUtil.getSimpleValue(mc, "name", String.class));//$NON-NLS-1$ + model.setVisible(ManagedUtil.getSimpleValue(mc, "visible", Boolean.class));//$NON-NLS-1$ + model.setModelType(ManagedUtil.getSimpleValue(mc, "modelType", String.class));//$NON-NLS-1$ + model.setProperties(ManagedUtil.getPropertiesValue(mc, "properties"));//$NON-NLS-1$ - ManagedProperty sourceMappings = mc.getProperty("sourceMappings"); + ManagedProperty sourceMappings = mc.getProperty("sourceMappings");//$NON-NLS-1$ if (sourceMappings != null){ List<ManagedObject> mappings = (List<ManagedObject>)MetaValueFactory.getInstance().unwrap(sourceMappings.getValue()); for (ManagedObject mo:mappings) { - String name = ManagedUtil.getSimpleValue(mo, "name", String.class); - String jndiName = ManagedUtil.getSimpleValue(mo, "jndiName", String.class); + String name = ManagedUtil.getSimpleValue(mo, "name", String.class);//$NON-NLS-1$ + String jndiName = ManagedUtil.getSimpleValue(mo, "jndiName", String.class);//$NON-NLS-1$ model.addSourceMapping(name, jndiName); } } - ManagedProperty validationErrors = mc.getProperty("errors"); + ManagedProperty validationErrors = mc.getProperty("errors");//$NON-NLS-1$ if (validationErrors != null) { List<ManagedObject> errors = (List<ManagedObject>)MetaValueFactory.getInstance().unwrap(validationErrors.getValue()); if (errors != null) { for (ManagedObject mo:errors) { - model.addError(ManagedUtil.getSimpleValue(mo, "severity", String.class), ManagedUtil.getSimpleValue(mo, "value", String.class)); + model.addError(ManagedUtil.getSimpleValue(mo, "severity", String.class), ManagedUtil.getSimpleValue(mo, "value", String.class));//$NON-NLS-1$ //$NON-NLS-2$ } } } @@ -496,7 +496,7 @@ try { Collection<Session> sessionList = new ArrayList<Session>(); ManagedComponent mc = getView().getComponent(DQPNAME, DQPTYPE); - MetaValue value = ManagedUtil.executeOperation(mc, "getActiveSessions"); + MetaValue value = ManagedUtil.executeOperation(mc, "getActiveSessions");//$NON-NLS-1$ MetaValue[] sessions = ((CollectionValueSupport)value).getElements(); for (MetaValue mv:sessions) { sessionList.add((SessionMetadata)MetaValueFactory.getInstance().unwrap(mv, SessionMetadata.class)); @@ -511,7 +511,7 @@ public void terminateSession(long sessionId) throws AdminException { try { ManagedComponent mc = getView().getComponent(DQPNAME, DQPTYPE); - ManagedUtil.executeOperation(mc, "terminateSession", SimpleValueSupport.wrap(sessionId)); + ManagedUtil.executeOperation(mc, "terminateSession", SimpleValueSupport.wrap(sessionId));//$NON-NLS-1$ } catch (Exception e) { throw new AdminComponentException(e.getMessage(), e); } @@ -522,7 +522,7 @@ try { Collection<Request> requestList = new ArrayList<Request>(); ManagedComponent mc = getView().getComponent(DQPNAME, DQPTYPE); - MetaValue value = ManagedUtil.executeOperation(mc, "getRequests"); + MetaValue value = ManagedUtil.executeOperation(mc, "getRequests");//$NON-NLS-1$ MetaValue[] requests = ((CollectionValueSupport)value).getElements(); for (MetaValue mv:requests) { requestList.add((RequestMetadata)MetaValueFactory.getInstance().unwrap(mv, RequestMetadata.class)); @@ -538,7 +538,7 @@ try { Collection<Request> requestList = new ArrayList<Request>(); ManagedComponent mc = getView().getComponent(DQPNAME, DQPTYPE); - MetaValue value = ManagedUtil.executeOperation(mc, "getRequestsForSession", SimpleValueSupport.wrap(sessionId)); + MetaValue value = ManagedUtil.executeOperation(mc, "getRequestsForSession", SimpleValueSupport.wrap(sessionId));//$NON-NLS-1$ MetaValue[] requests = ((CollectionValueSupport)value).getElements(); for (MetaValue mv:requests) { requestList.add((RequestMetadata)MetaValueFactory.getInstance().unwrap(mv, RequestMetadata.class)); @@ -553,7 +553,7 @@ public void cancelRequest(long sessionId, long requestId) throws AdminException{ try { ManagedComponent mc = getView().getComponent(DQPNAME, DQPTYPE); - ManagedUtil.executeOperation(mc, "cancelRequest", SimpleValueSupport.wrap(sessionId), SimpleValueSupport.wrap(requestId)); + ManagedUtil.executeOperation(mc, "cancelRequest", SimpleValueSupport.wrap(sessionId), SimpleValueSupport.wrap(requestId));//$NON-NLS-1$ } catch (Exception e) { throw new AdminComponentException(e.getMessage(), e); } @@ -561,9 +561,9 @@ private String getRarDeployerName(String rarName) throws AdminException{ try { - Set<String> rarDeployments = getView().getDeploymentNamesForType("rar"); + Set<String> rarDeployments = getView().getDeploymentNamesForType("rar");//$NON-NLS-1$ for (String name: rarDeployments) { - if (name.endsWith(rarName+"/")) { + if (name.endsWith(rarName+"/")) { //$NON-NLS-1$ return name; } } @@ -575,17 +575,17 @@ @Override public void addConnectorType(String connectorName, URL rarURL) throws AdminException{ - if (!connectorName.startsWith("connector-")) { - throw new AdminProcessingException("Teiid connector names must start with \"connector-\""); + if (!connectorName.startsWith("connector-")) {//$NON-NLS-1$ + throw new AdminProcessingException(IntegrationPlugin.Util.getString("bad_connector_type_name")); //$NON-NLS-1$ } - if (!connectorName.endsWith(".rar")) { - connectorName = connectorName + ".rar"; + if (!connectorName.endsWith(".rar")) {//$NON-NLS-1$ + connectorName = connectorName + ".rar";//$NON-NLS-1$ } String deployerName = getRarDeployerName(connectorName); if (deployerName != null) { - throw new AdminProcessingException("A Connectory with name:"+connectorName+" already exists!"); + throw new AdminProcessingException(IntegrationPlugin.Util.getString("connector_type_exists", deployerName)); //$NON-NLS-1$ } ManagedUtil.deployArchive(getDeploymentManager(), connectorName, rarURL, false); @@ -594,7 +594,7 @@ try { String connectorNameWithoutExt = connectorName.substring(0, connectorName.length()-4); File jarFile = Admin.createConnectorTypeTemplate(connectorNameWithoutExt); - ManagedUtil.deployArchive(getDeploymentManager(), connectorNameWithoutExt+"-template.jar", jarFile.toURI().toURL(), false); + ManagedUtil.deployArchive(getDeploymentManager(), connectorNameWithoutExt+"-template.jar", jarFile.toURI().toURL(), false);//$NON-NLS-1$ jarFile.delete(); } catch (IOException e) { deleteConnectorType(connectorName); @@ -603,8 +603,8 @@ @Override public void deleteConnectorType(String connectorName) throws AdminException { - if (!connectorName.endsWith(".rar")) { - connectorName = connectorName + ".rar"; + if (!connectorName.endsWith(".rar")) {//$NON-NLS-1$ + connectorName = connectorName + ".rar";//$NON-NLS-1$ } String deployerName = getRarDeployerName(connectorName); if (deployerName != null) { @@ -612,14 +612,14 @@ //also need to delete template for the properties String connectorNameWithoutExt = connectorName.substring(0, connectorName.length()-4); - ManagedUtil.removeArchive(getDeploymentManager(), connectorNameWithoutExt+"-template.jar"); + ManagedUtil.removeArchive(getDeploymentManager(), connectorNameWithoutExt+"-template.jar");//$NON-NLS-1$ } } @Override public InputStream exportConnectorType(String connectorName) throws AdminException { - if (!connectorName.endsWith(".rar")) { - connectorName = connectorName + ".rar"; + if (!connectorName.endsWith(".rar")) {//$NON-NLS-1$ + connectorName = connectorName + ".rar";//$NON-NLS-1$ } String deployerName = getRarDeployerName(connectorName); if (deployerName != null) { @@ -635,7 +635,7 @@ try { Collection<String> requestList = new ArrayList<String>(); ManagedComponent mc = getView().getComponent(DQPNAME, DQPTYPE); - MetaValue value = ManagedUtil.executeOperation(mc, "getCacheTypes"); + MetaValue value = ManagedUtil.executeOperation(mc, "getCacheTypes");//$NON-NLS-1$ MetaValue[] requests = ((CollectionValueSupport)value).getElements(); for (MetaValue mv:requests) { requestList.add(ManagedUtil.stringValue(mv)); @@ -650,7 +650,7 @@ public void clearCache(String cacheType) throws AdminException{ try { ManagedComponent mc = getView().getComponent(DQPNAME, DQPTYPE); - ManagedUtil.executeOperation(mc, "clearCache", SimpleValueSupport.wrap(cacheType)); + ManagedUtil.executeOperation(mc, "clearCache", SimpleValueSupport.wrap(cacheType));//$NON-NLS-1$ } catch (Exception e) { throw new AdminComponentException(e.getMessage(), e); } @@ -661,7 +661,7 @@ try { Collection<Transaction> txnList = new ArrayList<Transaction>(); ManagedComponent mc = getView().getComponent(DQPNAME, DQPTYPE); - MetaValue value = ManagedUtil.executeOperation(mc, "getTransactions"); + MetaValue value = ManagedUtil.executeOperation(mc, "getTransactions");//$NON-NLS-1$ MetaValue[] requests = ((CollectionValueSupport)value).getElements(); for (MetaValue mv:requests) { txnList.add((TransactionMetadata)MetaValueFactory.getInstance().unwrap(mv, TransactionMetadata.class)); @@ -676,7 +676,7 @@ public void terminateTransaction(String xid) throws AdminException { try { ManagedComponent mc = getView().getComponent(DQPNAME, DQPTYPE); - ManagedUtil.executeOperation(mc, "terminateTransaction", MetaValueFactory.getInstance().create(xid)); + ManagedUtil.executeOperation(mc, "terminateTransaction", MetaValueFactory.getInstance().create(xid));//$NON-NLS-1$ } catch (Exception e) { throw new AdminComponentException(e.getMessage(), e); } @@ -686,7 +686,7 @@ public WorkerPoolStatistics getWorkManagerStats(String identifier) throws AdminException { try { ManagedComponent mc = getView().getComponent(DQPNAME, DQPTYPE); - MetaValue value = ManagedUtil.executeOperation(mc, "getWorkManagerStatistics", SimpleValueSupport.wrap(identifier)); + MetaValue value = ManagedUtil.executeOperation(mc, "getWorkManagerStatistics", SimpleValueSupport.wrap(identifier));//$NON-NLS-1$ return (WorkerPoolStatistics)MetaValueFactory.getInstance().unwrap(value, WorkerPoolStatistics.class); } catch (Exception e) { throw new AdminComponentException(e.getMessage(), e); @@ -705,14 +705,14 @@ private ConnectionPoolStatistics buildConnectorConnectionPool(ManagedComponent mc) { ConnectionPoolStatisticsMetadata stats = new ConnectionPoolStatisticsMetadata(); stats.setName(mc.getName()); - stats.setAvailableConnectionCount(ManagedUtil.getSimpleValue(mc, "availableConnectionCount", Long.class)); - stats.setConnectionCount(ManagedUtil.getSimpleValue(mc, "connectionCount", Integer.class)); - stats.setConnectionCreatedCount(ManagedUtil.getSimpleValue(mc, "connectionCreatedCount", Integer.class)); - stats.setConnectionDestroyedCount(ManagedUtil.getSimpleValue(mc, "connectionDestroyedCount", Integer.class)); - stats.setInUseConnectionCount(ManagedUtil.getSimpleValue(mc, "inUseConnectionCount", Long.class)); - stats.setMaxConnectionsInUseCount(ManagedUtil.getSimpleValue(mc, "maxConnectionsInUseCount", Long.class)); - stats.setMaxSize(ManagedUtil.getSimpleValue(mc, "maxSize", Integer.class)); - stats.setMinSize(ManagedUtil.getSimpleValue(mc, "minSize", Integer.class)); + stats.setAvailableConnectionCount(ManagedUtil.getSimpleValue(mc, "availableConnectionCount", Long.class));//$NON-NLS-1$ + stats.setConnectionCount(ManagedUtil.getSimpleValue(mc, "connectionCount", Integer.class));//$NON-NLS-1$ + stats.setConnectionCreatedCount(ManagedUtil.getSimpleValue(mc, "connectionCreatedCount", Integer.class));//$NON-NLS-1$ + stats.setConnectionDestroyedCount(ManagedUtil.getSimpleValue(mc, "connectionDestroyedCount", Integer.class));//$NON-NLS-1$ + stats.setInUseConnectionCount(ManagedUtil.getSimpleValue(mc, "inUseConnectionCount", Long.class));//$NON-NLS-1$ + stats.setMaxConnectionsInUseCount(ManagedUtil.getSimpleValue(mc, "maxConnectionsInUseCount", Long.class));//$NON-NLS-1$ + stats.setMaxSize(ManagedUtil.getSimpleValue(mc, "maxSize", Integer.class));//$NON-NLS-1$ + stats.setMinSize(ManagedUtil.getSimpleValue(mc, "minSize", Integer.class));//$NON-NLS-1$ return stats; } @@ -721,7 +721,7 @@ try { DeploymentTemplateInfo info = getView().getTemplate(typeName); if(info == null) { - throw new AdminProcessingException("Connector Type template supplied not found in the configuration."+typeName); + throw new AdminProcessingException(IntegrationPlugin.Util.getString("connector_type_not_found", typeName)); //$NON-NLS-1$ } ArrayList<PropertyDefinition> props = new ArrayList<PropertyDefinition>(); @@ -738,15 +738,15 @@ p.setPropertyTypeClassName(mp.getMetaType().getTypeName()); p.setModifiable(!mp.isReadOnly()); - if (mp.getField("masked", Boolean.class) != null) { - p.setMasked(mp.getField("masked", Boolean.class)); + if (mp.getField("masked", Boolean.class) != null) {//$NON-NLS-1$ + p.setMasked(mp.getField("masked", Boolean.class));//$NON-NLS-1$ } else { p.setMasked(false); } - if (mp.getField("advanced", Boolean.class) != null) { - p.setAdvanced(mp.getField("advanced", Boolean.class)); + if (mp.getField("advanced", Boolean.class) != null) {//$NON-NLS-1$ + p.setAdvanced(mp.getField("advanced", Boolean.class));//$NON-NLS-1$ } else { p.setAdvanced(true); @@ -779,7 +779,7 @@ try { DeploymentTemplateInfo info = getView().getTemplate(typeName); if(info == null) { - throw new AdminProcessingException("Connector Type template supplied not found in the configuration."+typeName); + throw new AdminProcessingException(IntegrationPlugin.Util.getString("connector_type_not_found", typeName)); //$NON-NLS-1$ } //config-properties list @@ -800,13 +800,13 @@ } else { configProps.put(key, properties.getProperty(key)); - configProps.put(key+".type", "java.lang.String"); + configProps.put(key+".type", "java.lang.String");//$NON-NLS-1$ //$NON-NLS-2$ } } if (configProps.size() > 0) { MetaValue metaValue = ManagedUtil.compositeValueMap(configProps); - info.getProperties().get("config-property").setValue(metaValue); + info.getProperties().get("config-property").setValue(metaValue);//$NON-NLS-1$ } getView().applyTemplate(deploymentName, info); @@ -837,31 +837,31 @@ } private static final String connectorTemplate = - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+ - "<deployment xmlns=\"urn:jboss:bean-deployer:2.0\">\n" + - "<!-- This is Teiid connector type template - DO NOT DELETE -->\n"+ - "<bean name=\"${name}\" class=\"org.teiid.templates.connector.ConnectorTypeTemplate\">\n" + - " <property name=\"info\"><inject bean=\"${name}-templateinfo\"/></property>\n" + - " <property name=\"targetTemplate\"><inject bean=\"NoTxConnectionFactoryTemplate\"/></property>\n" + - "</bean>\n" + - "<bean name=\"${name}-templateinfo\" class=\"org.teiid.templates.connector.ConnectorTypeTemplateInfo\">\n" + - " <constructor factoryMethod=\"createTemplateInfo\">\n" + - " <factory bean=\"DSDeploymentTemplateInfoFactory\"/>\n" + - " <parameter class=\"java.lang.Class\">org.teiid.templates.connector.ConnectorTypeTemplateInfo</parameter>\n" + - " <parameter class=\"java.lang.Class\">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter>\n" + - " <parameter class=\"java.lang.String\">${name}</parameter>\n" + - " <parameter class=\"java.lang.String\">${name}</parameter>\n"+ - " </constructor>\n" + - "</bean>\n"+ - "</deployment>"; + "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+ //$NON-NLS-1$ + "<deployment xmlns=\"urn:jboss:bean-deployer:2.0\">\n" + //$NON-NLS-1$ + "<!-- This is Teiid connector type template - DO NOT DELETE -->\n"+ //$NON-NLS-1$ + "<bean name=\"${name}\" class=\"org.teiid.templates.connector.ConnectorTypeTemplate\">\n" + //$NON-NLS-1$ + " <property name=\"info\"><inject bean=\"${name}-templateinfo\"/></property>\n" + //$NON-NLS-1$ + " <property name=\"targetTemplate\"><inject bean=\"NoTxConnectionFactoryTemplate\"/></property>\n" + //$NON-NLS-1$ + "</bean>\n" + //$NON-NLS-1$ + "<bean name=\"${name}-templateinfo\" class=\"org.teiid.templates.connector.ConnectorTypeTemplateInfo\">\n" + //$NON-NLS-1$ + " <constructor factoryMethod=\"createTemplateInfo\">\n" + //$NON-NLS-1$ + " <factory bean=\"DSDeploymentTemplateInfoFactory\"/>\n" + //$NON-NLS-1$ + " <parameter class=\"java.lang.Class\">org.teiid.templates.connector.ConnectorTypeTemplateInfo</parameter>\n" + //$NON-NLS-1$ + " <parameter class=\"java.lang.Class\">org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData</parameter>\n" + //$NON-NLS-1$ + " <parameter class=\"java.lang.String\">${name}</parameter>\n" + //$NON-NLS-1$ + " <parameter class=\"java.lang.String\">${name}</parameter>\n"+ //$NON-NLS-1$ + " </constructor>\n" + //$NON-NLS-1$ + "</bean>\n"+ //$NON-NLS-1$ + "</deployment>"; //$NON-NLS-1$ private static File createConnectorTypeTemplate(String name) throws IOException { - String content = connectorTemplate.replace("${name}", name); + String content = connectorTemplate.replace("${name}", name);//$NON-NLS-1$ - File jarFile = File.createTempFile(name, ".jar"); + File jarFile = File.createTempFile(name, ".jar");//$NON-NLS-1$ JarOutputStream jo = new JarOutputStream(new BufferedOutputStream(new FileOutputStream(jarFile))); - JarEntry je = new JarEntry("META-INF/jboss-beans.xml"); + JarEntry je = new JarEntry("META-INF/jboss-beans.xml");//$NON-NLS-1$ jo.putNextEntry(je); jo.write(content.getBytes()); @@ -909,7 +909,7 @@ // } catch (Exception e) { // throw new AdminComponentException(e.getMessage(), e); // } - throw new AdminProcessingException("feature coming soon.."); + throw new AdminProcessingException("feature coming soon..");//$NON-NLS-1$ } } Modified: trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/AdminProvider.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/AdminProvider.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/AdminProvider.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -60,12 +60,12 @@ * Connection to profile service from a remote VM or local connection */ static private class ProfileConnection { - private static final String PROFILE_SERVICE_JNDI_NAME = "ProfileService"; - private static final String SECURE_PROFILE_SERVICE_JNDI_NAME = "SecureProfileService/remote"; - private static final String NAMING_CONTEXT_FACTORY = "org.jnp.interfaces.NamingContextFactory"; - private static final String JNP_TIMEOUT_JNP_INIT_PROP = "jnp.timeout"; - private static final String JNP_SOTIMEOUT_JNP_INIT_PROP = "jnp.sotimeout"; - private static final String JNP_DISABLE_DISCOVERY_JNP_INIT_PROP = "jnp.disableDiscovery"; + private static final String PROFILE_SERVICE_JNDI_NAME = "ProfileService"; //$NON-NLS-1$ + private static final String SECURE_PROFILE_SERVICE_JNDI_NAME = "SecureProfileService/remote"; //$NON-NLS-1$ + private static final String NAMING_CONTEXT_FACTORY = "org.jnp.interfaces.NamingContextFactory"; //$NON-NLS-1$ + private static final String JNP_TIMEOUT_JNP_INIT_PROP = "jnp.timeout"; //$NON-NLS-1$ + private static final String JNP_SOTIMEOUT_JNP_INIT_PROP = "jnp.sotimeout"; //$NON-NLS-1$ + private static final String JNP_DISABLE_DISCOVERY_JNP_INIT_PROP = "jnp.disableDiscovery"; //$NON-NLS-1$ /** * This is the timeout (in milliseconds) for the initial attempt to establish the remote connection. @@ -123,12 +123,12 @@ env.setProperty(Context.INITIAL_CONTEXT_FACTORY, NAMING_CONTEXT_FACTORY); env.setProperty(Context.SECURITY_PRINCIPAL, user); env.setProperty(Context.SECURITY_CREDENTIALS, password); - env.put(Context.URL_PKG_PREFIXES, "org.jnp.interfaces"); - env.setProperty(JNP_DISABLE_DISCOVERY_JNP_INIT_PROP, "true"); + env.put(Context.URL_PKG_PREFIXES, "org.jnp.interfaces"); //$NON-NLS-1$ + env.setProperty(JNP_DISABLE_DISCOVERY_JNP_INIT_PROP, "true"); //$NON-NLS-1$ env.setProperty(JNP_TIMEOUT_JNP_INIT_PROP, String.valueOf(JNP_TIMEOUT)); env.setProperty(JNP_SOTIMEOUT_JNP_INIT_PROP, String.valueOf(JNP_SO_TIMEOUT)); env.setProperty(JNP_DISABLE_DISCOVERY_JNP_INIT_PROP, String.valueOf(JNP_DISABLE_DISCOVERY)); - env.setProperty("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces"); + env.setProperty("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces"); //$NON-NLS-1$ //$NON-NLS-2$ InitialContext ic = new InitialContext(env); try { @@ -167,7 +167,7 @@ passwordCallback.setPassword(password.toCharArray()); } else { - throw new UnsupportedCallbackException(callback, "Unrecognized Callback: " + callback); + throw new UnsupportedCallbackException(callback, "Unrecognized Callback: " + callback); //$NON-NLS-1$ } } Added: trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java (rev 0) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ +package org.teiid.jboss; + +import java.util.ResourceBundle; + +import com.metamatrix.core.BundleUtil; + +public class IntegrationPlugin { + private static final String PLUGIN_ID = "org.teiid.jboss" ; //$NON-NLS-1$ + private static final String BUNDLE_NAME = PLUGIN_ID + ".i18n"; //$NON-NLS-1$ + public static final BundleUtil Util = new BundleUtil(PLUGIN_ID,BUNDLE_NAME,ResourceBundle.getBundle(BUNDLE_NAME)); + +} Property changes on: trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -31,6 +31,7 @@ import org.teiid.security.SecurityHelper; public class JBossSecurityHelper implements SecurityHelper, Serializable { + private static final long serialVersionUID = 3598997061994110254L; @Override public boolean assosiateSecurityContext(String securityDomain, Object newContext) { Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/ConnectorBindingDeployer.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/ConnectorBindingDeployer.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/ConnectorBindingDeployer.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -34,6 +34,7 @@ import org.jboss.managed.api.factory.ManagedObjectFactory; import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup; import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentMetaData; +import org.teiid.connector.api.Connector; import org.teiid.connector.api.ConnectorException; import org.teiid.dqp.internal.datamgr.impl.ConnectorManager; import org.teiid.dqp.internal.datamgr.impl.ConnectorManagerRepository; @@ -59,12 +60,12 @@ for (ManagedConnectionFactoryDeploymentMetaData data : deployments) { String connectorDefinition = data.getConnectionDefinition(); - if (connectorDefinition.equals("org.teiid.connector.api.Connector")) { + if (connectorDefinition.equals(Connector.class.getName())) { String connectorName = data.getJndiName(); ConnectorManager cm = null; try { - cm = createConnectorManger("java:"+connectorName, data.getMaxSize()); + cm = createConnectorManger("java:"+connectorName, data.getMaxSize()); //$NON-NLS-1$ cm.start(); cmGroup.addConnectorManager(cm); } catch (ConnectorException e) { @@ -72,7 +73,7 @@ } // Add the references to the mgr as loaded. - this.connectorManagerRepository.addConnectorManager("java:"+connectorName, cm); + this.connectorManagerRepository.addConnectorManager("java:"+connectorName, cm); //$NON-NLS-1$ log.info("Teiid Connector Started = " + connectorName); //$NON-NLS-1$ } @@ -100,10 +101,10 @@ for (ManagedConnectionFactoryDeploymentMetaData data : deployments) { String connectorDefinition = data.getConnectionDefinition(); - if (connectorDefinition.equals("org.teiid.connector.api.Connector")) { + if (connectorDefinition.equals(Connector.class.getName())) { String connectorName = data.getJndiName(); if (this.connectorManagerRepository != null) { - ConnectorManager cm = this.connectorManagerRepository.removeConnectorManager("java:"+connectorName); + ConnectorManager cm = this.connectorManagerRepository.removeConnectorManager("java:"+connectorName); //$NON-NLS-1$ if (cm != null) { cm.stop(); } @@ -122,7 +123,7 @@ for (ConnectorManager mgr:cmGroup.getConnectorManagers()) { ManagedObject mo = this.mof.initManagedObject(mgr, ConnectorManager.class, mgr.getName(), mgr.getName()); if (mo == null) { - throw new DeploymentException("could not create managed object"); + throw new DeploymentException("could not create managed object"); //$NON-NLS-1$ } managedObjects.put(mo.getName(), mo); } Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -33,7 +33,6 @@ import javax.resource.spi.XATerminator; import javax.resource.spi.work.WorkManager; -import org.jboss.logging.Logger; import org.jboss.managed.api.ManagedOperation.Impact; import org.jboss.managed.api.annotation.ManagementComponent; import org.jboss.managed.api.annotation.ManagementObject; @@ -57,6 +56,7 @@ import org.teiid.dqp.internal.transaction.ContainerTransactionProvider; import org.teiid.dqp.internal.transaction.TransactionServerImpl; import org.teiid.dqp.internal.transaction.XidFactory; +import org.teiid.jboss.IntegrationPlugin; import org.teiid.logging.LogConfigurationProvider; import org.teiid.logging.LogListernerProvider; import org.teiid.security.SecurityHelper; @@ -71,11 +71,11 @@ import com.metamatrix.api.exception.security.SessionServiceException; import com.metamatrix.client.ExceptionUtil; import com.metamatrix.common.log.LogManager; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.core.log.MessageLevel; import com.metamatrix.dqp.client.ClientSideDQP; import com.metamatrix.dqp.client.DQPManagement; -import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; import com.metamatrix.dqp.service.AuthorizationService; import com.metamatrix.dqp.service.BufferService; import com.metamatrix.dqp.service.SessionService; @@ -87,8 +87,6 @@ public class RuntimeEngineDeployer extends DQPConfiguration implements DQPManagement, Serializable , ClientServiceRegistry { private static final long serialVersionUID = -4676205340262775388L; - protected Logger log = Logger.getLogger(getClass()); - private transient SocketConfiguration jdbcSocketConfiguration; private transient SocketConfiguration adminSocketConfiguration; private transient SocketTransport jdbcSocket; @@ -125,19 +123,19 @@ if (this.jdbcSocketConfiguration.isEnabled()) { this.jdbcSocket = new SocketTransport(this.jdbcSocketConfiguration, csr); this.jdbcSocket.start(); - log.info("Teiid JDBC = " + (this.jdbcSocketConfiguration.getSSLConfiguration().isSslEnabled()?"mms://":"mm://")+this.jdbcSocketConfiguration.getHostAddress().getHostName()+":"+this.jdbcSocketConfiguration.getPortNumber()); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("socket_enabled","Teiid JDBC = ",(this.jdbcSocketConfiguration.getSSLConfiguration().isSslEnabled()?"mms://":"mm://")+this.jdbcSocketConfiguration.getHostAddress().getHostName()+":"+this.jdbcSocketConfiguration.getPortNumber())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } else { - log.debug(DQPEmbeddedPlugin.Util.getString("SocketTransport.3")); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("socket_not_enabled", "jdbc connections")); //$NON-NLS-1$ //$NON-NLS-2$ } if (this.adminSocketConfiguration.isEnabled()) { this.adminSocket = new SocketTransport(this.adminSocketConfiguration, csr); this.adminSocket.start(); - log.info("Teiid Admin = " + (this.adminSocketConfiguration.getSSLConfiguration().isSslEnabled()?"mms://":"mm://")+this.adminSocketConfiguration.getHostAddress().getHostName()+":"+this.adminSocketConfiguration.getPortNumber()); //$NON-NLS-1$ + LogManager.logInfo(com.metamatrix.common.util.LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("socket_enabled","Teiid Admin", (this.adminSocketConfiguration.getSSLConfiguration().isSslEnabled()?"mms://":"mm://")+this.adminSocketConfiguration.getHostAddress().getHostName()+":"+this.adminSocketConfiguration.getPortNumber())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } else { - log.debug(DQPEmbeddedPlugin.Util.getString("SocketTransport.3")); //$NON-NLS-1$ + LogManager.logInfo(com.metamatrix.common.util.LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("socket_not_enabled", "admin connections")); //$NON-NLS-1$ //$NON-NLS-2$ } - log.info("Teiid Engine Started = " + new Date(System.currentTimeMillis()).toString()); //$NON-NLS-1$ + LogManager.logInfo(com.metamatrix.common.util.LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("engine_started", new Date(System.currentTimeMillis()).toString())); //$NON-NLS-1$ } public void stop() { @@ -158,8 +156,7 @@ this.adminSocket.stop(); this.adminSocket = null; } - - log.info("Teiid Engine Stopped = " + new Date(System.currentTimeMillis()).toString()); //$NON-NLS-1$ + LogManager.logInfo(com.metamatrix.common.util.LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("engine_stopped", new Date(System.currentTimeMillis()).toString())); //$NON-NLS-1$ } private void createClientServices() { @@ -235,7 +232,7 @@ } public void setXATerminator(XATerminator xaTerminator){ - this.dqpCore.setTransactionService(getTransactionService("localhost", xaTerminator)); + this.dqpCore.setTransactionService(getTransactionService("localhost", xaTerminator)); //$NON-NLS-1$ } public void setWorkManager(WorkManager mgr) { @@ -278,7 +275,7 @@ @Override @ManagementOperation(description="Get Runtime workmanager statistics", impact=Impact.ReadOnly,params={@ManagementParameter(name="identifier",description="Use \"runtime\" for engine, or connector name for connector")}) public WorkerPoolStatisticsMetadata getWorkManagerStatistics(String identifier) { - if ("runtime".equalsIgnoreCase(identifier)) { + if ("runtime".equalsIgnoreCase(identifier)) { //$NON-NLS-1$ return this.dqpCore.getWorkManagerStatistics(); } ConnectorManager cm = this.dqpCore.getConnectorManagerRepository().getConnectorManager(identifier); Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/VDBMetadataComponentMapper.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/VDBMetadataComponentMapper.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/VDBMetadataComponentMapper.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -27,6 +27,9 @@ import org.jboss.system.server.profileservice.persistence.xml.PersistedComponent; import org.teiid.adminapi.impl.VDBMetaData; +/** + * This class used in the Teiid deployer -jboss-beans.xml file. + */ public class VDBMetadataComponentMapper extends AbstractComponentMapper { public VDBMetadataComponentMapper(PersistenceFactory persistenceFactory) { @@ -36,11 +39,11 @@ @Override protected ManagedObject getComponent(Object attachment, PersistedComponent component, boolean create) { VDBMetaData metadata = (VDBMetaData)attachment; - String vdbName = metadata.getName()+"_"+metadata.getVersion(); + String vdbName = metadata.getName()+"_"+metadata.getVersion(); //$NON-NLS-1$ if (vdbName.equals(component.getOriginalName())) { return getMOF().initManagedObject(metadata, VDBMetaData.class, vdbName, vdbName); } - throw new IllegalStateException("could not find deployment " + component.getOriginalName()); + throw new IllegalStateException("could not find deployment " + component.getOriginalName());//$NON-NLS-1$ } @Override @@ -51,7 +54,7 @@ @Override protected void setComponentName(PersistedComponent component, ManagedObject mo) { VDBMetaData metadata = (VDBMetaData)mo.getAttachment(); - component.setName(metadata.getName()+"_"+metadata.getVersion()); + component.setName(metadata.getName()+"_"+metadata.getVersion()); //$NON-NLS-1$ } @Override Added: trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties =================================================================== --- trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties (rev 0) +++ trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2010-03-09 23:29:14 UTC (rev 1954) @@ -0,0 +1,35 @@ +# +# JBoss, Home of Professional Open Source. +# See the COPYRIGHT.txt file distributed with this work for information +# regarding copyright ownership. Some portions may be licensed +# to Red Hat, Inc. under one or more contributor license agreements. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# + +engine_started=Teiid Engine Started = {0} +socket_not_enabled=Socket transport for {0} is not enabled in Teiid. +socket_enabled={0} {1} +engine_stopped=Teiid Engine stopped {0} +admin_connection_closed=Teiid admin connection is already closed. +connector_binding_exists=Connector binding with name "{0}" already exists. +failed_to_connector_deployer=Failed to find deployer name of the connector. Can not start! +failed_to_start_connector=Failed to start Connector Binding = {0} +failed_to_stop_connector=Failed to start Connector Binding = {0} +bad_vdb_extension=The extension of the file name must be either ".vdb" for designer vdb or "xxx-vdb.xml" for dynamic VDBs +bad_connector_type_name="Teiid connector type names must start with \"connector-\"" +connector_type_exists=Connector type with name:"{0}" already exists! +connector_type_not_found=Connector Type template "{0}" not found in the configuration. \ No newline at end of file Property changes on: trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/runtime/src/main/java/org/teiid/deployers/BaseMultipleVFSParsingDeployer.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/BaseMultipleVFSParsingDeployer.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/runtime/src/main/java/org/teiid/deployers/BaseMultipleVFSParsingDeployer.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -27,9 +27,11 @@ import java.util.Map; import java.util.Set; +import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.spi.deployer.MultipleVFSParsingDeployer; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.virtual.VirtualFile; +import org.jboss.virtual.VirtualFileFilter; /** * Overriding the base MultipleVFSParsingDeployer so that the parse method is supplied with VFSDeploymentUnit. @@ -37,17 +39,27 @@ */ public abstract class BaseMultipleVFSParsingDeployer<T> extends MultipleVFSParsingDeployer<T> { - public BaseMultipleVFSParsingDeployer(Class<T> output,Map<String, Class<?>> mappings, String suffix, Class<?> suffixClass) { + private String suffix2; + private Class<?> suffixClass2; + + public BaseMultipleVFSParsingDeployer(Class<T> output,Map<String, Class<?>> mappings, String suffix, Class<?> suffixClass, String suffix2, Class<?>suffixClass2) { super(output, mappings, suffix, suffixClass); + this.suffix2 = suffix2; + this.suffixClass2 = suffixClass2; } - public BaseMultipleVFSParsingDeployer(Class<T> output,Map<String, Class<?>> mappings) { - super(output, mappings); - } - @SuppressWarnings("unchecked") @Override protected T mergeFiles(VFSDeploymentUnit unit, T root,List<VirtualFile> files, Set<String> missingFiles) throws Exception { + + List<VirtualFile> matched = unit.getMetaDataFiles(new VirtualFileFilter() { + @Override + public boolean accepts(VirtualFile file) { + return file.getName().endsWith(suffix2); + } + }); + + files.addAll(matched); Map<Class<?>, List<Object>> metadata = new HashMap<Class<?>, List<Object>>(); for (VirtualFile file : files) { Class<?> clazz = matchFileToClass(unit, file); @@ -63,8 +75,16 @@ } @Override + protected Class<?> matchFileToClass(DeploymentUnit unit, VirtualFile file){ + if (file.getName().endsWith(this.suffix2)) { + return this.suffixClass2; + } + return super.matchFileToClass(unit, file); + } + + @Override protected <U> U parse(Class<U> expectedType, VirtualFile file, Object root) throws Exception{ - throw new UnsupportedOperationException("This will be never invoked"); + throw new UnsupportedOperationException("This will be never invoked"); //$NON-NLS-1$ } protected abstract <U> U parse(VFSDeploymentUnit unit, Class<U> expectedType, VirtualFile file, Object root) throws Exception; } Modified: trunk/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -33,6 +33,7 @@ import org.teiid.adminapi.impl.VDBMetaData; import org.teiid.metadata.index.IndexConstants; import org.teiid.metadata.index.IndexMetadataFactory; +import org.teiid.runtime.RuntimePlugin; import com.metamatrix.core.CoreConstants; import com.metamatrix.core.MetaMatrixRuntimeException; @@ -54,7 +55,7 @@ try { URL url = Thread.currentThread().getContextClassLoader().getResource(CoreConstants.SYSTEM_VDB); if (url == null) { - throw new MetaMatrixRuntimeException("System.vdb not found in classpath"); + throw new MetaMatrixRuntimeException(RuntimePlugin.Util.getString("system_vdb_not_found")); //$NON-NLS-1$ } SystemVDBContext systemVDB = new SystemVDBContext(url); VirtualFile vdb = new VirtualFile(systemVDB.getRoot()); @@ -71,9 +72,9 @@ } this.vdbRepository.addMetadataStore(deployment, imf.getMetadataStore()); } catch (URISyntaxException e) { - throw new MetaMatrixRuntimeException(e, "Failed to deploy "+CoreConstants.SYSTEM_VDB); + throw new MetaMatrixRuntimeException(e, RuntimePlugin.Util.getString("failed_to_deployed", CoreConstants.SYSTEM_VDB)); //$NON-NLS-1$ } catch (IOException e) { - throw new MetaMatrixRuntimeException(e, "Failed to deploy "+CoreConstants.SYSTEM_VDB); + throw new MetaMatrixRuntimeException(e, RuntimePlugin.Util.getString("failed_to_deployed", CoreConstants.SYSTEM_VDB)); //$NON-NLS-1$ } } Modified: trunk/runtime/src/main/java/org/teiid/deployers/UDFMetaData.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/UDFMetaData.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/runtime/src/main/java/org/teiid/deployers/UDFMetaData.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -21,21 +21,40 @@ */ package org.teiid.deployers; +import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import org.jboss.managed.api.annotation.ManagementObject; +import org.jboss.virtual.VirtualFile; +import org.teiid.runtime.RuntimePlugin; +import com.metamatrix.query.function.metadata.FunctionMetadataReader; import com.metamatrix.query.function.metadata.FunctionMethod; @ManagementObject public class UDFMetaData { - private Collection <FunctionMethod> methods = null; + private Collection <FunctionMethod> methods = new ArrayList<FunctionMethod>(); - public UDFMetaData(Collection <FunctionMethod> methods) { - this.methods = methods; + private HashMap<String, VirtualFile> files = new HashMap<String, VirtualFile>(); + + public void addModelFile(VirtualFile file) { + this.files.put(file.getName(), file); } - public Collection <FunctionMethod> getMethods(){ + + void buildFunctionModelFile(String name) throws IOException { + VirtualFile file = this.files.get(name); + if (file != null) { + this.methods.addAll(FunctionMetadataReader.loadFunctionMethods(file.openStream())); + } + else { + throw new IOException(RuntimePlugin.Util.getString("udf_model_not_found", name)); //$NON-NLS-1$ + } + } + + public Collection <FunctionMethod> getFunctions(){ return this.methods; } } Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -49,6 +49,7 @@ import org.teiid.metadata.CompositeMetadataStore; import org.teiid.metadata.TransformationMetadata; import org.teiid.metadata.index.IndexMetadataFactory; +import org.teiid.runtime.RuntimePlugin; import com.metamatrix.core.CoreConstants; import com.metamatrix.core.util.FileUtils; @@ -72,12 +73,12 @@ public void deploy(DeploymentUnit unit, VDBMetaData deployment) throws DeploymentException { if (this.vdbRepository.getVDB(deployment.getName(), deployment.getVersion()) != null) { this.vdbRepository.removeVDB(deployment.getName(), deployment.getVersion()); - log.info("Re-deploying VDB = "+deployment); + log.info(RuntimePlugin.Util.getString("redeploying_vdb", deployment)); //$NON-NLS-1$ } List<String> errors = deployment.getValidityErrors(); if (errors != null && !errors.isEmpty()) { - throw new DeploymentException("VDB has validaity errors; failed to deploy"); + throw new DeploymentException(RuntimePlugin.Util.getString("validity_errors_in_vdb", deployment)); //$NON-NLS-1$ } // Add system model to the deployed VDB @@ -85,7 +86,7 @@ system.setName(CoreConstants.SYSTEM_MODEL); system.setVisible(true); system.setModelType(Model.Type.PHYSICAL.name()); - system.addSourceMapping("system", "system"); + system.addSourceMapping("system", "system"); //$NON-NLS-1$ //$NON-NLS-2$ system.setSupportsMultiSourceBindings(false); deployment.addModel(system); @@ -132,7 +133,7 @@ try { saveMetadataStore((VFSDeploymentUnit)unit, deployment, metadata.getMetadataStore()); } catch (IOException e1) { - log.warn("failed to save metadata for VDB "+deployment.getName()+"."+deployment.getVersion(), e1); + log.warn(RuntimePlugin.Util.getString("vdb_save_failed", deployment.getName()+"."+deployment.getVersion()), e1); //$NON-NLS-1$ //$NON-NLS-2$ } boolean valid = validateSources(deployment); @@ -141,7 +142,7 @@ if (valid) { deployment.setStatus(VDB.Status.ACTIVE); } - log.info("VDB = "+deployment + " deployed"); + log.info(RuntimePlugin.Util.getString("vdb_deployed",deployment)); //$NON-NLS-1$ } private boolean validateSources(VDBMetaData deployment) { @@ -149,13 +150,16 @@ for(Model m:deployment.getModels()) { ModelMetaData model = (ModelMetaData)m; for (String sourceName:model.getSourceNames()) { + if (sourceName.equals(CoreConstants.SYSTEM_MODEL)) { + continue; + } String jndiName = model.getSourceJndiName(sourceName); try { InitialContext ic = new InitialContext(); ic.lookup(jndiName); } catch (NamingException e) { valid = false; - String msg = "Jndi resource = "+ jndiName + " not found for Source Name = "+sourceName; + String msg = RuntimePlugin.Util.getString("jndi_not_found", jndiName,sourceName); //$NON-NLS-1$ model.addError(ModelMetaData.ValidationError.Severity.ERROR.name(), msg); log.info(msg); } @@ -171,14 +175,14 @@ // get the system VDB metadata store MetadataStore systemStore = this.vdbRepository.getMetadataStore(CoreConstants.SYSTEM_VDB, 1); if (systemStore == null) { - throw new DeploymentException("System.vdb needs to be loaded before any other VDBs."); + throw new DeploymentException(RuntimePlugin.Util.getString("system_vdb_load_error")); //$NON-NLS-1$ } store.addMetadataStore(systemStore); Collection <FunctionMethod> methods = null; if (udf != null) { - methods = udf.getMethods(); + methods = udf.getFunctions(); } TransformationMetadata metadata = new TransformationMetadata(vdb, store, visibilityMap, methods); @@ -206,10 +210,10 @@ try { deleteMetadataStore((VFSDeploymentUnit)unit, deployment); } catch (IOException e) { - log.warn("failed to delete the cached metadata files due to:" + e.getMessage()); + log.warn(RuntimePlugin.Util.getString("vdb_delete_failed", e.getMessage())); //$NON-NLS-1$ } - log.info("VDB = "+deployment + " undeployed"); + log.info(RuntimePlugin.Util.getString("vdb_undeployed", deployment)); //$NON-NLS-1$ } public void setContextCache(DQPContextCache cache) { @@ -225,7 +229,7 @@ } private void saveMetadataStore(VFSDeploymentUnit unit, VDBMetaData vdb, CompositeMetadataStore store) throws IOException { - File cacheFileName = this.serializer.getAttachmentPath(unit, vdb.getName()+"_"+vdb.getVersion()); + File cacheFileName = this.serializer.getAttachmentPath(unit, vdb.getName()+"_"+vdb.getVersion()); //$NON-NLS-1$ if (!cacheFileName.exists()) { this.serializer.saveAttachment(cacheFileName,store); } @@ -233,7 +237,7 @@ private void deleteMetadataStore(VFSDeploymentUnit unit, VDBMetaData vdb) throws IOException { if (!unit.getRoot().exists()) { - File cacheFileName = this.serializer.getAttachmentPath(unit, vdb.getName()+"_"+vdb.getVersion()); + File cacheFileName = this.serializer.getAttachmentPath(unit, vdb.getName()+"_"+vdb.getVersion()); //$NON-NLS-1$ if (cacheFileName.exists()) { FileUtils.removeDirectoryAndChildren(cacheFileName.getParentFile()); } @@ -242,10 +246,10 @@ private MetadataStore buildDynamicMetadataStore(VFSDeploymentUnit unit, VDBMetaData vdb, ModelMetaData model) throws DeploymentException{ if (model.getSourceNames().isEmpty()) { - throw new DeploymentException(vdb.getName()+"-"+vdb.getVersion()+" Can not be deployed because model {"+model.getName()+"} is not fully configured."); + throw new DeploymentException(RuntimePlugin.Util.getString("fail_to_deploy", vdb.getName()+"-"+vdb.getVersion(), model.getName())); //$NON-NLS-1$ //$NON-NLS-2$ } - boolean cache = "cached".equalsIgnoreCase(vdb.getPropertyValue("UseConnectorMetadata")); + boolean cache = "cached".equalsIgnoreCase(vdb.getPropertyValue("UseConnectorMetadata")); //$NON-NLS-1$ //$NON-NLS-2$ File cacheFile = null; if (cache) { try { @@ -254,9 +258,9 @@ return this.serializer.loadAttachment(cacheFile, MetadataStore.class); } } catch (IOException e) { - log.warn("invalid metadata in file = "+cacheFile.getAbsolutePath()); + log.warn(RuntimePlugin.Util.getString("invalid_metadata_file", cacheFile.getAbsolutePath())); //$NON-NLS-1$ } catch (ClassNotFoundException e) { - log.warn("invalid metadata in file = "+cacheFile.getAbsolutePath()); + log.warn(RuntimePlugin.Util.getString("invalid_metadata_file", cacheFile.getAbsolutePath())); //$NON-NLS-1$ } } @@ -283,10 +287,10 @@ } } } - throw new DeploymentException(vdb.getName()+"-"+vdb.getVersion()+" Can not be deployed because model {"+model.getName()+"} can not retrive metadata", exception); + throw new DeploymentException(RuntimePlugin.Util.getString("failed_to_retrive_metadata", vdb.getName()+"-"+vdb.getVersion(), model.getName()), exception); //$NON-NLS-1$ //$NON-NLS-2$ } private File buildCachedFileName(VFSDeploymentUnit unit, VDBMetaData vdb, String modelName) { - return this.serializer.getAttachmentPath(unit, vdb.getName()+"_"+vdb.getVersion()+"_"+modelName); + return this.serializer.getAttachmentPath(unit, vdb.getName()+"_"+vdb.getVersion()+"_"+modelName); //$NON-NLS-1$ //$NON-NLS-2$ } } Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBParserDeployer.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/VDBParserDeployer.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/runtime/src/main/java/org/teiid/deployers/VDBParserDeployer.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -37,17 +37,18 @@ import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.logging.Logger; import org.jboss.virtual.VirtualFile; +import org.teiid.adminapi.Model; import org.teiid.adminapi.impl.ModelMetaData; import org.teiid.adminapi.impl.VDBMetaData; import org.teiid.metadata.CompositeMetadataStore; import org.teiid.metadata.index.IndexConstants; import org.teiid.metadata.index.IndexMetadataFactory; +import org.teiid.runtime.RuntimePlugin; import org.xml.sax.SAXException; import com.metamatrix.core.CoreConstants; import com.metamatrix.core.util.StringUtil; import com.metamatrix.core.vdb.VdbConstants; -import com.metamatrix.query.function.metadata.FunctionMetadataReader; /** * This file loads the "vdb.xml" file inside a ".vdb" file, along with all the metadata in the .INDEX files @@ -57,14 +58,16 @@ private ObjectSerializer serializer; public VDBParserDeployer() { - super(VDBMetaData.class, getCustomMappings(), IndexConstants.NAME_DELIM_CHAR+IndexConstants.INDEX_EXT, IndexMetadataFactory.class); + super(VDBMetaData.class, getCustomMappings(), IndexConstants.NAME_DELIM_CHAR+IndexConstants.INDEX_EXT, IndexMetadataFactory.class, VdbConstants.MODEL_EXT, UDFMetaData.class); setAllowMultipleFiles(true); } private static Map<String, Class<?>> getCustomMappings() { Map<String, Class<?>> mappings = new HashMap<String, Class<?>>(); mappings.put(VdbConstants.DEPLOYMENT_FILE, VDBMetaData.class); - mappings.put(VdbConstants.UDF_FILE_NAME, UDFMetaData.class); + // this not required but the to make the framework with extended classes + // this required otherwise different version of parse is invoked. + mappings.put("undefined", UDFMetaData.class); //$NON-NLS-1$ return mappings; } @@ -77,7 +80,14 @@ return expectedType.cast(def); } else if (expectedType.equals(UDFMetaData.class)) { - UDFMetaData udf = new UDFMetaData(FunctionMetadataReader.loadFunctionMethods(file.openStream())); + if (root == null) { + root = unit.getAttachment(UDFMetaData.class); + if (root == null) { + root = new UDFMetaData(); + } + } + UDFMetaData udf = UDFMetaData.class.cast(root); + udf.addModelFile(file); return expectedType.cast(udf); } else if (expectedType.equals(IndexMetadataFactory.class)) { @@ -93,14 +103,14 @@ return expectedType.cast(imf); } else { - throw new IllegalArgumentException("Cannot match arguments: expectedClass=" + expectedType ); + throw new IllegalArgumentException("Cannot match arguments: expectedClass=" + expectedType ); //$NON-NLS-1$ } } static Unmarshaller getUnMarsheller() throws JAXBException, SAXException { JAXBContext jc = JAXBContext.newInstance(new Class<?>[] {VDBMetaData.class}); SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); - Schema schema = schemaFactory.newSchema(VDBMetaData.class.getResource("/vdb-deployer.xsd")); + Schema schema = schemaFactory.newSchema(VDBMetaData.class.getResource("/vdb-deployer.xsd")); //$NON-NLS-1$ Unmarshaller un = jc.createUnmarshaller(); un.setSchema(schema); return un; @@ -108,22 +118,22 @@ @Override protected VDBMetaData mergeMetaData(VFSDeploymentUnit unit, Map<Class<?>, List<Object>> metadata) throws Exception { - VDBMetaData def = getInstance(metadata, VDBMetaData.class); + VDBMetaData vdb = getInstance(metadata, VDBMetaData.class); UDFMetaData udf = getInstance(metadata, UDFMetaData.class); - if (def == null) { - log.error("Invalid VDB file deployment failed ="+unit.getRoot().getName()); + if (vdb == null) { + log.error(RuntimePlugin.Util.getString("invlaid_vdb_file",unit.getRoot().getName())); //$NON-NLS-1$ return null; } - def.setUrl(unit.getRoot().toURL().toExternalForm()); + vdb.setUrl(unit.getRoot().toURL().toExternalForm()); // add the entries and determine their visibility VirtualFile root = unit.getRoot(); List<VirtualFile> children = root.getChildrenRecursively(); Map<VirtualFile, Boolean> visibilityMap = new LinkedHashMap<VirtualFile, Boolean>(); for(VirtualFile f: children) { - visibilityMap.put(f, isFileVisible(f.getPathName(), def)); + visibilityMap.put(f, isFileVisible(f.getPathName(), vdb)); } // build the metadata store @@ -133,10 +143,10 @@ if (imf != null) { imf.addEntriesPlusVisibilities(visibilityMap); unit.addAttachment(IndexMetadataFactory.class, imf); - + // add the cached store. CompositeMetadataStore store = null; - File cacheFileName = this.serializer.getAttachmentPath(unit, def.getName()+"_"+def.getVersion()); + File cacheFileName = this.serializer.getAttachmentPath(unit, vdb.getName()+"_"+vdb.getVersion()); //$NON-NLS-1$ if (cacheFileName.exists()) { store = this.serializer.loadAttachment(cacheFileName, CompositeMetadataStore.class); } @@ -147,13 +157,20 @@ } } - // If the UDF file is enclosed then attach it to the deployment artifact if (udf != null) { + // load the UDF + for(Model model:vdb.getModels()) { + if (model.getModelType().equals(Model.Type.FUNCTION)) { + udf.buildFunctionModelFile(model.getName()+VdbConstants.MODEL_EXT); + } + } + + // If the UDF file is enclosed then attach it to the deployment artifact unit.addAttachment(UDFMetaData.class, udf); } - log.debug("VDB "+unit.getRoot().getName()+" has been parsed."); - return def; + log.debug("VDB "+unit.getRoot().getName()+" has been parsed."); //$NON-NLS-1$ //$NON-NLS-2$ + return vdb; } private final static boolean isSystemModelWithSystemTableType(String modelName) { Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -35,10 +35,12 @@ import org.teiid.connector.metadata.runtime.MetadataStore; import org.teiid.metadata.CompositeMetadataStore; import org.teiid.metadata.TransformationMetadata; +import org.teiid.runtime.RuntimePlugin; +import com.metamatrix.common.log.LogManager; import com.metamatrix.common.types.DataTypeManager; +import com.metamatrix.common.util.LogConstants; import com.metamatrix.core.CoreConstants; -import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; import com.metamatrix.vdb.runtime.VDBKey; /** @@ -54,7 +56,7 @@ public void addVDB(VDBMetaData vdb) throws DeploymentException { if (getVDB(vdb.getName(), vdb.getVersion()) != null) { - throw new DeploymentException("VDB with given name and version already exists!"); + throw new DeploymentException(RuntimePlugin.Util.getString("duplicate_vdb", vdb.getName(), vdb.getVersion())); //$NON-NLS-1$ } this.vdbRepo.put(vdbId(vdb), vdb); } @@ -81,14 +83,14 @@ } } if(latestVersion == 0) { - throw new VirtualDatabaseException(DQPEmbeddedPlugin.Util.getString("VDBService.VDB_does_not_exist._2", vdbName, "latest")); //$NON-NLS-1$ //$NON-NLS-2$ + throw new VirtualDatabaseException(RuntimePlugin.Util.getString("VDBService.VDB_does_not_exist._2", vdbName, "latest")); //$NON-NLS-1$ //$NON-NLS-2$ } VDBMetaData vdb = getVDB(vdbName, latestVersion); if (vdb.getStatus() == VDB.Status.ACTIVE || vdb.getStatus() == VDB.Status.ACTIVE_DEFAULT) { return vdb; } - throw new VirtualDatabaseException(DQPEmbeddedPlugin.Util.getString("VDBService.VDB_does_not_exist._2", vdbName, latestVersion)); //$NON-NLS-1$ + throw new VirtualDatabaseException(RuntimePlugin.Util.getString("VDBService.VDB_does_not_exist._2", vdbName, latestVersion)); //$NON-NLS-1$ } public void changeVDBStatus(String vdbName, int vdbVersion, VDB.Status status) throws VirtualDatabaseException { @@ -101,7 +103,7 @@ // Change the VDB's status if (status == VDB.Status.ACTIVE || status == VDB.Status.ACTIVE_DEFAULT) { if (!vdb.isValid()) { - throw new VirtualDatabaseException(DQPEmbeddedPlugin.Util.getString("EmbeddedConfigurationService.invalid_vdb", vdb.getName())); //$NON-NLS-1$ + throw new VirtualDatabaseException(RuntimePlugin.Util.getString("EmbeddedConfigurationService.invalid_vdb", vdb.getName())); //$NON-NLS-1$ } if (status == VDB.Status.ACTIVE_DEFAULT) { // only 1 can be set as active default @@ -116,12 +118,12 @@ // make sure we got what we asked for if (status != vdb.getStatus()) { - throw new VirtualDatabaseException(DQPEmbeddedPlugin.Util.getString("VDBService.vdb_change_status_failed", new Object[] { vdbName, vdbVersion, status })); //$NON-NLS-1$ + throw new VirtualDatabaseException(RuntimePlugin.Util.getString("VDBService.vdb_change_status_failed", new Object[] { vdbName, vdbVersion, status })); //$NON-NLS-1$ } // now save the change in the configuration. saveVDB(vdb); - DQPEmbeddedPlugin.logInfo("VDBService.vdb_change_status", new Object[] { vdbName, vdbVersion, status}); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_DQP, RuntimePlugin.Util.getString("VDBService.vdb_change_status", new Object[] { vdbName, vdbVersion, status})); //$NON-NLS-1$ } } Added: trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java (rev 0) +++ trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ +package org.teiid.runtime; + +import java.util.ResourceBundle; + +import com.metamatrix.core.BundleUtil; + +public class RuntimePlugin { + private static final String PLUGIN_ID = "org.teiid.runtime" ; //$NON-NLS-1$ + private static final String BUNDLE_NAME = PLUGIN_ID + ".i18n"; //$NON-NLS-1$ + public static final BundleUtil Util = new BundleUtil(PLUGIN_ID,BUNDLE_NAME,ResourceBundle.getBundle(BUNDLE_NAME)); + +} Property changes on: trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/runtime/src/main/java/org/teiid/services/AuthorizationServiceImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/services/AuthorizationServiceImpl.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/runtime/src/main/java/org/teiid/services/AuthorizationServiceImpl.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -43,6 +43,7 @@ import org.teiid.deployers.VDBRepository; import org.teiid.dqp.internal.process.DQPWorkContext; import org.teiid.logging.api.AuditMessage; +import org.teiid.runtime.RuntimePlugin; import org.teiid.security.roles.AuthorizationActions; import org.teiid.security.roles.AuthorizationPermission; import org.teiid.security.roles.AuthorizationPoliciesHolder; @@ -60,7 +61,6 @@ import com.metamatrix.common.log.LogManager; import com.metamatrix.core.log.MessageLevel; import com.metamatrix.core.util.LRUCache; -import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; import com.metamatrix.dqp.service.AuthorizationService; import com.metamatrix.platform.security.api.MetaMatrixPrincipal; import com.metamatrix.platform.security.api.MetaMatrixPrincipalName; @@ -199,14 +199,14 @@ AuthorizationRealm aRealm = aPerm.getRealm(); if ( theRealm != null ) { if ( ! theRealm.equals(aRealm) ) { - throw new AuthorizationMgmtException(DQPEmbeddedPlugin.Util.getString("AuthorizationServiceImpl.wrong_realms ")); //$NON-NLS-1$ + throw new AuthorizationMgmtException(RuntimePlugin.Util.getString("AuthorizationServiceImpl.wrong_realms ")); //$NON-NLS-1$ } } else { theRealm = aRealm; } } if ( theRealm == null ) { - throw new AuthorizationMgmtException(DQPEmbeddedPlugin.Util.getString("AuthorizationServiceImpl.Authorization_Realm_is_null")); //$NON-NLS-1$ + throw new AuthorizationMgmtException(RuntimePlugin.Util.getString("AuthorizationServiceImpl.Authorization_Realm_is_null")); //$NON-NLS-1$ } return theRealm; } Modified: trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -31,6 +31,7 @@ import org.jboss.managed.api.annotation.ManagementProperties; import org.jboss.managed.api.annotation.ManagementProperty; import org.teiid.dqp.internal.cache.DQPContextCache; +import org.teiid.runtime.RuntimePlugin; import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.cache.CacheFactory; @@ -40,7 +41,6 @@ import com.metamatrix.common.buffer.impl.MemoryStorageManager; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.core.util.FileUtils; -import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; import com.metamatrix.dqp.service.BufferService; /** @@ -105,9 +105,9 @@ } } catch(MetaMatrixComponentException e) { - throw new MetaMatrixRuntimeException(e, DQPEmbeddedPlugin.Util.getString("LocalBufferService.Failed_initializing_buffer_manager._8")); //$NON-NLS-1$ + throw new MetaMatrixRuntimeException(e, RuntimePlugin.Util.getString("LocalBufferService.Failed_initializing_buffer_manager._8")); //$NON-NLS-1$ } catch(IOException e) { - throw new MetaMatrixRuntimeException(e, DQPEmbeddedPlugin.Util.getString("LocalBufferService.Failed_initializing_buffer_manager._8")); //$NON-NLS-1$ + throw new MetaMatrixRuntimeException(e, RuntimePlugin.Util.getString("LocalBufferService.Failed_initializing_buffer_manager._8")); //$NON-NLS-1$ } } Modified: trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -46,6 +46,7 @@ import org.teiid.deployers.VDBRepository; import org.teiid.deployers.VirtualDatabaseException; import org.teiid.dqp.internal.process.DQPCore; +import org.teiid.runtime.RuntimePlugin; import org.teiid.security.Credentials; import org.teiid.security.SecurityHelper; @@ -56,7 +57,6 @@ import com.metamatrix.common.log.LogManager; import com.metamatrix.common.util.LogConstants; import com.metamatrix.core.util.ArgCheck; -import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; import com.metamatrix.dqp.service.SessionService; import com.metamatrix.platform.security.api.SessionToken; @@ -97,10 +97,10 @@ for (SessionMetadata info : sessionCache.values()) { try { if (currentTime - info.getLastPingTime() > ServerConnection.PING_INTERVAL * 5) { - LogManager.logInfo(LogConstants.CTX_SESSION, DQPEmbeddedPlugin.Util.getString( "SessionServiceImpl.keepaliveFailed", info.getSessionId())); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_SESSION, RuntimePlugin.Util.getString( "SessionServiceImpl.keepaliveFailed", info.getSessionId())); //$NON-NLS-1$ closeSession(info.getSessionId()); } else if (sessionExpirationTimeLimit > 0 && currentTime - info.getCreatedTime() > sessionExpirationTimeLimit) { - LogManager.logInfo(LogConstants.CTX_SESSION, DQPEmbeddedPlugin.Util.getString( "SessionServiceImpl.expireSession", info.getSessionId())); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_SESSION, RuntimePlugin.Util.getString( "SessionServiceImpl.expireSession", info.getSessionId())); //$NON-NLS-1$ closeSession(info.getSessionId()); } } catch (Exception e) { @@ -114,7 +114,7 @@ LogManager.logDetail(LogConstants.CTX_SESSION, new Object[] {"closeSession", sessionID}); //$NON-NLS-1$ SessionMetadata info = this.sessionCache.remove(sessionID); if (info == null) { - throw new InvalidSessionException(DQPEmbeddedPlugin.Util.getString("SessionServiceImpl.invalid_session", sessionID)); //$NON-NLS-1$ + throw new InvalidSessionException(RuntimePlugin.Util.getString("SessionServiceImpl.invalid_session", sessionID)); //$NON-NLS-1$ } if (info.getVDBName() != null) { try { @@ -178,12 +178,12 @@ productInfo.put(MMURL.JDBC.VDB_NAME, vdb.getName()); productInfo.put(MMURL.JDBC.VDB_VERSION, vdb.getVersion()); } catch (VirtualDatabaseException e) { - throw new SessionServiceException(DQPEmbeddedPlugin.Util.getString("VDBService.VDB_does_not_exist._2", vdbName, vdbVersion==null?"latest":vdbVersion)); //$NON-NLS-1$ //$NON-NLS-2$ + throw new SessionServiceException(RuntimePlugin.Util.getString("VDBService.VDB_does_not_exist._2", vdbName, vdbVersion==null?"latest":vdbVersion)); //$NON-NLS-1$ //$NON-NLS-2$ } } if (sessionMaxLimit > 0 && getActiveSessionsCount() >= sessionMaxLimit) { - throw new SessionServiceException(DQPEmbeddedPlugin.Util.getString("SessionServiceImpl.reached_max_sessions", new Object[] {new Long(sessionMaxLimit)})); //$NON-NLS-1$ + throw new SessionServiceException(RuntimePlugin.Util.getString("SessionServiceImpl.reached_max_sessions", new Object[] {new Long(sessionMaxLimit)})); //$NON-NLS-1$ } long creationTime = System.currentTimeMillis(); @@ -260,12 +260,12 @@ @Override public boolean terminateSession(long terminatedSessionID, long adminSessionID) { Object[] params = {adminSessionID, terminatedSessionID}; - LogManager.logInfo(LogConstants.CTX_SESSION, DQPEmbeddedPlugin.Util.getString( "SessionServiceImpl.terminateSession", params)); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_SESSION, RuntimePlugin.Util.getString( "SessionServiceImpl.terminateSession", params)); //$NON-NLS-1$ try { closeSession(terminatedSessionID); return true; } catch (InvalidSessionException e) { - LogManager.logWarning(LogConstants.CTX_SESSION,e,DQPEmbeddedPlugin.Util.getString("SessionServiceImpl.invalid_session", new Object[] {e.getMessage()})); //$NON-NLS-1$ + LogManager.logWarning(LogConstants.CTX_SESSION,e,RuntimePlugin.Util.getString("SessionServiceImpl.invalid_session", new Object[] {e.getMessage()})); //$NON-NLS-1$ return false; } } @@ -280,7 +280,7 @@ throws InvalidSessionException { SessionMetadata info = this.sessionCache.get(sessionID); if (info == null) { - throw new InvalidSessionException(DQPEmbeddedPlugin.Util.getString("SessionServiceImpl.invalid_session", sessionID)); //$NON-NLS-1$ + throw new InvalidSessionException(RuntimePlugin.Util.getString("SessionServiceImpl.invalid_session", sessionID)); //$NON-NLS-1$ } return info; } Modified: trunk/runtime/src/main/java/org/teiid/services/TeiidLoginContext.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/services/TeiidLoginContext.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/runtime/src/main/java/org/teiid/services/TeiidLoginContext.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -38,12 +38,12 @@ import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; +import org.teiid.runtime.RuntimePlugin; import org.teiid.security.Credentials; import org.teiid.security.SecurityHelper; import com.metamatrix.common.log.LogManager; import com.metamatrix.common.util.LogConstants; -import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; /** * This class serves as the primary implementation of the @@ -98,7 +98,7 @@ LogManager.logDetail(LogConstants.CTX_MEMBERSHIP,e, e.getMessage()); } } - throw new LoginException(DQPEmbeddedPlugin.Util.getString("SessionServiceImpl.The_username_0_and/or_password_are_incorrect", username )); //$NON-NLS-1$ + throw new LoginException(RuntimePlugin.Util.getString("SessionServiceImpl.The_username_0_and/or_password_are_incorrect", username )); //$NON-NLS-1$ } protected LoginContext createLoginContext(String domain, CallbackHandler handler) throws LoginException { Modified: trunk/runtime/src/main/java/org/teiid/transport/ClientServiceRegistryImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/ClientServiceRegistryImpl.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/runtime/src/main/java/org/teiid/transport/ClientServiceRegistryImpl.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -24,9 +24,10 @@ import java.util.HashMap; +import org.teiid.runtime.RuntimePlugin; + import com.metamatrix.api.exception.ComponentNotFoundException; import com.metamatrix.core.util.ReflectionHelper; -import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; public class ClientServiceRegistryImpl { @@ -63,7 +64,7 @@ public ClientService getClientService(String iface) throws ComponentNotFoundException { ClientService cs = clientServices.get(iface); if (cs == null) { - throw new ComponentNotFoundException(DQPEmbeddedPlugin.Util.getString("ServerWorkItem.Component_Not_Found", iface)); //$NON-NLS-1$ + throw new ComponentNotFoundException(RuntimePlugin.Util.getString("ServerWorkItem.Component_Not_Found", iface)); //$NON-NLS-1$ } return cs; } Modified: trunk/runtime/src/main/java/org/teiid/transport/ServerWorkItem.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/ServerWorkItem.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/runtime/src/main/java/org/teiid/transport/ServerWorkItem.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -34,6 +34,7 @@ import org.teiid.adminapi.AdminProcessingException; import org.teiid.dqp.internal.process.DQPWorkContext; +import org.teiid.runtime.RuntimePlugin; import org.teiid.transport.ClientServiceRegistryImpl.ClientService; import com.metamatrix.api.exception.ExceptionHolder; @@ -45,7 +46,6 @@ import com.metamatrix.common.util.crypto.CryptoException; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.dqp.client.ResultsFuture; -import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; import com.metamatrix.platform.security.api.SessionToken; public class ServerWorkItem { @@ -146,7 +146,7 @@ } else if (e instanceof AdminProcessingException) { logProcessingException(e, context); } else { - LogManager.logError(context, e, DQPEmbeddedPlugin.Util.getString("ServerWorkItem.Received_exception_processing_request", this.socketClientInstance.getWorkContext().getConnectionID())); //$NON-NLS-1$ + LogManager.logError(context, e, RuntimePlugin.Util.getString("ServerWorkItem.Received_exception_processing_request", this.socketClientInstance.getWorkContext().getConnectionID())); //$NON-NLS-1$ } return new ExceptionHolder(e); @@ -159,6 +159,6 @@ } StackTraceElement elem = cause.getStackTrace()[0]; LogManager.logDetail(context, e, "Processing exception for session", this.socketClientInstance.getWorkContext().getConnectionID()); //$NON-NLS-1$ - LogManager.logWarning(context, DQPEmbeddedPlugin.Util.getString("ServerWorkItem.processing_error", e.getMessage(), this.socketClientInstance.getWorkContext().getConnectionID(), e.getClass().getName(), elem)); //$NON-NLS-1$ + LogManager.logWarning(context, RuntimePlugin.Util.getString("ServerWorkItem.processing_error", e.getMessage(), this.socketClientInstance.getWorkContext().getConnectionID(), e.getClass().getName(), elem)); //$NON-NLS-1$ } } \ No newline at end of file Modified: trunk/runtime/src/main/java/org/teiid/transport/SocketTransport.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/SocketTransport.java 2010-03-09 22:36:00 UTC (rev 1953) +++ trunk/runtime/src/main/java/org/teiid/transport/SocketTransport.java 2010-03-09 23:29:14 UTC (rev 1954) @@ -21,9 +21,10 @@ */ package org.teiid.transport; +import org.teiid.runtime.RuntimePlugin; + import com.metamatrix.common.log.LogManager; import com.metamatrix.common.util.LogConstants; -import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; /** * This class starts a Socket for DQP connections and listens on the port and hands out the connections to the @@ -43,7 +44,7 @@ public void start() { String bindAddress = this.config.getHostAddress().getHostAddress(); - LogManager.logDetail(LogConstants.CTX_SERVER, DQPEmbeddedPlugin.Util.getString("SocketTransport.1", new Object[] {bindAddress, String.valueOf(this.config.getPortNumber())})); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_SERVER, RuntimePlugin.Util.getString("SocketTransport.1", new Object[] {bindAddress, String.valueOf(this.config.getPortNumber())})); //$NON-NLS-1$ this.listener = new SocketListener(this.config.getPortNumber(), bindAddress, this.config.getInputBufferSize(), this.config.getOutputBufferSize(), this.config.getMaxSocketThreads(), this.config.getSSLConfiguration(), csr); } Added: trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties =================================================================== --- trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties (rev 0) +++ trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2010-03-09 23:29:14 UTC (rev 1954) @@ -0,0 +1,294 @@ +# +# JBoss, Home of Professional Open Source. +# See the COPYRIGHT.txt file distributed with this work for information +# regarding copyright ownership. Some portions may be licensed +# to Red Hat, Inc. under one or more contributor license agreements. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. +# + +EmbeddedConfigSource.No_configuration_file_specified_1=No configuration file specified +EmbeddedConfigSource.Can_not_load_config_file_2=Can not load config file: \"{0}\" +EmbeddedConfigSource.Service_class__4=Service class \"{0}\" is not assignable to expected type \"{1}\" +EmbeddedConfigSource.0=Error trying to initialize IndexMetadataService +EmbeddedConfigSource.1=Unable to get the url for the system vdb from the current configuration. +EmbeddedConfigSource.Unable_to_find_service_class_6=Unable to find service class: \"{0}\" +EmbeddedConfigSource.Unable_to_instantiate_service_class_7=Unable to instantiate service class: \"{0}\" +EmbeddedConfigSource.Unable_to_instantiate_service_class_due_to_security_error_8=Unable to instantiate service class due to security error: \"{0}\" +EmbeddedConfigurationService.invalid_vdb=Failed to add/load the VDB \"{0}\", because it is invalid + +VDBConfigurationWriter.vdb_delete_failed=Failed to delete VDB \"{0}\" with version \"{1}\" from configuration +VDBConfigurationWriter.vdb_delete=Successfully deleted VDB \"{0}\" with version \"{1}\" from configuration + +LocalBufferService.Error_initializing_buffer_manager__missing_required_property_7=Error initializing buffer manager: missing required property \"{0}\" +LocalBufferService.Failed_initializing_buffer_manager._8=Failed initializing buffer manager. +ServerConfiguration.Props_file_null=Properties file name must be non-null +ServerConfiguration.Err_interpreting_property=Error interpreting property \"{0}\" with value \"{1}\" as a URL. +ServerConfiguration.Req_prop_not_specified=Required property \"{0}\" not specified + +VDBConfigFileReader.Connector_type_names_do_not_match=Connector type names do not match: \"{0}\" and \"{1}\". +VDBConfigFileReader.No_connector_type_for_connector=Configuration has no connector type definition for type \"{0}\" for connector binding \"{1}\". +VDBConfigFileReader.Already_contains_connector_type=Configuration has two definitions for connector type \"{0}\". +VDBConfigFileReader.No_connector_binding_in_config = A model \"{0}\" specifies a connector binding "{1}" for which there is no definition found in the configuration or VDB definition files. + +VDBService.VDB_does_not_exist._2=VDB \"{0}\" version \"{1}\" is not active. +VDBService.VDB_does_not_exist._3=In VDB \"{0}\" version \"{1}\" the Model \"{2}\" does not exist. +VDBService.Model_does_not_exist._4=Model "{0}" does not exist. +VDBService.0=Error trying to read visibility information from the vdb \"{0}\". +LOAD_VDB.FAILED.0=Invalid file location \"{0}\". The VDB file location must be a file or a directory path. +VDBService.failed_load=Failed to load the VDB +VDBService.lookup=VDB \"{0}\" with version \"{1}\" being loaded from configuration +VDBService.vdb_deleted=VDB \"{0}\" with version \"{1}\" deleted from VDB Service and configuration +VDBService.vdb_change_status=VDB \"{0}\" with version \"{1}\" has changed its status from \"{2}\" to \"{3}\" in VDBService +VDBService.vdb_change_status_failed=VDB \"{0}\" with version \"{1}\" has failed to change its status from \"{2}\" to \"{3}\" in VDBService +VDBService.connector_binding_changed=VDB \"{0}\" with version \"{1}\" has changed its connector binding for model name \"{2}\" with \"{3}\" +VDBService.vdb_already_exists=VDB \"{0}\" with version \"{1}\" already exists in the configuration, saving as a new version of the VDB +VDBService.vdb_deployed=VDB \"{0}\" with version \"{1}\" has been deployed to the Teiid system. +VDBService.vdb_loded=VDB \"{0}\" with version \"{1}\" has been loaded from the configuration. +VDBService.vdb_missing_bindings=VDB \"{0}\" with version \"{1}\" is incomplete, it does not have all the connector bindings mapped to their physical models. +VDBService.lookup=VDB \"{0}\" with version \"{1}\" being loaded from configuration +VDBService.vdb_deleted=VDB \"{0}\" with version \"{1}\" deleted from VDB Service and configuration +VDBService.connector_binding_changed=VDB \"{0}\" with version \"{1}\" has changed its connector binding for model name {2} with {3} +VDBService.vdb_already_exists=VDB \"{0}\" with version \"{1}\" already exists in the configuration, saving as a new version of the VDB +VDBService.vdb_deployed=VDB \"{0}\" with version \"{1}\" has been deployed to the Teiid system. +VDBService.vdb_loded=VDB \"{0}\" with version \"{1}\" has been loaded from the configuration. +VDBService.vdb_missing_bindings=VDB \"{0}\" with version \"{1}\" is incomplete, it does not have all the connector bindings mapped to their physical models. +VDBService.vdb_active=VDB \"{0}\" with version \"{1}\" is set to ACTIVE. +VDBService.validityErrors=Failed to deploy VDB \"{0}\" because it has following validity errors; {1} +VDBService.vdb_missing_models=VDB \"{0}\" with version \"{1}\" is Invalid; This archive has no models defined. + +DataService.Didnt_find_caps=Unable to find capabilities for {0} +DataService.Unable_to_find_connector_manager_for_{0}_1=Unable to find connector manager for \"{0}\" +DataService.Unable_to_find_connector=Invalid Connector name supplied or Connector not found: \"{0}\" +DataService.System_model_initialze_error=Connector Binding for the System Model is not initialized +DataService.System_model_failed_start=Failed to add the System Model connector to the system +DataService.failed_to_load_connector=Failed to load the Connector Binding with name \"{0}\" in the configuration +DataService.Connector_State_invalid=Connector Binding \"{0}\" failed to start, or did not start correctly. Please check the connector binding properties. Check the log file for more information. +DataService.useClassloader=Connector is using the following Classpth to load a new ClassLoader=\"{0}\" +DataService.Failed_To_Start=Embedded DataService Failed to start. Check the Connector Binding proeprties. +DataService.Failed_Initialize_CM=Failed to Properly initialize the Connector manager for Connector Binding \"{0}\" +DataService.Stopped= Data Service is stopped. All the Connector bindings have been stopped. +DataService.Started=Data Service initialized and started and running.. +DataService.Connector_Stopped=Connector Service \"{0}\" has been stopped +DataService.Connector_Started=Connector Service \"{0}\" has been started. +DataService.Connector_Deleted=Connector Service \"{0}\" has been Deleted from the Data Service and Configuration +DataService.Connector_Added=Connector Service \"{0}\" has been Added to the Data Service and also Configuration +DataService.Connector_exists=Connector binding with name \"{0}\" already exists. Connector name must be unique. +DataService.Connector_does_not_exists=Connector binding with name \"{0}\" does not exist in the configuration. +DataService.Connector_modified=Connector Binding with name \"{0}\" has been modified. +DataService.Connector_Stopped=Connector Service {0} has been stopped +DataService.Connector_Started=Connector Service {0} has been started. +DataService.Connector_Deleted=Connector Service {0} has been Deleted from the Data Service and Configuration +DataService.Connector_Added=Connector Service {0} has been Added to the Data Service and also Configuration +DataService.Connector_exists_replace=Connector binding with name {0} already exists. The old connector will be replaced with the new connector. +DataService.Connector_exists=Connector binding with name {0} already exists. Connector name must be unique to add, using the old connector as it is. +DataService.Connector_does_not_exists=Connector binding with name {0} does not exist in the configuration. +DataService.Connector_modified=Connector Binding with name {0} has been modified. +DataService.Connector_type_does_not_exists=Connector Binding type specified for Connector Binding \"{0}\" does not exist in the configuration, add Connector type first. +DataService.ext_module_not_found=Required extension module \"{0}\" not found in the extensions directory. if not using extension modules ignore. +DataService.Connector_still_used=Connector Binding \"{0}\" can not be deleted because it is still in use by VDBs. Remove the assosiation with VDB before deletion. +DataService.decryption_failed=initialization of the connector binding \"{0}\" failed because, system failed to decrypt the property \"{1}\" +DataService.FailedStop=Failed to stop the connector binding "{0}" +DataService.FailedStart=Failed to start the connector binding "{0}" +DataService.ext_module_not_found=Required extension module {0} not found in the extensions directory. if not using extension modules ignore. +DataService.Connector_still_used=Connector Binding {0} can not be deleted because it is still in use by VDBs. Remove the assosiation with VDB before deletion. +DataService.Connector_failed_start=Connector Binding {0} failed to start, check the properties and start again. +DataService.no_connectors_defined=No connectors defined for binding +Failed_To_Service=Failed to get service requested + +VDBReader.Invalid_location=Invalid file location \"{0}\". No VDB files (*.DEF) found +VDBReader.Archive_not_Found=Archive file \"{0}\" not found, failed to load the VDB. +VDBReader.validityErrors=Failed to load VDB file \"{0}\" because of following validity errors; {1} + +EmbeddedConfigurationService.no_system_vdb_path=Failed to load the System.VDB, incorrect path \"{0}\" +EmbeddedConfigurationService.Server_Config_notfound=ServerConfig.xml file not found the location \"{0}\" +EmbeddedConfigurationService.Server_Config_failedload=Server Configuration file failed to load \"{0}\" +EmbeddedConfigurationService.Server_Config_notdefined=Server Configuration file is not defined in the properties file +EmbeddedConfigurationService.Alternate_binding_inuse=Connector binding \"{0}\" is using alternate properties defined in the system configuration file. +EmbeddedConfigurationService.ConnectorBinding_in_use_failed_delete=Connector binding with Name \"{0}\" is currenlty in use by VDB \"{1}\" with version \"{2}\"; Can not delete; Remove the assosiation first +#EmbeddedConfigurationService.Alternate_binding_inuse=Connector binding {0} is using alternate properties defined in the system configuration file. +EmbeddedConfigurationService.ConnectorBinding_in_use_failed_delete=Connector binding with Name {0} is currenlty in use by VDB {1} with version {2}; Can not delete; Remove the assosiation first +EmbeddedConfigurationService.savingConfiguration=Teiid Configuration is being saved. +EmbeddedConfigurationService.vdb_delete=VDB with name \"{0}\" and version \"{1}\" is being deleted from the configuration. +EmbeddedConfigurationService.vdb_delete_failed=configuration service failed to delte VDB with name \"{0}\" and version \"{1}\". +EmbeddedConfigurationService.vdb_saved=VDB with name \"{0}\" and version \"{1}\" is being saved by the configuration to \"{2}\" file name. +EmbeddedConfigurationService.add_system_property=Adding a System property \"{0}\" with value \"{1}\" is being added to the configuration. +EmbeddedConfigurationService.update_system_properties=Adding System properties to the configuration: {0}. +EmbeddedConfigurationService.connector_save=Connector Binding with name \"{0}\" is being saved. +EmbeddedConfigurationService.connector_delete=Connector Binding with name \"{0}\" is being deleted from the configuration. +EmbeddedConfigurationService.connector_type_save=Connector Type with name \"{0}\" is being saved to configuration. +EmbeddedConfigurationService.connector_type_save=Connector Type with name \"{0}\" is being deleted from configuration. +EmbeddedConfigurationService.connector_type_delete_failed=Connector Type with name \"{0}\" failed to delete from configuration as they type is not found in configuration. +EmbeddedConfigurationService.custom_connectors_restricted=License does not allow adding connector types. +EmbeddedConfigurationService.Failed_to_load_vdb=Failed to load the VDB \"{0}\" during the initialization of Teiid +EmbeddedConfigurationService.loaded_vdb=Loaded the VDB \"{0}\" sucessfully into Teiid. +EmbeddedConfigurationService.not_loaded_vdb=VDB \"{0}\" is not loaded into Teiid due to licensing issues. +EmbeddedConfigurationService.connector_binding_delete_failed=Delete of Connector Binding \"{0}\" failed. Binding not found in the configuration. +EmbeddedConfigurationService.connector_type_in_use=Delete of Connector type \"{0}\" failed. Currently in use by a Connector Binding. +EmbeddedConfigurationService.duplicate_vdb_found=Duplicate VDB \"{0}\" is being loaded. Can not load have multiple VDBs with same name and version. +EmbeddedConfigurationService.connector_type_delete=Connector type \"{0}\" is deleted from the configuration. +EmbeddedConfigurationService.connectionAdded=Connection added to VDB \"{0}\" with version \"{1}\" with connection id \"{2}\" +EmbeddedConfigurationService.connectionRemoved=Connection removed from VDB \"{0}\" with version \"{1}\" with connection id \"{2}\" +EmbeddedConfigurationService.dqp_loading=Teiid instance with instance id \"{0}\" is being loaded. +EmbeddedConfigurationService.init_encryption=Cryptography libraries are in use and are initialized +EmbeddedConfigurationService.udf_classspath_failure=Failed to resolve the user defined function''s classpath +EmbeddedConfigurationService.udf_load=User Defined Functions file \"{0}\" is loaded, using classloader \"{1}\" +EmbeddedConfigurationService.udf_unload=User Defined Functions file unloaded +EmbeddedConfigurationService.bindings_exceeded_limit=VDB {1} has {0} connector bindings, that exceeds MetaMatrix license allowed number of connector bindings. +EmbeddedConfigurationService.Invalid_connector_binding=Can not assign binding "{2}" to VDB "{0}" with "{1}", because it is a private binding from another vdb. +EmbeddedConfigurationService.connector_binding_deployed=Connector binding {0} deployed + +ExtensionModuleReader.ext_module_failed_to_read=failed to read the extension module \"{0}\" from file system. +ExtensionModuleReader.ext_module_does_not_exist=Extension module \"{0}\" does not exist in the configuration +ExtensionModuleWriter.ext_module_save=Extension module with name \"{0}\" is saved to \"{1}\". +ExtensionModuleWriter.ext_module_already_exists=Extension module \"{0}\" already exists in the configuration failed to delete. +ExtensionModuleWriter.ext_module_delete_failed=Failed to delete Extension Module \"{0}\"; It may be currently in use by the Teiid, check if is it been un-assigned from all models. +ExtensionModuleWriter.ext_module_delete=Extension module with name \"{0}\" is being deleted with file \"{1}\". + +UnSupported_object_conversion=This object conversion not supported.. +Admin.Vdb_or_Model_notfound=Requested Vdb or model Name not Found.. +Admin.timeout=Admin request timedout after \"{0}\" minutes +Admin.invalid_request=Invalid request \"{0}\" is submitted to the Admin API. Please check the API documentation on usage. +Admin.ext_path_invalid=Extension directory path is wrong or does not exists +Admin.admin_isnull=Admin Object supplied is null +Admin.can_not_set_property=Currently setting property on this type of Admin object is not supported. +Admin.connector_load_failed_wrong_contents=Failed to load the Connector binding with name \"{0}\". Contents supplied are incorrect, check the contents again. +Admin.connector_load_failed_wrong_type=Failed to load the Connector binding with name \"{0}\". Conntextor Type supplied and Connector Type used in binding are different. +Admin.Connector_binding_does_not_exists=Connector Binding with name \"{0}\" does not exist in the configuration +Admin.Connector_type_does_not_exists=Connector Type with name \"{0}\" does not exist in the configuration +Admin.ext_module_does_not_exists=Extension Module with name \"{0}\" does not exist in the configuration +Admin.vdb_does_not_exists=VDB with name \"{0}\" and version \"{1}\" does not exist in the configuration +Admin.Invalid_ext_source=Source contents supplied for Extension module can not be null. +Admin.Invalid_ext_source_name=Source name can not be null, use a proper file name with extension as name for the Extension Module. +Admin.Invalid_cb_name=Connector Binding name can not be null, a valid name must be supplied +Admin.Invalid_cb_source=Connector Binding''s source contents can not be null +Admin.Invalid_ct_name=Connector Type name can not be null or use of special characters is not allowed, a valid name must be supplied +Admin.Invalid_ct_source=Connector type''s source contents can not be null +Admin.Invalid_vdb_name=VDB name can not be null or use of special characters is allowed, a valid name must be supplied +Admin.Invalid_vdb_source=VDB source contents can not be null +Admin.load_combined_vdb=Loading the VDB file \"{0}\", where DEF/VDB are combined in single source +Admin.Invalid_model_name=Model name can not be null or use of special characters is not alloed, a valid name must be supplied to identify the model inside the VDB +Admin.Invalid_identifier=Identifier supplied can not be null and must adhere to the naming patterns; Please check the java docs for the proper naming patterns. +Admin_invalid_log_listener=Supplied log listener can not be null +Admin.Invalid_ext_module=Extension module specified is not the JAR type, currently only ".jar" extension modules supported. +Admin.Connector_type_exists=Connector Type \"{0}\" already exists; Can not add a duplicate, try delete and add again. +Admin.extension_module_exists=Extension Module \"{0}\" already exists; Can not add a duplicate, delete first and add again. +Admin.addBindingEixists=Connector Binding \"{0}\" already exists in exists in the configuration, use a unique name for the connector binding in the given Teiid instance. +Admin.addBinding_type_exists=Adding Connector Binding \"{0}\" failed, because the Connector Type \"{1}\" already exists, and admin option set to fail on conflict +Admin.connector_type_not_exists=Connector Type \"{0}\" does not exists in the configuration, please add Connector Type. +Admin.Invalid Request=Request submitted does not match the requirement \"{0}\" +Admin.No_Objects_Found=No AdminObjects found for identifier {0} and class {1}. +Admin.Multiple_Objects_Found=Multiple AdminObjects found for identifier {0} and class {1}. +Admin.Unsupported_Object_Class=AdminObjects class {0} not supported for this operation. +Admin.bindings_exceeded_limit=You have reached the MetaMatrix license limit of connector bindings, Failed to add connector bindings. +Admin.cb_doesnot_exist=The connector binding does not exist:{0} +Admin.ct_doesnot_exist=The connector type does not exist:{0} +Admin.CODE_DECRYPTION_FAILED=Decryption of the password property failed; Check to make sure encryption libraries are correctly installed or provide a plain text password. + +DQPEmbeddedManager.start_dqp=Teiid is started at time = {0} +DQPEmbeddedManager.shutdown_dqp=Teiid is shutdown at time = {0} +DQPEmbeddedManager.duplicate_process= There is another process running with same name {0}; Failed to start. + +ServerSecurityAdminImpl.User_name_too_long=The user name may not be null and cannot be longer than {0} charachters +ServerSecurityAdminImpl.neither_User_nor_Group=Parameter memberType is neither a User nor a Group. +ServerSecurityAdminImpl.Unable_to_aquire_MembershipObjectEditor=Unable to aquire MembershipObjectEditor. +ServerSecurityAdminImpl.Cant_use_wildcard=The wildcard cannot be used here. +ServerSecurityAdminImpl.Non_existant_role=No administrative role exists with the identifier [{0}]. +ServerSecurityAdminImpl.Unknown_principal=Unknown principal: {0} +ServerSecurityAdminImpl.Empty_props=No properties to set. +ServerSecurityAdminImpl.Invalid_prop=Property [{0}] is not a valid User property and will not be set. +ServerSecurityAdminImpl.Invalid_props=One or more properties were not set because they are no valid for a User: +ServerSecurityAdminImpl.vdbName_can_not_be_null=Supplied VDB name is null +ServerSecurityAdminImpl.vdbVersion_can_not_be_null=Supplied VDB version is null +ServerSecurityAdminImpl.no_vdb_exists=No VDB with name {0}.{1} deployed in the system. +ServerSecurityAdminImpl.not_implemented=This feature not available. + +failed_to_load_admin_roles=Failed to load Admin role permissions +admin_roles_not_defined=Admin Role permissions are not defined. Refer to admin-roles.properties file + +# authorization service +AuthorizationServiceImpl.invalid_session=The principal with SessionToken <{0}> is invalid. +AuthorizationServiceImpl.wrong_realms = Permission collection contains requests from different realms. +AuthorizationServiceImpl.error_seraching_policies=An exception occurred while searching for all policy IDs. +AuthorizationServiceImpl.failed_to_get_groups=Can''t get principal''s groups from Membership service. +AuthorizationServiceImpl.Authorization_Realm_is_null=The requested Authorization Realm is null + +# membership service +MembershipServiceImpl.loaded = Loaded membership domain: "{0}". +MembershipServiceImpl.failed_to_create = Unable to create membership domain {0} +MembershipServiceImpl.unable_to_create = Unable to create membership domain "{0}". Factory class not found in environment properties. +MembershipServiceImpl.invalid_principal = The principal "{0}" is invalid. +MembershipServiceImpl.Null_authentication=Domain {0} returned a null authentication result for user {1} +MembershipServiceImpl.Invalid_user=Domain {0} indicated that user {1} was not valid +MembershipServiceImpl.Unsupported_credentials=Domain {0} indicated that the credentials were not supported +MembershipServiceImpl.Failed_authentication={0} could not be authenticated in any domain +MembershipServiceImpl.Root_password_required=password is required for super user +MembershipServiceImpl.Root_password_decryption_failed=super password could not be decrypted +MembershipServiceImpl.principal_does_not_exist=The principal ''{0}'' does not exist in domain ''{1}'' +MembershipServiceImpl.Decrypt_failed=Could not decrypt the encrypted password for user ''{0}'' +MembershipServiceImpl.source_exception=Membership Domain ''{0}'' failed to perform the desired operation, please check the settings for this domain +MembershipServiceImpl.load_error=Could not load file ''{0}'' from the classpath, the file system, or as a URL. +MembershipServiceImpl.unknown_host=Did not allow root user authentication attempt, since root logons are restricted and could not determine the remote host. +MembershipServiceImpl.invalid_host=Could not authenticate root user, since the client address {0} is not in the allowed values {1} +MembershipServiceImpl.error_shuting_down = Error shutting down domain after ''killService'' method received. +MembershipServiceImpl.Logon_failed=log on failed for user {1} on the domain {0} + +LDAPMembershipDomain.No_annonymous=Annonymous user authentications are not allowed in domain {0} +LDAPMembershipDomain.Required_property=Required property {0} was missing. +LDAPMembershipDomain.Admin_credentials=Admin DN and/or password supplied for LDAP Membership Domain {0} are invalid. +LDAPMembershipDomain.Require_memberof_property=Users in LDAP Membership Domain {0} will not appear as members of any group since user's memberOf and group's memberOf attributes are both unspecified. + + +# 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 metamatrix.session.max.connections. If more sessions are required, modify this property value in the MetaMatrix Console. +SessionServiceImpl.failed_to_getprincipal = Membership service encountered an error getting the principal for user "{0}". +SessionServiceImpl.expireSession = Expiring session {0} +SessionServiceImpl.keepaliveFailed = Keepalive failed for session {0} +SessionServiceImpl.Unexpected_error_finding_latest_version_of_Virtual_Database=Unexpected error finding latest version of Virtual Database {0} +SessionServiceImpl.Unexpected_error_finding_latest_version_of_Virtual_Database_{0}_of_version_{1}=Unexpected error finding latest version of Virtual Database {0} of version {1} +SessionServiceImpl.Membership_service_could_not_authenticate_user=Membership service could not authenticate user "{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. +SessionServiceImpl.terminateSession = Admin [{0}] is terminating this session: {1}. + + +LogonImpl.Invalid_use_of_credentials_and_token=Conflicting use of both client session token and credentials. + +ServerWorkItem.Received_exception_processing_request=Unexpected exception for session {0} +ServerWorkItem.processing_error=Processing exception ''{0}'' for session {1}. Exception type {2} thrown from {3}. Enable more detailed logging to see the entire stacktrace. +ServerWorkItem.Component_Not_Found=Component not found: {0} + +SocketTransport.1=Bound to address {0} listening on port {1} +SocketTransport.2=Problem starting server binding to address {0} and listening on port {1} +SocketTransport.3=Socket transport is not enabled for Teiid. + +Illegal_access_on_admin=Illegal use of admin based connection by : {0}, {1} +invlaid_vdb_file=Invalid VDB file deployment failed {0} +redeploying_vdb=Re-deploying VDB {0} +validity_errors_in_vdb=VDB has validaity errors; failed to deploy - {0} +vdb_save_failed=Failed to save metadata for VDB {0} +vdb_delete_failed=Failed to delete the cached metadata files due to: +vdb_deployed=VDB "{0}" deployed. +vdb_undeployed=VDB "{0}" undeployed. +jndi_not_found=Jndi resource = "{0}" not found for Source Name = "{1}" +system_vdb_load_error=System.vdb needs to be loaded before any other VDBs. +fail_to_deploy="{0}" Can not be deployed because model "{1}" is not fully configured. +failed_to_retrive_metadata="{0}" Can not be deployed because model "{1}" can not retrieve metadata. +invalid_metadata_file=Invalid metadata file found at {0}; delete this file and restart server. +udf_model_not_found=User Defined Function (UDF) model "{0}" not found in the VDB +duplicate_vdb=VDB with given name and version already exists! {0}.{1} +system_vdb_not_found=System.vdb not found in classpath +failed_to_deployed=Failed to deploy {0} \ No newline at end of file Property changes on: trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties ___________________________________________________________________ Name: svn:mime-type + text/plain