August 2009 - teiid-commits - Jboss List Archives

teiid SVN: r1291 - in trunk: client/src/main/java/com/metamatrix/common/comm/platform/client and 16 other directories.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2009-08-28 18:27:14 -0400 (Fri, 28 Aug 2009) New Revision: 1291 Added: trunk/server/src/main/java/com/metamatrix/admin/api/AdminStatus.java trunk/server/src/main/java/com/metamatrix/admin/api/DQP.java trunk/server/src/main/java/com/metamatrix/admin/api/Host.java trunk/server/src/main/java/com/metamatrix/admin/api/Principal.java trunk/server/src/main/java/com/metamatrix/admin/api/Resource.java trunk/server/src/main/java/com/metamatrix/admin/api/ScriptsContainer.java trunk/server/src/main/java/com/metamatrix/admin/api/Service.java trunk/server/src/main/java/com/metamatrix/admin/api/SystemObject.java trunk/server/src/main/java/com/metamatrix/admin/objects/ trunk/server/src/main/java/com/metamatrix/admin/objects/MMAdminStatus.java trunk/server/src/main/java/com/metamatrix/admin/objects/MMDQP.java trunk/server/src/main/java/com/metamatrix/admin/objects/MMHost.java trunk/server/src/main/java/com/metamatrix/admin/objects/MMPrincipal.java trunk/server/src/main/java/com/metamatrix/admin/objects/MMResource.java trunk/server/src/main/java/com/metamatrix/admin/objects/MMScriptsContainer.java trunk/server/src/main/java/com/metamatrix/admin/objects/MMService.java trunk/server/src/main/java/com/metamatrix/admin/objects/MMSystem.java Removed: trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminStatus.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMDQP.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMHost.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMPrincipal.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMResource.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMScriptsContainer.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMService.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMSystem.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMUser.java trunk/client/src/main/java/org/teiid/adminapi/AdminStatus.java trunk/client/src/main/java/org/teiid/adminapi/DQP.java trunk/client/src/main/java/org/teiid/adminapi/Entitlement.java trunk/client/src/main/java/org/teiid/adminapi/Host.java trunk/client/src/main/java/org/teiid/adminapi/Principal.java trunk/client/src/main/java/org/teiid/adminapi/Resource.java trunk/client/src/main/java/org/teiid/adminapi/ScriptsContainer.java trunk/client/src/main/java/org/teiid/adminapi/Service.java trunk/client/src/main/java/org/teiid/adminapi/SystemObject.java trunk/client/src/main/java/org/teiid/adminapi/User.java Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminObject.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMGroup.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMProcess.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/client/ServerAdminFactory.java trunk/client/src/main/java/org/teiid/adminapi/ConfigurationAdmin.java trunk/client/src/main/java/org/teiid/adminapi/ConnectorBinding.java trunk/client/src/main/java/org/teiid/adminapi/Group.java trunk/client/src/main/java/org/teiid/adminapi/MonitoringAdmin.java trunk/client/src/main/java/org/teiid/adminapi/ProcessObject.java trunk/client/src/main/java/org/teiid/adminapi/RuntimeStateAdmin.java trunk/client/src/main/java/org/teiid/adminapi/SecurityAdmin.java trunk/client/src/main/resources/com/metamatrix/admin/i18n.properties trunk/client/src/test/java/com/metamatrix/common/comm/platform/client/TestSeverAdminFactory.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/HostType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VMComponentDefnType.java trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPRuntimeStateAdminImpl.java trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPSecurityAdminImpl.java trunk/runtime/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java trunk/runtime/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerConfigAdmin.java trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerMonitoringAdmin.java trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerRuntimeStateAdmin.java trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerSecurityAdmin.java trunk/server/src/main/java/com/metamatrix/admin/server/AbstractAdminImpl.java trunk/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java trunk/server/src/main/java/com/metamatrix/admin/server/ServerConfigAdminImpl.java trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java trunk/server/src/main/java/com/metamatrix/admin/server/ServerRuntimeStateAdminImpl.java trunk/server/src/main/java/com/metamatrix/admin/server/ServerSecurityAdminImpl.java trunk/server/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java trunk/server/src/test/java/com/metamatrix/admin/server/TestServerMonitoringAdminImpl.java trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestAdminApi.java trunk/test-integration/src/test/java/org/teiid/runtime/adminapi/TestEmbeddedAdmin.java Log: TEIID-697: Please look at JIRA for the changes made. Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminObject.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminObject.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminObject.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -24,15 +24,10 @@ import java.io.Serializable; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Properties; -import org.teiid.adminapi.AdminException; import org.teiid.adminapi.AdminObject; -import org.teiid.adminapi.AdminProcessingException; -import org.teiid.adminapi.ConnectionPool; -import org.teiid.adminapi.Transaction; import com.metamatrix.admin.AdminPlugin; import com.metamatrix.common.util.PropertiesUtils; @@ -46,92 +41,6 @@ /**SerialVersion used in serialization*/ public static final long serialVersionUID = -8280437282118346149L; - /**Package containing the sub-interfaces of AdminObjects*/ - public static final String OBJECTS_PACKAGE = "com.metamatrix.admin.api.objects."; //$NON-NLS-1$ - - - - /**Object type code for Cache*/ - public static final int OBJECT_TYPE_CACHE = 0; - /** Object Type code for Service */ - public static final int OBJECT_TYPE_SERVICE = 1; - /**Object type code for ConnectorBinding*/ - public static final int OBJECT_TYPE_CONNECTOR_BINDING = 2; - /**Object type code for ConnectorType*/ - public static final int OBJECT_TYPE_CONNECTOR_TYPE = 3; - /**Object type code for DQP*/ - public static final int OBJECT_TYPE_DQP = 4; - /**Object type code for Entitlement*/ - public static final int OBJECT_TYPE_ENTITLEMENT = 5; - /**Object type code for ExtensionModule*/ - public static final int OBJECT_TYPE_EXTENSION_MODULE = 6; - /**Object type code for Group*/ - public static final int OBJECT_TYPE_GROUP = 7; - /**Object type code for Host*/ - public static final int OBJECT_TYPE_HOST = 8; - /**Object type code for LogConfiguration*/ - public static final int OBJECT_TYPE_LOG_CONFIGURATION = 9; - /**Object type code for Model*/ - public static final int OBJECT_TYPE_MODEL = 10; - /**Object type code for ProcessObject*/ - public static final int OBJECT_TYPE_PROCESS_OBJECT = 11; - /**Object type code for PropertyDefinition*/ - public static final int OBJECT_TYPE_PROPERTY_DEFINITION = 12; - /**Object type code for QueueWorkerPool*/ - public static final int OBJECT_TYPE_QUEUE_WORKER_POOL = 13; - /**Object type code for Request*/ - public static final int OBJECT_TYPE_REQUEST = 14; - /**Object type code for Resource*/ - public static final int OBJECT_TYPE_RESOURCE = 15; - /**Object type code for Role*/ - public static final int OBJECT_TYPE_ROLE = 16; - /**Object type code for Session*/ - public static final int OBJECT_TYPE_SESSION = 17; - /**Object type code for SystemObject*/ - public static final int OBJECT_TYPE_SYSTEM_OBJECT = 19; - /**Object type code for User*/ - public static final int OBJECT_TYPE_USER = 20; - /**Object type code for VDB*/ - public static final int OBJECT_TYPE_VDB = 21; - /**Object type code for TRANSACTION*/ - public static final int OBJECT_TYPE_TRANSACTION = 22; - /**Object type code for CONNECTION_POOL*/ - public static final int OBJECT_TYPE_CONNECTION_POOL = 23; - - - //map of String (class name) to Integer (object type code) - private static HashMap objectTypeMap = new HashMap(); - - - static { - objectTypeMap.put(org.teiid.adminapi.Cache.class.getName(), new Integer(OBJECT_TYPE_CACHE)); - objectTypeMap.put(org.teiid.adminapi.Service.class.getName(), new Integer(OBJECT_TYPE_SERVICE)); - objectTypeMap.put(org.teiid.adminapi.ConnectorBinding.class.getName(), new Integer(OBJECT_TYPE_CONNECTOR_BINDING)); - objectTypeMap.put(org.teiid.adminapi.ConnectorType.class.getName(), new Integer(OBJECT_TYPE_CONNECTOR_TYPE)); - objectTypeMap.put(org.teiid.adminapi.DQP.class.getName(), new Integer(OBJECT_TYPE_DQP)); - objectTypeMap.put(org.teiid.adminapi.Entitlement.class.getName(), new Integer(OBJECT_TYPE_ENTITLEMENT)); - objectTypeMap.put(org.teiid.adminapi.ExtensionModule.class.getName(), new Integer(OBJECT_TYPE_EXTENSION_MODULE)); - objectTypeMap.put(org.teiid.adminapi.Group.class.getName(), new Integer(OBJECT_TYPE_GROUP)); - objectTypeMap.put(org.teiid.adminapi.Host.class.getName(), new Integer(OBJECT_TYPE_HOST)); - objectTypeMap.put(org.teiid.adminapi.LogConfiguration.class.getName(), new Integer(OBJECT_TYPE_LOG_CONFIGURATION)); - objectTypeMap.put(org.teiid.adminapi.Model.class.getName(), new Integer(OBJECT_TYPE_MODEL)); - objectTypeMap.put(org.teiid.adminapi.ProcessObject.class.getName(), new Integer(OBJECT_TYPE_PROCESS_OBJECT)); - objectTypeMap.put(org.teiid.adminapi.PropertyDefinition.class.getName(), new Integer(OBJECT_TYPE_PROPERTY_DEFINITION)); - objectTypeMap.put(org.teiid.adminapi.QueueWorkerPool.class.getName(), new Integer(OBJECT_TYPE_QUEUE_WORKER_POOL)); - objectTypeMap.put(org.teiid.adminapi.Request.class.getName(), new Integer(OBJECT_TYPE_REQUEST)); - objectTypeMap.put(org.teiid.adminapi.Resource.class.getName(), new Integer(OBJECT_TYPE_RESOURCE)); - objectTypeMap.put(org.teiid.adminapi.Role.class.getName(), new Integer(OBJECT_TYPE_ROLE)); - objectTypeMap.put(org.teiid.adminapi.Session.class.getName(), new Integer(OBJECT_TYPE_SESSION)); - objectTypeMap.put(org.teiid.adminapi.SystemObject.class.getName(), new Integer(OBJECT_TYPE_SYSTEM_OBJECT)); - objectTypeMap.put(org.teiid.adminapi.User.class.getName(), new Integer(OBJECT_TYPE_USER)); - objectTypeMap.put(org.teiid.adminapi.VDB.class.getName(), new Integer(OBJECT_TYPE_VDB)); - objectTypeMap.put(Transaction.class.getName(), Integer.valueOf(OBJECT_TYPE_TRANSACTION)); - objectTypeMap.put(ConnectionPool.class.getName(), Integer.valueOf(OBJECT_TYPE_CONNECTION_POOL)); - } - - - - /** * The fully-qualified name of the Admin Object. Will never be null. */ @@ -142,8 +51,6 @@ */ protected String[] identifierParts; - - /** * The base name of this Admin Object */ @@ -277,10 +184,6 @@ return(results.toString()); } - - - - /** * Get all the properties for this Object. * @@ -482,28 +385,4 @@ public void setProperties(java.util.Properties props) { this.props = props; } - - - /** - * Get the object type code for the specified classname. - * @param className This may be fully qualified or not, e.g. - * "com.metamatrix.admin.api.objects.ConnectorBinding" or "ConnectorBinding". - * @return Object type code. The will be one of the constants AdminObject.OBJECT_TYPE_xxx. - * @throws AdminException - * @since 4.3 - */ - public static int getObjectType(String className) throws AdminException { - //convert to the fully qualified className - if (className.indexOf(".") == -1) { //$NON-NLS-1$ - className = OBJECTS_PACKAGE + className; - } - - Integer codeInteger = (Integer) objectTypeMap.get(className); - if (codeInteger == null) { - String message = AdminPlugin.Util.getString("MMAdminObject.Unsupported_Admin_Object", new Object[] {className}); //$NON-NLS-1$ - throw new AdminProcessingException(message); - } - - return codeInteger.intValue(); - } } Deleted: trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminStatus.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminStatus.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminStatus.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,111 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.admin.objects; - -import java.io.Serializable; - -import org.teiid.adminapi.AdminStatus; - -import com.metamatrix.admin.AdminPlugin; - - -/** - * Simple Implementation of MMStatus. - * @since 4.3 - */ -public class MMAdminStatus implements AdminStatus, Serializable { - private static final long serialVersionUID = -3111591335358837218L; - private int code = AdminStatus.CODE_UNKNOWN; - private String message = null; - - - /** - * Construct a new MMAdminStatus - * @param code - * @param messageKey Key of the status message in i18n.properties. - * @since 4.3 - */ - public MMAdminStatus(int code, String messageKey) { - this.code = code; - - this.message = AdminPlugin.Util.getString(messageKey); - } - - /** - * Construct a new MMAdminStatus - * @param code - * @param messageKey Key of the status message in i18n.properties. - * @param value Value to substitute into the internationalized message. - * @since 4.3 - */ - public MMAdminStatus(int code, String messageKey, Object value) { - this.code = code; - - this.message = AdminPlugin.Util.getString(messageKey, value); - } - - /** - * Construct a new MMAdminStatus - * @param code - * @param messageKey Key of the status message in i18n.properties. - * @param values Values to substitute into the internationalized message. - * @since 4.3 - */ - public MMAdminStatus(int code, String messageKey, Object[] values) { - this.code = code; - - this.message = AdminPlugin.Util.getString(messageKey, values); - } - - - - /** - * @see org.teiid.adminapi.AdminStatus#getCode() - * @since 4.3 - */ - public int getCode() { - return code; - } - - /** - * @see org.teiid.adminapi.AdminStatus#getMessage() - * @since 4.3 - */ - public String getMessage() { - return message; - } - - - /** - * @see java.lang.Object#toString() - * @since 4.3 - */ - public String toString() { - StringBuffer result = new StringBuffer(); - result.append(AdminPlugin.Util.getString("MMAdminStatus.MMAdminStatus")); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMAdminStatus.Code")).append(getCode()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMAdminStatus.Message")).append(getMessage()); //$NON-NLS-1$ - return result.toString(); - } - -} Deleted: trunk/client/src/main/java/com/metamatrix/admin/objects/MMDQP.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMDQP.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMDQP.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,201 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.admin.objects; - -import java.util.Date; - -import org.teiid.adminapi.DQP; - -import com.metamatrix.admin.AdminPlugin; - - -/** - * A Connector Binding is a Connector Type with properties that have been - * bond to a Connector. - * - * May are may not be assigned to a VDB - */ -public class MMDQP extends MMAdminObject implements DQP { - - private static final long serialVersionUID = -3212002022690786890L; - private String description = ""; //$NON-NLS-1$ - private int currentState; - private Date stateChangedTime; - private long serviceID = -1; - - - /** - * Constructor. - * @param identifierParts - * @since 4.3 - */ - public MMDQP(String[] identifierParts) { - super(identifierParts); - - } - - - - - /** - * @see java.lang.Object#toString() - */ - public String toString() { - StringBuffer result = new StringBuffer(); - result.append(AdminPlugin.Util.getString("MMDQP.MMDQP")).append(getIdentifier()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMDQP.Description")).append(description); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMDQP.Created")).append(getCreatedDate()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMDQP.Created_By")).append(getCreatedBy()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMDQP.Updated")).append(getLastChangedDate()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMDQP.Updated_By")).append(getLastChangedBy()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMDQP.State")).append(getStateAsString()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMDQP.IsRegistered")).append(isRegistered()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMDQP.State_Changed")).append(getStateChangedTime()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMDQP.Properties")).append(getPropertiesAsString()); //$NON-NLS-1$ - return result.toString(); - } - - - - /** - * Returns the description - * @return description - */ - public String getDescription() { - return description; - } - - /** - * Set the description - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - - - - /** - * @return Returns the currentState as int. - * @since 4.3 - */ - public int getState() { - return currentState; - } - - - /** - * @return Returns the currentState as String. - * @since 4.3 - */ - public String getStateAsString() { - switch (currentState) { - case STATE_OPEN: - return AdminPlugin.Util.getString("MMDQP.open"); //$NON-NLS-1$ - case STATE_CLOSED: - return AdminPlugin.Util.getString("MMDQP.closed"); //$NON-NLS-1$ - case STATE_FAILED: - return AdminPlugin.Util.getString("MMDQP.failed"); //$NON-NLS-1$ - case STATE_INIT_FAILED: - return AdminPlugin.Util.getString("MMDQP.initializationFailed"); //$NON-NLS-1$ - case STATE_NOT_INITIALIZED: - return AdminPlugin.Util.getString("MMDQP.notInitialized"); //$NON-NLS-1$ - case STATE_NOT_REGISTERED: - return AdminPlugin.Util.getString("MMDQP.notRegistered"); //$NON-NLS-1$ - case STATE_DATA_SOURCE_UNAVAILABLE: - return AdminPlugin.Util.getString("MMDQP.dataSourceUnavailable"); //$NON-NLS-1$ - default: - return AdminPlugin.Util.getString("MMDQP.unknown"); //$NON-NLS-1$ - } - } - - /** - * Set the state - * @param state - * @since 4.3 - */ - public void setState(int state) { - this.currentState = state; - } - - - /** - * @return Returns time of last state change. - * @since 4.3 - */ - public Date getStateChangedTime() { - return stateChangedTime; - } - - /** - * Set the state changed time - * @param stateChangedTime - * @since 4.3 - */ - public void setStateChangedTime(Date stateChangedTime) { - this.stateChangedTime = stateChangedTime; - - //check on what states mean "registered" - setRegistered(currentState==STATE_OPEN || currentState==STATE_FAILED || currentState==STATE_DATA_SOURCE_UNAVAILABLE); - } - - - - /** - * @return Returns the serviceID. - * @since 4.3 - */ - public long getServiceID() { - return this.serviceID; - } - - /** - * @param serviceID The serviceID to set. - * @since 4.3 - */ - public void setServiceID(long serviceID) { - this.serviceID = serviceID; - } - - - - /** - * @return Returns the processID. - * @since 4.3 - */ - public String getProcessName() { - return this.identifierParts[1]; - } - - /** - * @return Returns the hostName. - * @since 4.3 - */ - public String getHostName() { - return identifierParts[0]; - } - - - - -} \ No newline at end of file Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMGroup.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMGroup.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMGroup.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -28,15 +28,24 @@ /** * @since 4.3 */ -public class MMGroup extends MMPrincipal implements Group { +public class MMGroup extends MMAdminObject implements Group { private static final long serialVersionUID = 1102507655851078982L; /** - * @param principalName + * @param groupName * @since 4.3 */ - public MMGroup(String[] principalName) { - super(principalName, TYPE_GROUP); + public MMGroup(String[] groupName) { + super(groupName); } + @Override + public String toString() { + StringBuffer sb = new StringBuffer(); + sb.append("[Name=\""); //$NON-NLS-1$ + sb.append(this.getName()); + sb.append("\"]"); //$NON-NLS-1$ + return sb.toString(); + } + } Deleted: trunk/client/src/main/java/com/metamatrix/admin/objects/MMHost.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMHost.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMHost.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,91 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.admin.objects; - -import org.teiid.adminapi.Host; - -import com.metamatrix.admin.AdminPlugin; - - -/** - * Simple Host object for the Admin API as represented in the Configuration - */ -public final class MMHost extends MMAdminObject implements Host { - - private static final long serialVersionUID = -779866213549875450L; - private boolean running = false; - - - - /** - * Constructor for creating a MMHost - * - * @param identifierParts of the Host - */ - public MMHost(String[] identifierParts) { - super(identifierParts); - } - - - - /** - * Create a String for this MMHost - * - * @see java.lang.Object#toString() - * @since 4.3 - */ - public String toString() { - StringBuffer result = new StringBuffer(); - result.append(AdminPlugin.Util.getString("MMHost.MMHost")).append(getName()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMHost.Properties")).append(getPropertiesAsString()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMHost.Created")).append(getCreatedDate()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMHost.Created_By")).append(getCreatedBy()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMHost.Updated")).append(getLastChangedDate()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMHost.Updated_By")).append(getLastChangedBy()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMHost.IsRunning")).append(isRegistered()); //$NON-NLS-1$ - return result.toString(); - } - - - - /** - * Return true if this Host is running - * @return if this Host is running - * @since 4.3 - */ - public boolean isRunning() { - return running; - } - - /** - * Set if this Host has been deployed and is executing - * @param running - * @since 4.3 - */ - public void setRunning(boolean running) { - this.running = running; - } - - - -} \ No newline at end of file Deleted: trunk/client/src/main/java/com/metamatrix/admin/objects/MMPrincipal.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMPrincipal.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMPrincipal.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,98 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.admin.objects; - -import org.teiid.adminapi.Principal; - - -/** - * @since 4.3 - */ -public class MMPrincipal extends MMAdminObject implements Principal { - - private static final long serialVersionUID = -1383265398519744688L; - - private static final String[] TYPE_NAMES = new String[] { TYPE_LABEL_USER, TYPE_LABEL_GROUP, TYPE_LABEL_ADMIN }; - - private int type; - - /** - * Ctor - * @param principalName The name of the {@link Principal}. - * @param type The value of the {@link Principal}. - * @since 4.3 - */ - public MMPrincipal(String[] principalName, int type) { - super(principalName); - this.type = type; - } - - /** - * @see com.metamatrix.admin.objects.MMAdminObject#toString() - * @since 4.3 - */ - public String toString() { - StringBuffer sb = new StringBuffer(); - sb.append("[Name=\""); //$NON-NLS-1$ - sb.append(this.getName()); - sb.append("\" - Type=\""); //$NON-NLS-1$ - sb.append( TYPE_NAMES[this.type] ); - sb.append("\"]"); //$NON-NLS-1$ - return sb.toString(); - } - - /** - * @see org.teiid.adminapi.Principal#getType() - * @since 4.3 - */ - public int getType() { - return type; - } - - /** - * @see org.teiid.adminapi.Principal#getTypeLabel() - * @since 4.3 - */ - public String getTypeLabel() { - return TYPE_NAMES[this.type]; - } - - /** - * Determine whether the given <code>className</code> - * is either of {@link #TYPE_USER} or {@link #TYPE_GROUP}. - * @param className the className in question. - * @return <code>true</code> iff the given type represents - * one or the other; User or Group. - * @since 4.3 - */ - public static boolean isUserOrGroup(String className) { - try { - int type = MMAdminObject.getObjectType(className); - return (type == MMAdminObject.OBJECT_TYPE_USER || type == MMAdminObject.OBJECT_TYPE_GROUP); - } catch (Exception e) { - return false; - } - - } - -} Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMProcess.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMProcess.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMProcess.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -23,6 +23,7 @@ package com.metamatrix.admin.objects; import java.net.InetAddress; +import java.util.Date; import org.teiid.adminapi.AdminObject; import org.teiid.adminapi.ProcessObject; @@ -36,7 +37,8 @@ public final class MMProcess extends MMAdminObject implements ProcessObject { private static final long serialVersionUID = 8454606907083408662L; private long freeMemory = 0; - private String hostIdentifier = ""; //$NON-NLS-1$ + private String processName = ""; //$NON-NLS-1$ + private String hostName = ""; //$NON-NLS-1$ private InetAddress inetAddress = null; private int port = 0; @@ -44,26 +46,23 @@ private int threadCount = 0; private long totalMemory = 0; - private int sockets = 0; - private int maxSockets = 0; - private int virtualSockets = 0; - private int maxVirtualSockets = 0; + private int sockets = 0; + private int maxSockets = 0; private long objectsRead = 0; private long objectsWritten = 0; + private Date startTime; private QueueWorkerPool queueWorkerPool = null; - - /** * Contruct a new MMProcess. * @param identifierParts */ public MMProcess(String[] identifierParts) { super(identifierParts); - - hostIdentifier = identifierParts[0]; + hostName = identifierParts[0]; + processName = identifierParts[1]; } @@ -94,12 +93,20 @@ return freeMemory; } + + /** + * @return host name for this process. + */ + public String getHostName() { + return hostName; + } + /** * @return host name for this process. */ - public String getHostIdentifier() { - return hostIdentifier; + public String getProcessName() { + return processName; } /** @@ -210,13 +217,13 @@ result.append(AdminPlugin.Util.getString("MMProcess.TotalMemory")).append(totalMemory); //$NON-NLS-1$ result.append(AdminPlugin.Util.getString("MMProcess.FreeMemory")).append(freeMemory); //$NON-NLS-1$ result.append(AdminPlugin.Util.getString("MMProcess.ThreadCount")).append(threadCount); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMProcess.HostIdentifier")).append(hostIdentifier); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMProcess.HostName")).append(hostName); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMProcess.ProcessName")).append(processName); //$NON-NLS-1$ result.append(AdminPlugin.Util.getString("MMProcess.Port")).append(port); //$NON-NLS-1$ result.append(AdminPlugin.Util.getString("MMProcess.InetAddress")).append(inetAddress); //$NON-NLS-1$ result.append(AdminPlugin.Util.getString("MMProcess.Sockets")).append(sockets); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMProcess.MaxSockets")).append(maxSockets); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMProcess.VirtualSockets")).append(virtualSockets); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMProcess.MaxVirtualSockets")).append(maxVirtualSockets); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMProcess.MaxSockets")).append(maxSockets); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMProcess.StartTime")).append(startTime); //$NON-NLS-1$ result.append(AdminPlugin.Util.getString("MMProcess.ObjectsRead")).append(objectsRead); //$NON-NLS-1$ result.append(AdminPlugin.Util.getString("MMProcess.ObjectsWritten")).append(objectsWritten); //$NON-NLS-1$ if (queueWorkerPool != null) { @@ -240,21 +247,8 @@ public void setMaxSockets(int maxSockets) { this.maxSockets = maxSockets; } + /** - * @return Returns the maxVirtualSockets. - * @since 4.3 - */ - public int getMaxVirtualSockets() { - return this.maxVirtualSockets; - } - /** - * @param maxVirtualSockets The maxVirtualSockets to set. - * @since 4.3 - */ - public void setMaxVirtualSockets(int maxVirtualSockets) { - this.maxVirtualSockets = maxVirtualSockets; - } - /** * @return Returns the objectsRead. * @since 4.3 */ @@ -282,6 +276,7 @@ public void setObjectsWritten(long objectsWritten) { this.objectsWritten = objectsWritten; } + /** * @return Returns the sockets. * @since 4.3 @@ -296,21 +291,8 @@ public void setSockets(int sockets) { this.sockets = sockets; } + /** - * @return Returns the virtualSockets. - * @since 4.3 - */ - public int getVirtualSockets() { - return this.virtualSockets; - } - /** - * @param virtualSockets The virtualSockets to set. - * @since 4.3 - */ - public void setVirtualSockets(int virtualSockets) { - this.virtualSockets = virtualSockets; - } - /** * @return Returns the queueWorkerPool. * @since 4.3 */ @@ -324,21 +306,13 @@ public void setQueueWorkerPool(QueueWorkerPool queueWorkerPool) { this.queueWorkerPool = queueWorkerPool; } - - - /** - * @return Returns the processID. - * @since 4.3 - */ - public String getProcessName() { - return identifierParts[1]; - } - - /** - * @return Returns the hostName. - * @since 4.3 - */ - public String getHostName() { - return identifierParts[0]; - } + + @Override + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date date) { + this.startTime = date; + } } Deleted: trunk/client/src/main/java/com/metamatrix/admin/objects/MMResource.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMResource.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMResource.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,84 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.admin.objects; - -import org.teiid.adminapi.Resource; - -import com.metamatrix.admin.AdminPlugin; - -/** - * Dataholder for a resource. - */ -public class MMResource extends MMAdminObject implements Resource { - - private static final long serialVersionUID = -8732882869479091774L; - private String resourceType; - - /** - * Constructor - * @param identifierParts of the resource - */ - public MMResource(String[] identifierParts) { - super(identifierParts); - } - - - /** - * @see java.lang.Object#toString() - */ - public String toString() { - StringBuffer result = new StringBuffer(); - result.append(AdminPlugin.Util.getString("MMResource.MMResource")).append(getIdentifier()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMResource.Type")).append(resourceType); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMResource.Created")).append(getCreatedDate()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMResource.Created_By")).append(getCreatedBy()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMResource.Updated")).append(getLastChangedDate()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMResource.Updated_By")).append(getLastChangedBy()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMResource.Properties")).append(getPropertiesAsString()); //$NON-NLS-1$ - return result.toString(); - } - - - - /** - * Get the Resource Type for this Resource - * @return Returns the String value of the Resource Type for this Resouce. - * @since 4.3 - */ - public String getResourceType() { - return this.resourceType; - } - - - - /** - * Set the Resource Type - * @param resourceType The Resource Type to set. - * @since 4.3 - */ - public void setResourceType(String resourceType) { - this.resourceType = resourceType; - } - - -} Deleted: trunk/client/src/main/java/com/metamatrix/admin/objects/MMScriptsContainer.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMScriptsContainer.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMScriptsContainer.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,145 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.admin.objects; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import org.teiid.adminapi.AdminComponentException; -import org.teiid.adminapi.AdminException; -import org.teiid.adminapi.AdminOptions; -import org.teiid.adminapi.AdminProcessingException; -import org.teiid.adminapi.ScriptsContainer; - -import com.metamatrix.admin.AdminPlugin; -import com.metamatrix.core.util.FileUtils; - - -/** - * @since 4.3 - */ -public class MMScriptsContainer implements - ScriptsContainer { - - private static final long serialVersionUID = 1262888652939367623L; - // <String> fileName => <byte[]> file contents - private Map fileMap; - - /** - * - * @since 4.3 - */ - public MMScriptsContainer() { - super(); - fileMap = new HashMap(10); - } - - /** - * @see org.teiid.adminapi.ScriptsContainer#getFileNames() - * @since 4.3 - */ - public Collection getFileNames() { - return new ArrayList(this.fileMap.keySet()); - } - - /** - * @see org.teiid.adminapi.ScriptsContainer#saveAllToDirectory(java.lang.String, AdminOptions) - * @since 4.3 - */ - public void saveAllToDirectory(String directoryLocation, AdminOptions options) throws AdminException { - String fileSeparator = File.separator; - String path = (directoryLocation.endsWith(fileSeparator) ? directoryLocation : directoryLocation + fileSeparator); - - // Check that the directory exists and is writable - File directory = new File(path); - if ( ! directory.isDirectory() ) { - Object[] params = new Object[] {directoryLocation}; - throw new AdminProcessingException(AdminPlugin.Util.getString("MMScriptsContainer.unable_to_locate_directory", params)); //$NON-NLS-1$ - } - if ( ! directory.canWrite() ) { - Object[] params = new Object[] {directoryLocation}; - throw new AdminProcessingException(AdminPlugin.Util.getString("MMScriptsContainer.unable_to_write_to_directory", params)); //$NON-NLS-1$ - } - - // First check that we will not overwrite any of the files - Collection existingFiles = null; - for ( Iterator fileItr = fileMap.keySet().iterator(); fileItr.hasNext();) { - String fileName = path + (String) fileItr.next(); - File aFile = new File(fileName); - - if ( aFile.exists() ) { - if ( existingFiles == null ) { - existingFiles = new ArrayList(); - } - existingFiles.add(fileName); - } - } - if ( existingFiles != null && (options == null || options.containsOption(AdminOptions.OnConflict.EXCEPTION)) ) { - Object[] params = new Object[] {existingFiles.toString()}; - throw new AdminProcessingException(AdminPlugin.Util.getString("MMScriptsContainer.files_exist", params)); //$NON-NLS-1$ - } - - if ( existingFiles == null || options.containsOption(AdminOptions.OnConflict.OVERWRITE) ) { - // Now write each file - for (Iterator fileItr = fileMap.keySet().iterator(); fileItr.hasNext();) { - String fileName = (String)fileItr.next(); - File target = new File(path + fileName); - - try { - target.createNewFile(); - byte[] fileContents = (byte[])fileMap.get(fileName); - FileUtils.write(fileContents, target); - } catch (IOException err) { - throw new AdminProcessingException(AdminPlugin.Util.getString("MMScriptsContainer.error_writing_file", fileName), err); //$NON-NLS-1$ - } - } - } // if - } - - -//================================================================================================= -// SETTERS ARE NOT IN THE PUBLIIC INTERFACE -//================================================================================================= - - /** - * Add file contents by name. - * - * @param fileName - required - * @param fileContents - required - * @throws AdminComponentException if one of the required args are null or empty. - */ - public void addFile(String fileName, byte[] fileContents) throws AdminComponentException { - if ( fileName == null || fileName.length() == 0 ) { - throw new AdminComponentException(AdminPlugin.Util.getString("MMScriptsContainer.fileName_was_null")); //$NON-NLS-1$ - } - if ( fileContents == null || fileContents.length == 0 ) { - throw new AdminComponentException(AdminPlugin.Util.getString("MMScriptsContainer.fileContents_was_null")); //$NON-NLS-1$ - } - this.fileMap.put(fileName, fileContents); - } -} Deleted: trunk/client/src/main/java/com/metamatrix/admin/objects/MMService.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMService.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMService.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,209 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.admin.objects; - -import java.util.Date; - -import org.teiid.adminapi.Service; - -import com.metamatrix.admin.AdminPlugin; - - -/** - * A Service - * - */ -public class MMService extends MMAdminObject implements Service { - - private static final long serialVersionUID = -338643922496948824L; - private String description = ""; //$NON-NLS-1$ - private String componentTypeName = ""; //$NON-NLS-1$ - private int currentState; - private Date stateChangedTime; - private long serviceID = -1; - - - /** - * Constructor. - * @param identifierParts - * @since 6.1 - */ - public MMService(String[] identifierParts) { - super(identifierParts); - } - - - - - - /** - * @see java.lang.Object#toString() - */ - public String toString() { - StringBuffer result = new StringBuffer(); - result.append(AdminPlugin.Util.getString("MMService.MMService")).append(getIdentifier()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMService.Description")).append(description); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMService.Created")).append(getCreatedDate()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMService.Created_By")).append(getCreatedBy()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMService.Updated")).append(getLastChangedDate()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMService.Updated_By")).append(getLastChangedBy()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMService.State")).append(getState()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMService.State_Changed")).append(getStateChangedTime()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMService.IsRegistered")).append(isRegistered()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMService.Properties")).append(getPropertiesAsString()); //$NON-NLS-1$ - return result.toString(); - } - - - - /** - * Returns the description - * @return description - */ - public String getDescription() { - return description; - } - - /** - * Set the description - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - - - /** - * @return the current state of this connector binding. - */ - public int getState() { - return this.currentState; - } - - /** - * @return Returns the currentState as String. - * @since 6.1 - */ - public String getStateAsString() { - switch (currentState) { - case STATE_OPEN: - return AdminPlugin.Util.getString("MMService.open"); //$NON-NLS-1$ - case STATE_CLOSED: - return AdminPlugin.Util.getString("MMService.closed"); //$NON-NLS-1$ - case STATE_FAILED: - return AdminPlugin.Util.getString("MMService.failed"); //$NON-NLS-1$ - case STATE_INIT_FAILED: - return AdminPlugin.Util.getString("MMService.initializationFailed"); //$NON-NLS-1$ - case STATE_NOT_INITIALIZED: - return AdminPlugin.Util.getString("MMService.notInitialized"); //$NON-NLS-1$ - case STATE_NOT_REGISTERED: - return AdminPlugin.Util.getString("MMService.notRegistered"); //$NON-NLS-1$ - case STATE_DATA_SOURCE_UNAVAILABLE: - return AdminPlugin.Util.getString("MMService.dataSourceUnavailable"); //$NON-NLS-1$ - default: - return AdminPlugin.Util.getString("MMService.unknown"); //$NON-NLS-1$ - } - } - - /** - * Set the state - * @param state - * @since 6.1 - */ - public void setState(int state) { - this.currentState = state; - - //check on what states mean "registered" - setRegistered(currentState==STATE_OPEN || currentState==STATE_FAILED || currentState==STATE_DATA_SOURCE_UNAVAILABLE); - } - - - /** - * @return Returns time of last state change. - * @since 6.1 - */ - public Date getStateChangedTime() { - return stateChangedTime; - } - - /** - * Set the state changed time - * @param stateChangedTime - * @since 6.1 - */ - public void setStateChangedTime(Date stateChangedTime) { - this.stateChangedTime = stateChangedTime; - } - - - /** - * @return Returns the serviceID. - * @since 6.1 - */ - public long getServiceID() { - return this.serviceID; - } - - /** - * @param serviceID The serviceID to set. - * @since 6.1 - */ - public void setServiceID(long serviceID) { - this.serviceID = serviceID; - } - - - /** - * @return Returns the processID. - * @since 6.1 - */ - public String getProcessName() { - return identifierParts[1]; - } - - - /** - * @return Returns the hostName. - * @since 6.1 - */ - public String getHostName() { - return identifierParts[0]; - } - - - /** - * @param connectorTypeName the identifier for a connector type - * @since 6.1 - */ - public void setComponentTypeName(String componentTypeName) { - this.componentTypeName = componentTypeName; - } - - /** - * @see org.teiid.adminapi.Service#getComponentTypeName() - * @since 6.1 - */ - public String getComponentTypeName() { - return this.componentTypeName; - } -} \ No newline at end of file Deleted: trunk/client/src/main/java/com/metamatrix/admin/objects/MMSystem.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMSystem.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMSystem.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,119 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.admin.objects; - -import java.util.Date; - -import org.teiid.adminapi.SystemObject; - -import com.metamatrix.admin.AdminPlugin; -import com.metamatrix.core.util.DateUtil; - -/** - * Dataholder for information about the system at-large - */ -public class MMSystem extends MMAdminObject implements SystemObject { - - private static final long serialVersionUID = 7913646658641775637L; - Date startTime; - boolean isStarted; - - - /**Dummy identifier for the system as a whole.*/ - private final static String SYSTEM_IDENTIFIER = "SYSTEM"; //$NON-NLS-1$ - - /** - * Construct a new MMSystem object - * - * @since 4.3 - */ - public MMSystem() { - super(new String[] {SYSTEM_IDENTIFIER}); - } - - - - - /** - * @return Returns whether the system is started. - * @since 4.3 - */ - public boolean isStarted() { - return this.isStarted; - } - - /** - * @param isStarted whether the system is started. - * @since 4.3 - */ - public void setStarted(boolean isStarted) { - this.isStarted = isStarted; - } - - - - - /** - * @return Returns the startTime. - * @since 4.3 - */ - public Date getStartTime() { - return this.startTime; - } - - - /** - * @param startTime The startTime to set. - * @since 4.3 - */ - public void setStartTime(Date startTime) { - this.startTime = startTime; - } - - /** - * Get The Start Date as a String - * @return String - * @since 4.3 - */ - public String getStartDateAsString() { - if( this.startTime != null) - return DateUtil.getDateAsString(getStartTime()); - return "Start Date not Set"; //$NON-NLS-1$ - } - - - /** - * @see java.lang.Object#toString() - */ - public String toString() { - StringBuffer result = new StringBuffer(); - result.append(AdminPlugin.Util.getString("MMSystem.MMSystem")).append(getIdentifier()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMSystem.properties")).append(getPropertiesAsString()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMSystem.isStarted")).append(isStarted()); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMSystem.startTime")).append(getStartDateAsString()); //$NON-NLS-1$ - return result.toString(); - } - - -} - Deleted: trunk/client/src/main/java/com/metamatrix/admin/objects/MMUser.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMUser.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMUser.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,56 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.admin.objects; - -import org.teiid.adminapi.User; - - -/** - * @since 4.3 - */ -public class MMUser extends MMPrincipal implements User { - private static final long serialVersionUID = -5201466263343170010L; - - /** - * @param identifierParts - * @since 4.3 - */ - public MMUser(String[] identifierParts) { - super(identifierParts, TYPE_USER); - } - - /** - * Determine if the given property name is legal for a User. - * @param propName The name of a user property. - * @return <code>true</code> iff the given name is one of - * the allowed {@link User} properties. - * @since 4.3 - */ - public static final boolean isUserProperty(String propName) { - return (propName.equals(COMMON_NAME) || - propName.equals(GIVEN_NAME) || - propName.equals(SURNAME) || - propName.equals(LOCATION) || - propName.equals(TELEPHONE_NUMBER)); - } -} Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/client/ServerAdminFactory.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/client/ServerAdminFactory.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/client/ServerAdminFactory.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -31,6 +31,7 @@ import org.teiid.adminapi.Admin; import org.teiid.adminapi.AdminComponentException; import org.teiid.adminapi.AdminException; +import org.teiid.adminapi.AdminObject; import com.metamatrix.admin.AdminPlugin; import com.metamatrix.api.exception.security.LogonException; @@ -130,7 +131,7 @@ //we'll wait 30 seconds for the server to come back up for (int i = 0; i < 15; i++) { try { - getTarget().getSystem(); + getTarget().getProcesses(AdminObject.WILDCARD); return; } catch (Exception e) { //reestablish a connection and retry Deleted: trunk/client/src/main/java/org/teiid/adminapi/AdminStatus.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/AdminStatus.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/AdminStatus.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.adminapi; - - -/** - * Base interface of admin status objects. - * Status objects are returned by some admin methods to indicate warnings or additional information, - * that doesn't belong in an Exception. - * - * @since 4.3 - */ -public interface AdminStatus { - - - /** - * Status code indicating an unknown status - */ - public final static int CODE_UNKNOWN = -1; - /** - * Status code indicating that the operation succeeded. - */ - public final static int CODE_SUCCESS = 0; - - /** - * Warning status code indicating that an object could not be decrypted. - */ - public final static int CODE_DECRYPTION_FAILED = -101; - - - - - /** - * Get the status code. - * This will be one of the status codes specified by the constants <code>AdminStatus.CODE_*</code>. - * @return String the unique Identifier - * @since 4.3 - */ - int getCode(); - - /** - * Get the status message. - * @return String Name - * @since 4.3 - */ - String getMessage(); - -} Modified: trunk/client/src/main/java/org/teiid/adminapi/ConfigurationAdmin.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/ConfigurationAdmin.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/ConfigurationAdmin.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -28,44 +28,14 @@ /** - * This interface describes the methods to configure MetaMatrix. + * This interface describes the methods to configure Teiid. * - * As a core interface, - * this administration is common to both the MetaMatrix server and MM Query. * @since 4.3 */ @RolesAllowed(value=AdminRoles.RoleName.ADMIN_SYSTEM) public interface ConfigurationAdmin { - - /** - * Set system-wide property. This will be written to config_ns.xml - * - * @param propertyName - * Name of the System Property - * @param propertyValue - * Value of the System Property - * @throws AdminException - * if there's a system error or if there's a user input error. - * @since 4.3 - */ - void setSystemProperty(String propertyName, - String propertyValue) throws AdminException; - /** - * Set several system-wide properties. These will be written to config_ns.xml - * Any existing properties not specified will not be changed. - * - * @param properties - * Properties to set. - * @throws AdminException - * if there's a system error or if there's a user input error. - * @since 4.3 - */ - void updateSystemProperties(Properties properties) throws AdminException; - - - /** * Assign a {@link ConnectorBinding} to a {@link VDB}'s Model * * @param connectorBindingName @@ -91,51 +61,15 @@ String modelName) throws AdminException; /** - * Set a Property for an AdminObject - * - * @param identifier - * The unique identifier for for an {@link AdminObject}. - * @param className - * The class name of the sub-interface of {@link AdminObject} you are setting the property for. - * All of these sub-interfaces are in package <code>com.metamatrix.admin.api.objects</code>. - * You may specify either the fully-qualified or unqualified classname. - * For example "ConnectorBinding" or "com.metamatrix.admin.api.objects.ConnectorBinding". + * Set/update the property for the Connector Binding identified by the given deployed name. + * @param deployedName * @param propertyName - * String Property key * @param propertyValue - * String value to update * @throws AdminException - * if there's a system error. - * @since 4.3 */ - void setProperty(String identifier, - String className, - String propertyName, - String propertyValue) throws AdminException; + void setConnectorBindingProperty(String deployedName, String propertyName, String propertyValue) throws AdminException; - /** - * Set several properties for an AdminObject. Any existing properties not specified will not be changed. - * - * @param identifier - * The unique identifier for for an {@link AdminObject}. - * @param className - * The class name of the sub-interface of {@link AdminObject} you are setting the property for. - * All of these sub-interfaces are in package <code>com.metamatrix.admin.api.objects</code>. - * You may specify either the fully-qualified or unqualified classname. - * For example "ConnectorBinding" or "com.metamatrix.admin.api.objects.ConnectorBinding". - * @param properties - * Properties to set. - * @throws AdminException - * if there's a system error or if there's a user input error. - * @since 4.3 - */ - void updateProperties(String identifier, - String className, - Properties properties) throws AdminException; - - - /** * Add Connector Type, will import Connector Type from a file * * @param name @@ -249,6 +183,15 @@ */ VDB addVDB(String name, byte[] vdbFile, AdminOptions options) throws AdminException; + + + /** + * Delete the VDB with the given name and version + * @param vdbName + * @param version + * @throws AdminException + */ + void deleteVDB(String vdbName, String version) throws AdminException; /** * Get the {@link LogConfiguration} @@ -271,7 +214,20 @@ */ void setLogConfiguration(LogConfiguration config) throws AdminException; + /** + * Set the log listener to install into MM Query. This log listener will receive all log messages + * written by the MM Query at it's current log level and log contexts. + * + * Note: Logging changes are not persistent. This will be fixed in future versions. + * + * @param listener The listener component + * @throws AdminException if there's a system error. + * @since 4.3 + */ + void setLogListener(EmbeddedLogger listener) throws AdminException; + + /** * Adds an {@link ExtensionModule} to the end of the list of modules. * All caches (of Class objects) are cleared. * Modified: trunk/client/src/main/java/org/teiid/adminapi/ConnectorBinding.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/ConnectorBinding.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/ConnectorBinding.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -58,24 +58,16 @@ public static final String PASSWORD = "Password"; //$NON-NLS-1$ - /** - * Returns the String globally unique routing UUID for this - * Connector Binding - * @return Returns the routingUUID. - * @since 4.3 - */ - String getRoutingUUID(); - /** * Retrieve the current connector state. This will be one of the constants: - * {@link DQP#STATE_OPEN DQP.STATE_OPEN}. - * {@link DQP#STATE_NOT_INITIALIZED DQP.STATE_NOT_INITIALIZED}. - * {@link DQP#STATE_CLOSED DQP.STATE_CLOSED}. - * {@link DQP#STATE_FAILED DQP.STATE_FAILED}. - * {@link DQP#STATE_INIT_FAILED DQP.STATE_INIT_FAILED}. - * {@link DQP#STATE_NOT_REGISTERED DQP.STATE_NOT_REGISTERED}. - * {@link DQP#STATE_DATA_SOURCE_UNAVAILABLE DQP.STATE_DATA_SOURCE_UNAVAILABLE}. - * {@link DQP#STATE_NOT_DEPLOYED DQP.STATE_NOT_DEPLOYED}. + * {@link ConnectorBinding#STATE_OPEN DQP.STATE_OPEN}. + * {@link ConnectorBinding#STATE_NOT_INITIALIZED DQP.STATE_NOT_INITIALIZED}. + * {@link ConnectorBinding#STATE_CLOSED DQP.STATE_CLOSED}. + * {@link ConnectorBinding#STATE_FAILED DQP.STATE_FAILED}. + * {@link ConnectorBinding#STATE_INIT_FAILED DQP.STATE_INIT_FAILED}. + * {@link ConnectorBinding#STATE_NOT_REGISTERED DQP.STATE_NOT_REGISTERED}. + * {@link ConnectorBinding#STATE_DATA_SOURCE_UNAVAILABLE DQP.STATE_DATA_SOURCE_UNAVAILABLE}. + * {@link ConnectorBinding#STATE_NOT_DEPLOYED DQP.STATE_NOT_DEPLOYED}. * @return current connector state. */ int getState(); Deleted: trunk/client/src/main/java/org/teiid/adminapi/DQP.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/DQP.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/DQP.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,88 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.adminapi; - -import java.util.Date; - -/** - * The distributed query processor, which is the internal query engine component used by MetaMatrix products. - * - * @since 4.3 - */ -public interface DQP extends - AdminObject { - - - /**Registered by not initialized*/ - public static final int STATE_NOT_INITIALIZED = 0; - /**Open and running*/ - public static final int STATE_OPEN = 1; - /**Registered but closed*/ - public static final int STATE_CLOSED = 2; - /**Failed after running successfully*/ - public static final int STATE_FAILED = 3; - /**Failed during initialization*/ - public static final int STATE_INIT_FAILED = 4; - /**Not registered*/ - public static final int STATE_NOT_REGISTERED = 5; - /**Running, but the underlying data source is unavailable*/ - public static final int STATE_DATA_SOURCE_UNAVAILABLE = 6; - /**Running, not deployed*/ - public static final int STATE_NOT_DEPLOYED = 7; - - /** - * Retrieve the current connector state. This will be one of the constants: - * {@link DQP#STATE_OPEN DQP.STATE_OPEN}. - * {@link DQP#STATE_NOT_INITIALIZED DQP.STATE_NOT_INITIALIZED}. - * {@link DQP#STATE_CLOSED DQP.STATE_CLOSED}. - * {@link DQP#STATE_FAILED DQP.STATE_FAILED}. - * {@link DQP#STATE_INIT_FAILED DQP.STATE_INIT_FAILED}. - * {@link DQP#STATE_NOT_REGISTERED DQP.STATE_NOT_REGISTERED}. - * {@link DQP#STATE_DATA_SOURCE_UNAVAILABLE DQP.STATE_DATA_SOURCE_UNAVAILABLE}. - * {@link DQP#STATE_NOT_DEPLOYED DQP.STATE_NOT_DEPLOYED}. - * @return current connector state. - */ - int getState(); - - /** - * Retrieve the current connector state. - * - * @return current connector state. - */ - String getStateAsString(); - - /** - * Retrieve time of last state change. - * - * @return time of last state change. - * @since 4.3 - */ - Date getStateChangedTime(); - - /** - * Returns the description. - * - * @return description - */ - public String getDescription(); -} Deleted: trunk/client/src/main/java/org/teiid/adminapi/Entitlement.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/Entitlement.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/Entitlement.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.adminapi; - -import java.util.Collection; - - -/** - * @since 4.3 - */ -public interface Entitlement extends AdminObject { - - /** - * Get the Collection of {@link Principal}s that possess - * this Entitlement. - * @param principalIdentifier - * @return The collection of entitled {@link Principal}s. - * @since 4.3 - */ - Collection getPrincipals(String principalIdentifier); - -} Modified: trunk/client/src/main/java/org/teiid/adminapi/Group.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/Group.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/Group.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -22,18 +22,14 @@ package org.teiid.adminapi; + /** - * A Group is a MetaMatrix principal that can contain other Principals - * as members. A Group can contain {@link User}s and other Groups. - * - * See {@link Principal} for identity pattern. - * @since 4.3 + * This interface is used to represent a group of principals. */ -public interface Group extends Principal { +public interface Group extends AdminObject { /** - * Optional property for a group + * Optional property for a group; group description */ - /** The group description */ static final String DESCRIPTION = "description"; //$NON-NLS-1$ } Deleted: trunk/client/src/main/java/org/teiid/adminapi/Host.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/Host.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/Host.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,75 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.adminapi; - - - -/** - * Represents a host in the MetaMatrix system. - * - * The identifier pattern for a host is <code>"hostName"</code>. - * A hostName is considered to be unique across the system. - * @since 4.3 - */ -public interface Host extends AdminObject { - - /** - * Install Directory Property - */ - public static final String INSTALL_DIR = "metamatrix.installationDir"; //$NON-NLS-1$ - - /** - * Log Directory Property - */ - public static final String LOG_DIRECTORY = "metamatrix.log.dir"; //$NON-NLS-1$ - - /** - * Host Directory Property - */ - public static final String HOST_DIRECTORY = "metamatrix.host.dir"; //$NON-NLS-1$ - - /** - * Host Enabled Property - */ - public static final String HOST_ENABLED = "host.enabled"; //$NON-NLS-1$ - - /** - * Host Bind Address Property - */ - public static final String HOST_BIND_ADDRESS = "metamatrix.host.bind.address"; //$NON-NLS-1$ - - /** - * Host Physical Address Property - */ - public static final String HOST_PHYSICAL_ADDRESS = "metamatrix.host.physical.address"; //$NON-NLS-1$ - - - /** - * Return true if this Host is executing. - * - * @return if this Host is actively participating - * in the MetaMatrix system. - * @since 4.3 - */ - public boolean isRunning(); -} Modified: trunk/client/src/main/java/org/teiid/adminapi/MonitoringAdmin.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/MonitoringAdmin.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/MonitoringAdmin.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -27,13 +27,9 @@ import com.metamatrix.admin.RolesAllowed; - /** - * Used to access the monitorable components of the MetaMatrix system. + * Used to access the monitorable components of the Teiid system. * - * As a core interface, - * this administration is common to both the MetaMatrix server and MM Query. - * * See the particular admin object in question for an example of * allowed identifier patterns. * @@ -43,15 +39,6 @@ public interface MonitoringAdmin { /** - * Retrieve the single System object. - * - * @return The single {@link SystemObject} object, for interacting with system-wide configuration - * @throws AdminException if there's a system error. - * @since 4.3 - */ - SystemObject getSystem() throws AdminException; - - /** * Get the Connector Types that correspond to the specified identifier pattern. * * @param connectorTypeIdentifier the unique identifier for for a {@link ConnectorType} @@ -64,7 +51,7 @@ * @throws AdminException if there's a system error. * @since 4.3 */ - Collection getConnectorTypes(String connectorTypeIdentifier) throws AdminException; + Collection<ConnectorType> getConnectorTypes(String connectorTypeIdentifier) throws AdminException; /** * Get the VDBs that correspond to the specified identifier pattern. @@ -81,7 +68,7 @@ * @since 4.3 */ @RolesAllowed(value=AdminRoles.RoleName.ANONYMOUS) - Collection getVDBs(String vdbIdentifier) throws AdminException; + Collection<VDB> getVDBs(String vdbIdentifier) throws AdminException; /** * Get the Connector Bindings that correspond to the specified identifier pattern. @@ -96,7 +83,7 @@ * @throws AdminException if there's a system error. * @since 4.3 */ - Collection getConnectorBindings(String connectorBindingIdentifier) throws AdminException; + Collection<ConnectorBinding> getConnectorBindings(String connectorBindingIdentifier) throws AdminException; /** * Get all the Connector Bindings for the given VDB identifier pattern @@ -110,7 +97,7 @@ * @throws AdminException if there's a system error. * @since 4.3 */ - Collection getConnectorBindingsInVDB(String identifier) throws AdminException; + Collection<ConnectorBinding> getConnectorBindingsInVDB(String identifier) throws AdminException; /** * Get the Extension Modules that correspond to the specified identifier pattern @@ -141,7 +128,7 @@ * @throws AdminException if there's a system error. * @since 4.3 */ - Collection getQueueWorkerPools(String identifier) throws AdminException; + Collection<QueueWorkerPool> getQueueWorkerPools(String identifier) throws AdminException; /** @@ -175,7 +162,7 @@ * @throws AdminException if there's a system error. * @since 4.3 */ - Collection getCaches(String identifier) throws AdminException; + Collection<Cache> getCaches(String identifier) throws AdminException; /** * Get the Sessions that correspond to the specified identifier pattern @@ -222,23 +209,14 @@ */ Collection<Request> getSourceRequests(String identifier) throws AdminException; + /** * Get all of the available Configuration Properties for the specified AdminObject, and details about them. - * @param identifier - * The unique identifier for for an {@link AdminObject}. - * @param className - * The class name of the sub-interface of {@link AdminObject} you are setting the property for. These are all the - * supported class names. {@link SystemObject}, {@link Host}, {@link ProcessObject}, {@link ConnectorBinding}, - * {@link ConnectorType},{@link DQP}, {@link Resource} - * - * Note that in Embedded mode only supported classes are {@link ConnectorBinding}, {@link ConnectorType}, - * {@link SystemObject} - * @return Collection of PropertyDefinition objects. - * @throws AdminException if there's a system error. - * @since 4.3 + * @param connectorTypeIdentifier + * @return + * @throws AdminException */ - Collection getPropertyDefinitions(String identifier, - String className) throws AdminException; + Collection<PropertyDefinition> getConnectorTypePropertyDefinitions(String connectorTypeIdentifier) throws AdminException; /** Deleted: trunk/client/src/main/java/org/teiid/adminapi/Principal.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/Principal.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/Principal.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.adminapi; - - -/** - * A Principal may participate in entitlements (authorization). A Principal - * may also posess administrative roles for the system. - * - * The identifier pattern for all principal types is <code>"name"</code>. - * A name is concidered to be unique across the system for all - * principal types. - * @since 4.3 - */ -public interface Principal extends AdminObject { - - /** User internal type. Note that a User can be of type Admin and vice versa. */ - static final int TYPE_USER = 0; - /** Group internal type */ - static final int TYPE_GROUP = 1; - /** Admin internal type. Note that a User can be of type Admin and vice versa. */ - static final int TYPE_ADMIN = 2; - - /** Display String for User type */ - static final String TYPE_LABEL_USER = "User"; //$NON-NLS-1$ - /** Display String for Group type */ - static final String TYPE_LABEL_GROUP = "Group"; //$NON-NLS-1$ - /** Display String for Admin type */ - static final String TYPE_LABEL_ADMIN = "Admin"; //$NON-NLS-1$ - - /** User and Group names can be no longer then this */ - static final int NAME_LEN_LIMIT = 32; - - /** - * Get the Principal type for this principal. - * @return the internal type of this user. - * @since 4.3 - */ - int getType(); - - /** - * Get the Principal type String for this principal. - * @return the String representation type of this user. - * @since 4.3 - */ - String getTypeLabel(); - -} Modified: trunk/client/src/main/java/org/teiid/adminapi/ProcessObject.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/ProcessObject.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/ProcessObject.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -23,63 +23,35 @@ package org.teiid.adminapi; import java.net.InetAddress; +import java.util.Date; - /** - * A Process in the MetaMatrix system. + * A Process in the Teiid System * - * The identifier pattern for a Process is <code>"hostName.processName"</code>. - * This Process identifier is concidered to be unique across the system. + * The identifier pattern for a Process is <code>"processName"</code>. + * This Process identifier is considered to be unique across the system. * @since 4.3 */ public interface ProcessObject extends AdminObject { + /** - * Process Min Heap Size Property Name + * Get the Host name + * + * @return String host name where the process is running + * @since 4.3 */ - public static final String VM_MINIMUM_HEAP_SIZE_PROPERTY_NAME = "vm.starter.minHeapSize"; //$NON-NLS-1$ - /** - * Process Max Heap Size Property Name - */ - public static final String VM_MAXIMUM_HEAP_SIZE_PROPERTY_NAME = "vm.starter.maxHeapSize"; //$NON-NLS-1$ - /** - * Process Port Property Name - */ - public static final String SERVER_PORT = "vm.socketPort"; //$NON-NLS-1$ - /** - * Process Max Treads Property Name - */ - public static final String MAX_THREADS = "vm.maxThreads"; //$NON-NLS-1$ - /** - * Process Time To Live Property Name - */ - public static final String TIMETOLIVE = "vm.timetolive"; //$NON-NLS-1$ - /** - * Process Import Buffer Size Property Name - */ - public static final String INPUT_BUFFER_SIZE = "vm.inputBufferSize"; //$NON-NLS-1$ - /** - * Process Output Buffer Size Property Name - */ - public static final String OUTPUT_BUFFER_SIZE = "vm.outputBufferSize"; //$NON-NLS-1$ - /** - * Process Forced Shutdown Time Property Name - */ - public static final String FORCED_SHUTDOWN_TIME = "vm.forced.shutdown.time"; //$NON-NLS-1$ - /** - * Process Enabled Flag Property Name - */ - public static final String ENABLED_FLAG = "vm.enabled"; //$NON-NLS-1$ - - /** - * Get the {@link Host} Identifier for this MetaMatrix Process + public String getHostName(); + + /** + * Get the Process name * - * @return String A unique identifier for the Host of this Process. + * @return String A unique identifier for this Process. * @since 4.3 */ - public String getHostIdentifier(); + public String getProcessName(); /** @@ -127,37 +99,37 @@ * @since 4.3 */ public boolean isRunning(); - + /** - * @return Returns the maxSockets. - * @since 4.3 - */ - public int getMaxSockets(); - /** - * @return Returns the maxVirtualSockets. - * @since 4.3 - */ - public int getMaxVirtualSockets(); - /** * @return Returns the objectsRead. * @since 4.3 */ public long getObjectsRead(); + /** * @return Returns the objectsWritten. * @since 4.3 */ public long getObjectsWritten(); + + /** + * @return Returns the maxSockets. + * @since 4.3 + */ + public int getMaxSockets(); + + /** * @return Returns the sockets. * @since 4.3 */ public int getSockets(); + /** - * @return Returns the virtualSockets. + * @return Returns the startTime. * @since 4.3 */ - public int getVirtualSockets(); + public Date getStartTime(); /** Deleted: trunk/client/src/main/java/org/teiid/adminapi/Resource.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/Resource.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/Resource.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,36 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.adminapi; - - -/** - * @since 4.3 - */ -public interface Resource extends AdminObject { - - /** - * The environment property that indicates the name of the pool. - */ - public static final String RESOURCE_POOL = "metamatrix.common.pooling.resource.name"; //$NON-NLS-1$ - -} Modified: trunk/client/src/main/java/org/teiid/adminapi/RuntimeStateAdmin.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/RuntimeStateAdmin.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/RuntimeStateAdmin.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -28,12 +28,9 @@ /** - * This interface defines the methods to interact with the MetaMatrix system + * This interface defines the methods to interact with the Teiid system * during runtime. * - * As a core interface, - * this administration is common to both the MetaMatrix server and MM Query. - * * @since 4.3 */ @RolesAllowed(value=AdminRoles.RoleName.ADMIN_PRODUCT) @@ -136,18 +133,9 @@ * @throws AdminException */ void terminateTransaction(String transactionId, String sessionId) throws AdminException; + /** - * Set the log listener to install into MM Query. This log listener will receive all log messages - * written by the MM Query at it's current log level and log contexts. - * - * @param listener The listener component - * @throws AdminException if there's a system error. - * @since 4.3 - */ - void setLogListener(EmbeddedLogger listener) throws AdminException; - - /** * Stop the MM Query. If millisToWait is >0, then close to incoming queries, wait the time period * for work to stop, then stop the MM Query. Otherwise, stop immediately, aborting all running queries. * @param millisToWait Milliseconds to wait (if >0) or <=0 for no wait before stopping Deleted: trunk/client/src/main/java/org/teiid/adminapi/ScriptsContainer.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/ScriptsContainer.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/ScriptsContainer.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.adminapi; - -import java.io.Serializable; -import java.util.Collection; - - - - -/** - * Contains all information nessecary to save the scripts that will be run - * by a MetaMatrix utility to load or refresh the data resident in a - * Materialized View. - * - * Users can get the contents of each file and save each with the - * filename associated with it or, more easily, users can save all files - * to a local folder. (See {@link #saveAllToDirectory}) - * - * @since 4.3 - */ -public interface ScriptsContainer extends Serializable { - - /** - * Get the file names of all scripts in this container. - * - * @return The <code>Collection</code> of <code>String</code> - * file names of all scripts in this container. This - * collection may be empty if an error has occured. - * @since 4.3 - */ - Collection getFileNames(); - - /** - * Save all of the scripts contained to the specified local - * directory. - * - * @param directoryLocation the directory location to save - * the contained scripts. Must be accessable from where - * this code is running. - * @param options Specify whether to {@link AdminOptions.OnConflict#OVERWRITE} - * or {@link AdminOptions.OnConflict#EXCEPTION} (default) when script files - * exist in the <code>directoryLocation</code>. - * @throws AdminException if there's an error saving the files. - * @since 4.3 - */ - void saveAllToDirectory(String directoryLocation, AdminOptions options) throws AdminException; -} Modified: trunk/client/src/main/java/org/teiid/adminapi/SecurityAdmin.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/SecurityAdmin.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/SecurityAdmin.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -40,9 +40,7 @@ /** * Get the Collection of administrative role names possessed by the given group, if any. * - * @param groupIdentifier - * The unique identifier for the {@link Group}. This is group name. A user is a {@link Principal} and a - * Principal name is considered to be unique throughout the MetaMatrix system across all Membership domains. + * @param groupIdentifier The unique identifier for the {@link Group}. This is group name. * The {@link AdminObject#WILDCARD WILDCARD} cannot be used here. * @return The Collection of {@link Role}s. * @throws AdminException @@ -55,8 +53,7 @@ * Get the group memberships for the given user. * * @param userIdentifier - * The unique identifier for the user. This is generally a user name. A user is a {@link Principal} and a - * Principal name is considered to be unique throughout the MetaMatrix system across all Membership domains. + * The unique identifier for the user. This is generally a user name. * The {@link AdminObject#WILDCARD WILDCARD} cannot be used here. * @return The collection of groups in which the given user has membership. * @throws AdminException @@ -70,9 +67,8 @@ * Get the group denoted by the given <code>groupIdentifier</code>. * * @param groupIdentifier - * The unique identifier for the {@link Group}. This is generally a group name. A group is a {@link Principal} and - * a Principal name is considered to be unique throughout the MetaMatrix system across all Membership domains. - * Note that by supplying the {@link AdminObject#WILDCARD WILDCARD} identifier, all all users in the system will + * The unique identifier for the {@link Group}. This is generally a group name. + * Note that by supplying the {@link AdminObject#WILDCARD WILDCARD} identifier, all all groups in the system will * retrieved. * @return The Collection of groups. * @throws AdminException @@ -87,7 +83,7 @@ * @param roleIdentifier * one of {@link AdminRoles}. * @param groupIdentifier - * the unique identifier for the Principal. The {@link AdminObject#WILDCARD WILDCARD} cannot be used here. + * the unique identifier for the Group. The {@link AdminObject#WILDCARD WILDCARD} cannot be used here. * @throws AdminException * if there's a system error. * @since 4.3 @@ -101,7 +97,7 @@ * @param roleIdentifier * one of {@link AdminRoles} * @param groupIdentifier - * the unique identifier for the Principal. The {@link AdminObject#WILDCARD WILDCARD} cannot be used here. + * the unique identifier for the group. The {@link AdminObject#WILDCARD WILDCARD} cannot be used here. * @throws AdminException * if there's a system error. * @since 4.3 Deleted: trunk/client/src/main/java/org/teiid/adminapi/Service.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/Service.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/Service.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,98 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.adminapi; - -import java.util.Date; - -/** - * Represents a service in the MetaMatrix system. - * - * The unique identifier pattern is [host]<{@link #DELIMITER}>[process]<{@link #DELIMITER}>[Service Name] - * when running against a MetaMatrix server. The [Service Name] can itself have spaces in the name. - * In the case of the MM Query, a Service does not apply as MM Query is not running within a MM Server VM. - * - * @since 4.3 - */ -public interface Service extends - AdminObject { - /**Registered by not initialized*/ - public static final int STATE_NOT_INITIALIZED = 0; - /**Open and running*/ - public static final int STATE_OPEN = 1; - /**Registered but closed*/ - public static final int STATE_CLOSED = 2; - /**Failed after running successfully*/ - public static final int STATE_FAILED = 3; - /**Failed during initialization*/ - public static final int STATE_INIT_FAILED = 4; - /**Not registered*/ - public static final int STATE_NOT_REGISTERED = 5; - /**Running, but the underlying data source is unavailable*/ - public static final int STATE_DATA_SOURCE_UNAVAILABLE = 6; - /**Running, not deployed*/ - public static final int STATE_NOT_DEPLOYED = 7; - - /** - * Retrieve the current connector state. This will be one of the constants: - * {@link DQP#STATE_OPEN DQP.STATE_OPEN}. - * {@link DQP#STATE_NOT_INITIALIZED DQP.STATE_NOT_INITIALIZED}. - * {@link DQP#STATE_CLOSED DQP.STATE_CLOSED}. - * {@link DQP#STATE_FAILED DQP.STATE_FAILED}. - * {@link DQP#STATE_INIT_FAILED DQP.STATE_INIT_FAILED}. - * {@link DQP#STATE_NOT_REGISTERED DQP.STATE_NOT_REGISTERED}. - * {@link DQP#STATE_DATA_SOURCE_UNAVAILABLE DQP.STATE_DATA_SOURCE_UNAVAILABLE}. - * {@link DQP#STATE_NOT_DEPLOYED DQP.STATE_NOT_DEPLOYED}. - * @return current connector state. - */ - int getState(); - - /** - * Retrieve the current connector state as a printable <code>String</code>. - * @return current connector state in String form. - */ - String getStateAsString(); - - /** - * Returns time of last state change. - * - * @return time of last state change. - * @since 4.3 - */ - Date getStateChangedTime(); - - /** - * Returns the description - * - * @return description - */ - String getDescription(); - - /** - * Get the component type identifier for this service {@link ComponentType}. - * @return the Component Type identifier which can be used to - * find the ComponentType. - * @since 6.1 - */ - String getComponentTypeName(); - -} Deleted: trunk/client/src/main/java/org/teiid/adminapi/SystemObject.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/SystemObject.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/SystemObject.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,50 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.adminapi; - -import java.util.Date; - - -/** - * @since 4.3 - */ -public interface SystemObject extends AdminObject { - - /** - * @return Returns whether the system is started. - * @since 4.3 - */ - public boolean isStarted(); - - - - /** - * @return Returns the startTime. - * @since 4.3 - */ - public Date getStartTime(); - - - - -} Deleted: trunk/client/src/main/java/org/teiid/adminapi/User.java =================================================================== --- trunk/client/src/main/java/org/teiid/adminapi/User.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/java/org/teiid/adminapi/User.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.adminapi; - -/** - * A user of the MetaMatrix system may a participant or an - * administrator of the MetaMatrix system. - * - * A User is an actor in the MetaMatrix system. A User - * can log in (authenticate) and perform actions on the system. - * - * See {@link Principal} for identity pattern and other - * abilities. - * @since 4.3 - */ -public interface User extends Principal { - - /** - * Optional properties for Users - */ - /** User's common name */ - static final String COMMON_NAME = "commonName"; //$NON-NLS-1$ - /** User's given name */ - static final String GIVEN_NAME = "givenName"; //$NON-NLS-1$ - /** User's surname (last name) */ - static final String SURNAME = "surName"; //$NON-NLS-1$ - /** User's location */ - static final String LOCATION = "location"; //$NON-NLS-1$ - /** User's telephone number */ - static final String TELEPHONE_NUMBER = "telephoneNumber"; //$NON-NLS-1$ - -} Modified: trunk/client/src/main/resources/com/metamatrix/admin/i18n.properties =================================================================== --- trunk/client/src/main/resources/com/metamatrix/admin/i18n.properties 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/main/resources/com/metamatrix/admin/i18n.properties 2009-08-28 22:27:14 UTC (rev 1291) @@ -33,11 +33,6 @@ MMAdminObject.Unsupported_Admin_Object=Unable to load AdminObjects of Class {0}. -MMAdminStatus.MMAdminStatus=MMAdminStatus:\ -MMAdminStatus.Code=\n Code:\ -MMAdminStatus.Message=\n Message:\ - - MMConnectionPool.MMConnectionPool=MMConnectionPool:\n Identifier:\ MMConnectionPool.Type=\n Type:\ MMConnectionPool.Active=\n Active:\ @@ -65,77 +60,17 @@ MMConnectorBinding.IsRegistered=\n Is Running:\ MMConnectorBinding.Properties=\n Properties:\ - -MMService.unknown=Unknown -MMService.open=Open -MMService.closed=Closed -MMService.failed=Failed -MMService.initializationFailed=Initialization Failed -MMService.notInitialized=Not Initialized -MMService.notRegistered=Not Registered -MMService.dataSourceUnavailable=DataSourceUnavailable - -MMService.MMService=MMService: \n Identifier:\ -MMService.Description=\n Description:\ -MMService.Created=\n Created:\ -MMService.Created_By=\n Created By:\ -MMService.Updated=\n Updated:\ -MMService.Updated_By=\n Updated By:\ -MMService.State=\n State:\ -MMService.State_Changed=\n State Changed:\ -MMService.IsDeployed=\n Is Deployed:\ -MMService.IsRegistered=\n Is Running:\ -MMService.Properties=\n Properties:\ - - - MMConnectorType.MMConnectorType=MMConnectorType: \n Identifier:\ MMConnectorType.Created=\n Created:\ MMConnectorType.Created_By=\n Created By:\ MMConnectorType.Updated=\n Updated:\ MMConnectorType.Updated_By=\n Updated By:\ - - -MMDQP.unknown=Unknown -MMDQP.open=Open -MMDQP.closed=Closed -MMDQP.failed=Failed -MMDQP.initializationFailed=Initialization Failed -MMDQP.notInitialized=Not Initialized -MMDQP.notRegistered=Not Registered -MMDQP.dataSourceUnavailable=DataSourceUnavailable - -MMDQP.MMDQP=MMDQP: \n Identifier:\ -MMDQP.Description=\n Description:\ -MMDQP.Created=\n Created:\ -MMDQP.Created_By=\n Created By:\ -MMDQP.Updated=\n Updated:\ -MMDQP.Updated_By=\n Updated By:\ -MMDQP.State=\n State:\ -MMDQP.State_Changed=\n State Changed:\ -MMDQP.IsDeployed=\n Is Deployed:\ -MMDQP.IsRegistered=\n Is Running:\ -MMDQP.Properties=\n Properties:\ - - - MMExtensionModule.MMExtensionModule=MMExtensionModule: \n Identifier:\ MMExtensionModule.moduleType=\n Module Type:\ MMExtensionModule.description=\n Decription:\ - -MMHost.MMHost=MMHost:\n Identifier:\ -MMHost.Properties=\n Properties:\ -MMHost.Created=\ Created:\ -MMHost.Created_By=\n Created By:\ -MMHost.Updated=\n Updated:\ -MMHost.Updated_By=\n Updated By:\ -MMHost.IsRunning=\n Is Running:\ -MMHost.IsDeployed=\n Is Deployed:\ - - MMModel.MMModel=MMModel:\n Identifier:\ MMModel.type=\n Type:\ MMModel.physical=\n Physical:\ @@ -163,15 +98,15 @@ MMProcess.TotalMemory=\n Total Memory:\ MMProcess.FreeMemory=\n Free Memory:\ MMProcess.ThreadCount=\n Thread Count:\ -MMProcess.HostIdentifier=\n Host Identifier:\ +MMProcess.ProcessName=\n Process Name:\ +MMProcess.HostName=\n Host Name:\ MMProcess.Port=\n Port:\ MMProcess.InetAddress=\n InetAddress:\ MMProcess.IsDeployed=\n Is Deployed:\ MMProcess.IsRunning=\n Is Running:\ MMProcess.Sockets=\n Sockets:\ MMProcess.MaxSockets=\n Max Sockets:\ -MMProcess.VirtualSockets=\n Virtual Sockets:\ -MMProcess.MaxVirtualSockets=\n Max Virtual Sockets:\ +MMProcess.StartTime=\n StartTime:\ MMProcess.ObjectsRead=\n Objects Read:\ MMProcess.ObjectsWritten=\n Objects Written:\ MMProcess.QueueWorkerPool=\n Queue Worker Pool:\ Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/client/TestSeverAdminFactory.java =================================================================== --- trunk/client/src/test/java/com/metamatrix/common/comm/platform/client/TestSeverAdminFactory.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/client/TestSeverAdminFactory.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -57,7 +57,7 @@ verify(sa, times(1)).restart(); //here's the test we issue to see that the system is up after the bounce - verify(sa, times(1)).getSystem(); + verify(sa, times(1)).getProcesses("*"); //$NON-NLS-1$ } } Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/api/HostType.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/HostType.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/HostType.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -30,25 +30,25 @@ public static final String COMPONENT_TYPE_NAME = "Host"; //$NON-NLS-1$ - public static final String INSTALL_DIR = org.teiid.adminapi.Host.INSTALL_DIR; + public static final String INSTALL_DIR = "metamatrix.installationDir"; //$NON-NLS-1$ - public static final String LOG_DIRECTORY = org.teiid.adminapi.Host.LOG_DIRECTORY; + public static final String LOG_DIRECTORY = "metamatrix.log.dir"; //$NON-NLS-1$ - public static final String HOST_DIRECTORY = org.teiid.adminapi.Host.HOST_DIRECTORY; + public static final String HOST_DIRECTORY = "metamatrix.host.dir"; //$NON-NLS-1$ - public static final String HOST_ENABLED = org.teiid.adminapi.Host.HOST_ENABLED; + public static final String HOST_ENABLED = "host.enabled"; //$NON-NLS-1$ /** * When specified, indicates what address the host will be bound to. If this * is not specified, then the host (logical) name will be used. */ - public static final String HOST_BIND_ADDRESS = org.teiid.adminapi.Host.HOST_BIND_ADDRESS; + public static final String HOST_BIND_ADDRESS = "metamatrix.host.bind.address"; //$NON-NLS-1$ /** * The physical address represents a resolvable address for which the host can * be found. This may or may not be the same as the host name. */ - public static final String HOST_PHYSICAL_ADDRESS = org.teiid.adminapi.Host.HOST_PHYSICAL_ADDRESS; + public static final String HOST_PHYSICAL_ADDRESS = "metamatrix.host.physical.address"; //$NON-NLS-1$ } \ No newline at end of file Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VMComponentDefnType.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VMComponentDefnType.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VMComponentDefnType.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -29,22 +29,22 @@ public static final String COMPONENT_TYPE_NAME = "VM"; //$NON-NLS-1$ - public static final String VM_MINIMUM_HEAP_SIZE_PROPERTY_NAME = org.teiid.adminapi.ProcessObject.VM_MINIMUM_HEAP_SIZE_PROPERTY_NAME; - public static final String VM_MAXIMUM_HEAP_SIZE_PROPERTY_NAME = org.teiid.adminapi.ProcessObject.VM_MAXIMUM_HEAP_SIZE_PROPERTY_NAME; + public static final String VM_MINIMUM_HEAP_SIZE_PROPERTY_NAME = "vm.starter.minHeapSize"; //$NON-NLS-1$ + public static final String VM_MAXIMUM_HEAP_SIZE_PROPERTY_NAME = "vm.starter.maxHeapSize"; //$NON-NLS-1$ // Socket VM related properties /** * @see SocketVMController */ public static final String CLUSTER_PORT = "vm.unicast.port"; //$NON-NLS-1$ - public static final String SERVER_PORT = org.teiid.adminapi.ProcessObject.SERVER_PORT; - public static final String MAX_THREADS = org.teiid.adminapi.ProcessObject.MAX_THREADS; - public static final String TIMETOLIVE = org.teiid.adminapi.ProcessObject.TIMETOLIVE; + public static final String SERVER_PORT ="vm.socketPort"; //$NON-NLS-1$ + public static final String MAX_THREADS = "vm.maxThreads"; //$NON-NLS-1$ + public static final String TIMETOLIVE = "vm.timetolive"; //$NON-NLS-1$ - public static final String INPUT_BUFFER_SIZE = org.teiid.adminapi.ProcessObject.INPUT_BUFFER_SIZE; - public static final String OUTPUT_BUFFER_SIZE = org.teiid.adminapi.ProcessObject.OUTPUT_BUFFER_SIZE; - public static final String FORCED_SHUTDOWN_TIME = org.teiid.adminapi.ProcessObject.FORCED_SHUTDOWN_TIME; - public static final String ENABLED_FLAG = org.teiid.adminapi.ProcessObject.ENABLED_FLAG; + public static final String INPUT_BUFFER_SIZE = "vm.inputBufferSize"; //$NON-NLS-1$ + public static final String OUTPUT_BUFFER_SIZE = "vm.outputBufferSize"; //$NON-NLS-1$ + public static final String FORCED_SHUTDOWN_TIME = "vm.forced.shutdown.time"; //$NON-NLS-1$ + public static final String ENABLED_FLAG = "vm.enabled"; //$NON-NLS-1$ /** * When specified, indicates what address the vm will be bound to. If this is not Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java =================================================================== --- trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -38,11 +38,9 @@ import org.teiid.adminapi.Cache; import org.teiid.adminapi.ExtensionModule; import org.teiid.adminapi.Session; -import org.teiid.adminapi.SystemObject; import org.teiid.dqp.internal.process.DQPWorkContext; import org.teiid.dqp.internal.process.Util; -import com.metamatrix.admin.objects.MMAdminObject; import com.metamatrix.admin.objects.MMConnectorBinding; import com.metamatrix.admin.objects.MMConnectorType; import com.metamatrix.admin.objects.MMExtensionModule; @@ -51,10 +49,10 @@ import com.metamatrix.admin.objects.MMPropertyDefinition; import com.metamatrix.admin.objects.MMRequest; import com.metamatrix.admin.objects.MMSession; -import com.metamatrix.admin.objects.MMSystem; import com.metamatrix.admin.objects.MMVDB; import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.security.SessionServiceException; +import com.metamatrix.common.application.exception.ApplicationLifecycleException; import com.metamatrix.common.config.api.ComponentType; import com.metamatrix.common.config.api.ComponentTypeDefn; import com.metamatrix.common.config.api.ConnectorBinding; @@ -538,20 +536,6 @@ } } - /** - * Get the system state. - * @return - */ - public SystemObject getSystem() { - MMSystem system = new MMSystem(); - system.setStartTime(new Date(manager.getStartTime())); - system.setStarted(manager.isAlive()); - system.setProperties(getConfigurationService().getSystemProperties()); - return system; - } - - - boolean isMaskedProperty(String propName, ComponentType type) { if (type != null) { ComponentTypeDefn typeDef = type.getComponentTypeDefinition(propName); @@ -643,38 +627,29 @@ return results; } - - - /** - * Get admin objects of the specified className that match the specified identifier. - * @param identifier - * @param className - * @return - * @since 4.3 - */ - protected Collection getAdminObjects(String identifier, String className) throws AdminException { - - int code = MMAdminObject.getObjectType(className); - - ArrayList list = null; - switch(code) { - case MMAdminObject.OBJECT_TYPE_CONNECTOR_BINDING: - return getConnectorBindings(identifier); - case MMAdminObject.OBJECT_TYPE_CONNECTOR_TYPE: - return getConnectorTypes(identifier); - case MMAdminObject.OBJECT_TYPE_SYSTEM_OBJECT: - list = new ArrayList(); - list.add(getSystem()); - return list; - - default: - throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("AdminImpl.Unsupported_Admin_Object", className)); //$NON-NLS-1$ - - } - } - protected SessionToken validateSession() { return DQPWorkContext.getWorkContext().getSessionToken(); } + protected void changeVDBStatus(String name, String version, int status) + throws AdminException { + try { + + if (name == null || version == null || !name.matches(SINGLE_WORD_REGEX)) { + throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.Invalid_vdb_name")); //$NON-NLS-1$ + } + + // Now change the VDB status it self + this.getVDBService().changeVDBStatus(name, version, status); + + // If the VDB is modified and if its status changed to DELETED, then + // we can remove all the connector bindings associated with this VDB + // the above delete will also remove them + } catch (ApplicationLifecycleException e) { + throw new AdminComponentException(e); + } catch (MetaMatrixComponentException e) { + throw new AdminComponentException(e); + } + } + } Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java =================================================================== --- trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -34,16 +34,13 @@ import org.teiid.adminapi.AdminComponentException; import org.teiid.adminapi.AdminException; -import org.teiid.adminapi.AdminObject; import org.teiid.adminapi.AdminOptions; import org.teiid.adminapi.AdminProcessingException; -import org.teiid.adminapi.AdminStatus; import org.teiid.adminapi.ConfigurationAdmin; +import org.teiid.adminapi.EmbeddedLogger; import org.teiid.adminapi.LogConfiguration; import org.teiid.adminapi.VDB; -import com.metamatrix.admin.objects.MMAdminObject; -import com.metamatrix.admin.objects.MMAdminStatus; import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.common.application.exception.ApplicationLifecycleException; import com.metamatrix.common.config.api.ComponentType; @@ -81,112 +78,38 @@ } /** - * @see org.teiid.adminapi.ConfigurationAdmin#setSystemProperty(java.lang.String, java.lang.String) - * @since 4.3 - */ - public void setSystemProperty(String propertyName,String propertyValue) - throws AdminException { - try { - // actually we should notify the DQP for this, then let DQP call the - // the Configuration Service. Since we do not have dynamic properties on - // DQP this should be OK for now. - getConfigurationService().setSystemProperty(propertyName, propertyValue); - } catch (MetaMatrixComponentException e) { - throw new AdminComponentException(e); - } - } - - - /** - * @see org.teiid.adminapi.ConfigurationAdmin#updateSystemProperties(java.util.Properties) - * @since 4.3 - */ - public void updateSystemProperties(Properties properties) throws AdminException { - try { - // actually we should notify the DQP for this, then let DQP call the - // the Configuration Service. Since we do not have dynamic properties on - // DQP this should be OK for now. - getConfigurationService().updateSystemProperties(properties); - }catch(MetaMatrixComponentException e) { - throw new AdminComponentException(e); - } - } - - /** * @see org.teiid.adminapi.ConfigurationAdmin#setProperty(java.lang.String, java.lang.String, java.lang.String, java.lang.String) * @since 4.3 */ - public void setProperty(String identifier, String className, String propertyName, String propertyValue) + public void setConnectorBindingProperty(String deployedName, String propertyName, String propertyValue) throws AdminException { - Properties properties = new Properties(); - properties.setProperty(propertyName, propertyValue); - - updateProperties(identifier, className, properties); - + try { + ConnectorBinding binding = getConfigurationService().getConnectorBinding(deployedName); + if (binding == null) { + throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.cb_doesnot_exist", deployedName)); //$NON-NLS-1$ + } + + ComponentTypeID id = binding.getComponentTypeID(); + ConnectorBindingType type = getConfigurationService().getConnectorType(id.getName()); + + boolean needsEncryption = isMaskedProperty(propertyName, type); + if (needsEncryption) { + propertyValue = encryptString(propertyValue); + } + + Properties p = new Properties(); + p.setProperty(propertyName, propertyValue); + + //update the configuration + binding = ConnectorConfigurationReader.addConnectorBindingProperties(binding, p); + getConfigurationService().updateConnectorBinding(binding); + } catch (MetaMatrixComponentException e) { + throw new AdminComponentException(e); + } } /** - * @see org.teiid.adminapi.ConfigurationAdmin#updateProperties(java.lang.String, java.lang.String, java.util.Properties) - * @since 4.3 - */ - public void updateProperties(String identifier, String className, Properties properties) throws AdminException { - - Collection adminObjects = getAdminObjects(identifier, className); - if (adminObjects == null || adminObjects.size() == 0) { - throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.No_Objects_Found", identifier, className)); //$NON-NLS-1$ - } - if (adminObjects.size() > 1) { - throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.Multiple_Objects_Found", identifier, className)); //$NON-NLS-1$ - } - AdminObject adminObject = (AdminObject) adminObjects.iterator().next(); - - - int typeCode = MMAdminObject.getObjectType(className); - switch(typeCode) { - - case MMAdminObject.OBJECT_TYPE_SYSTEM_OBJECT: - updateSystemProperties(properties); - break; - - case MMAdminObject.OBJECT_TYPE_CONNECTOR_BINDING: - try { - // there is lot of engineering under here.. - String bindingName = adminObject.getName(); - ConnectorBinding binding = getConfigurationService().getConnectorBinding(bindingName); - ComponentTypeID id = binding.getComponentTypeID(); - ConnectorBindingType type = getConfigurationService().getConnectorType(id.getName()); - - - //encrypt the properties - Properties encryptedProperties = new Properties(); - encryptedProperties.putAll(properties); - - for (Iterator iter = properties.keySet().iterator(); iter.hasNext(); ) { - String propertyName = (String) iter.next(); - boolean needsEncryption = isMaskedProperty(propertyName, type); - if (needsEncryption) { - String propertyValue = properties.getProperty(propertyName); - propertyValue = encryptString(propertyValue); - encryptedProperties.put(propertyName, propertyValue); - } - } - - //update the configuration - binding = ConnectorConfigurationReader.addConnectorBindingProperties(binding, encryptedProperties); - getConfigurationService().updateConnectorBinding(binding); - - } catch (MetaMatrixComponentException e) { - throw new AdminComponentException(e); - } - break; - - default: - throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.can_not_set_property")); //$NON-NLS-1$ - } - } - - /** * @see org.teiid.adminapi.ConfigurationAdmin#addConnectorType(java.lang.String, char[]) * @since 4.3 */ @@ -276,10 +199,12 @@ binding = ConnectorConfigurationReader.loadConnectorBinding(deployName, properties, ctype); // Check that the connector binding passwords can be decrypted - AdminStatus status = checkDecryption(binding, ctype); - if ( status.getCode() == AdminStatus.CODE_DECRYPTION_FAILED && - ! options.containsOption(AdminOptions.BINDINGS_IGNORE_DECRYPT_ERROR)) { - throw new AdminProcessingException(status.getCode(), status.getMessage()); + try { + checkDecryption(binding, ctype); + } catch(CryptoException e) { + if (!options.containsOption(AdminOptions.BINDINGS_IGNORE_DECRYPT_ERROR)) { + throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("AdminStatus.CODE_DECRYPTION_FAILED", binding.getFullName())); //$NON-NLS-1$ + } } // now that all of the input parameters validated, add the connector binding @@ -351,10 +276,12 @@ binding = ConnectorConfigurationReader.loadConnectorBinding(deployName, xmlFile); // Check that the connector binding passwords can be decrypted - AdminStatus status = checkDecryption(binding, type); - if ( status.getCode() == AdminStatus.CODE_DECRYPTION_FAILED && - ! options.containsOption(AdminOptions.BINDINGS_IGNORE_DECRYPT_ERROR)) { - throw new AdminProcessingException(status.getCode(), status.getMessage()); + try { + checkDecryption(binding, type); + } catch(CryptoException e) { + if (!options.containsOption(AdminOptions.BINDINGS_IGNORE_DECRYPT_ERROR)) { + throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("AdminStatus.CODE_DECRYPTION_FAILED", binding.getFullName())); //$NON-NLS-1$ + } } // now that all of the input parameters validated, add the connector binding @@ -526,11 +453,13 @@ ConnectorBindingType type = (ConnectorBindingType)def.getConnectorType(binding.getComponentTypeID().getName()); // Check that the connector binding passwords can be decrypted - AdminStatus status = checkDecryption(binding, type); - if ( status.getCode() == AdminStatus.CODE_DECRYPTION_FAILED && - ! options.containsOption(AdminOptions.BINDINGS_IGNORE_DECRYPT_ERROR)) { - throw new AdminProcessingException(status.getCode(), status.getMessage()); - } + try { + checkDecryption(binding, type); + } catch(CryptoException e) { + if (!options.containsOption(AdminOptions.BINDINGS_IGNORE_DECRYPT_ERROR)) { + throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("AdminStatus.CODE_DECRYPTION_FAILED", binding.getFullName())); //$NON-NLS-1$ + } + } } } @@ -540,21 +469,15 @@ * @return * @since 4.3 */ - private AdminStatus checkDecryption(ConnectorBinding binding, ConnectorBindingType type) { - - try { - Properties props = binding.getProperties(); - Iterator it = props.keySet().iterator(); - while (it.hasNext()) { - String name = (String)it.next(); - if (isMaskedProperty(name, type)) { - decryptProperty(props.getProperty(name)); - } + private void checkDecryption(ConnectorBinding binding, ConnectorBindingType type) throws CryptoException { + Properties props = binding.getProperties(); + Iterator it = props.keySet().iterator(); + while (it.hasNext()) { + String name = (String)it.next(); + if (isMaskedProperty(name, type)) { + decryptProperty(props.getProperty(name)); } - } catch (CryptoException e) { - return new MMAdminStatus(AdminStatus.CODE_DECRYPTION_FAILED, "AdminStatus.CODE_DECRYPTION_FAILED", binding.getFullName()); //$NON-NLS-1$ } - return new MMAdminStatus(AdminStatus.CODE_SUCCESS, "AdminStatus.CODE_SUCCESS"); //$NON-NLS-1$ } /** @@ -593,8 +516,12 @@ throws AdminException { return addVDB(deployName, vdbFile, null, options); } - + @Override + public void deleteVDB(String vdbName, String vdbVersion) throws AdminException { + super.changeVDBStatus(vdbName, vdbVersion, VDB.DELETED); + } + /** * @see org.teiid.adminapi.ConfigurationAdmin#addExtensionModule(java.lang.String, java.lang.String, byte[], java.lang.String) * @since 4.3 @@ -737,6 +664,20 @@ throws AdminException { LogManager.setLogConfiguration((com.metamatrix.common.log.LogConfiguration)convertToNativeObjects(config)); } + + /** + * @see com.metamatrix.admin.api.embedded.EmbeddedRuntimeStateAdmin#setLogListener(java.lang.Object) + * @since 4.3 + */ + public void setLogListener(EmbeddedLogger listener) + throws AdminException { + if(listener != null) { + LogManager.setLogListener(new DQPLogListener(listener)); + } + else { + throw new AdminProcessingException("Admin_invalid_log_listener"); //$NON-NLS-1$ + } + } /** * @see org.teiid.adminapi.ConfigurationAdmin#exportExtensionModule(java.lang.String) @@ -1065,7 +1006,7 @@ } } } - setSystemProperty(DQPEmbeddedProperties.COMMON_EXTENSION_CLASPATH, sb.toString()+commonpath); + getConfigurationService().setSystemProperty(DQPEmbeddedProperties.COMMON_EXTENSION_CLASPATH, sb.toString()+commonpath); // then update the properties Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java =================================================================== --- trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -33,18 +33,23 @@ import org.teiid.adminapi.AdminComponentException; import org.teiid.adminapi.AdminException; -import org.teiid.adminapi.AdminObject; import org.teiid.adminapi.AdminProcessingException; +import org.teiid.adminapi.Cache; import org.teiid.adminapi.ConnectionPool; import org.teiid.adminapi.ConnectorBinding; +import org.teiid.adminapi.ConnectorType; +import org.teiid.adminapi.ExtensionModule; import org.teiid.adminapi.MonitoringAdmin; import org.teiid.adminapi.ProcessObject; -import org.teiid.adminapi.SystemObject; +import org.teiid.adminapi.PropertyDefinition; +import org.teiid.adminapi.QueueWorkerPool; +import org.teiid.adminapi.Request; +import org.teiid.adminapi.Session; import org.teiid.adminapi.Transaction; +import org.teiid.adminapi.VDB; -import com.metamatrix.admin.objects.MMAdminObject; import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.common.config.api.ComponentType; +import com.metamatrix.common.config.api.ConnectorBindingType; import com.metamatrix.common.vdb.api.VDBArchive; import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; import com.metamatrix.dqp.service.TransactionService; @@ -66,7 +71,7 @@ * @see org.teiid.adminapi.MonitoringAdmin#getConnectorTypes(java.lang.String) * @since 4.3 */ - public Collection getConnectorTypes(String identifier) + public Collection<ConnectorType> getConnectorTypes(String identifier) throws AdminException { if (identifier == null || !identifier.matches(MULTIPLE_WORD_WILDCARD_REGEX)) { @@ -80,7 +85,7 @@ * @see org.teiid.adminapi.MonitoringAdmin#getVDBs(java.lang.String) * @since 4.3 */ - public Collection getVDBs(String identifier) + public Collection<VDB> getVDBs(String identifier) throws AdminException { if (identifier == null || !identifier.matches(VDB_REGEX)) { @@ -111,7 +116,7 @@ * @see org.teiid.adminapi.MonitoringAdmin#getConnectorBindings(java.lang.String) * @since 4.3 */ - public Collection getConnectorBindings(String identifier) + public Collection<ConnectorBinding> getConnectorBindings(String identifier) throws AdminException { if (identifier == null) { @@ -125,7 +130,7 @@ * @see org.teiid.adminapi.MonitoringAdmin#getConnectorBindingsInVDB(java.lang.String) * @since 4.3 */ - public Collection getConnectorBindingsInVDB(String identifier) throws AdminException{ + public Collection<ConnectorBinding> getConnectorBindingsInVDB(String identifier) throws AdminException{ Collection<VDBArchive> vdbs = null; HashMap bindings = new HashMap(); @@ -158,7 +163,7 @@ * @see org.teiid.adminapi.MonitoringAdmin#getExtensionModules(java.lang.String) * @since 4.3 */ - public Collection getExtensionModules(String identifier) + public Collection<ExtensionModule> getExtensionModules(String identifier) throws AdminException { if (identifier == null || !identifier.matches(WORD_AND_DOT_WILDCARD_REGEX)) { @@ -178,7 +183,7 @@ * @see org.teiid.adminapi.MonitoringAdmin#getQueueWorkerPools(java.lang.String) * @since 4.3 */ - public Collection getQueueWorkerPools(String identifier) + public Collection<QueueWorkerPool> getQueueWorkerPools(String identifier) throws AdminException { if (identifier == null || !identifier.matches(MULTIPLE_WORD_WILDCARD_REGEX)) { @@ -218,7 +223,7 @@ * @see org.teiid.adminapi.MonitoringAdmin#getCaches(java.lang.String) * @since 4.3 */ - public Collection getCaches(String identifier) + public Collection<Cache> getCaches(String identifier) throws AdminException { if (identifier == null || !identifier.matches(SINGLE_WORD_WILDCARD_REGEX)) { @@ -238,7 +243,7 @@ * @see org.teiid.adminapi.MonitoringAdmin#getSessions(java.lang.String) * @since 4.3 */ - public Collection getSessions(String identifier) + public Collection<Session> getSessions(String identifier) throws AdminException { if (identifier == null || !identifier.matches(NUMBER_REGEX)) { @@ -251,7 +256,7 @@ * @see org.teiid.adminapi.MonitoringAdmin#getRequests(java.lang.String) * @since 4.3 */ - public Collection getRequests(String identifier) + public Collection<Request> getRequests(String identifier) throws AdminException { if (identifier == null || !identifier.matches(NUMBER_DOT_REGEX)) { @@ -273,7 +278,7 @@ * @see org.teiid.adminapi.MonitoringAdmin#getSourceRequests(java.lang.String) * @since 4.3 */ - public Collection getSourceRequests(String identifier) + public Collection<Request> getSourceRequests(String identifier) throws AdminException { if (identifier == null || !identifier.matches(NUMBER_DOT_REGEX)) { @@ -289,64 +294,27 @@ } return matchedCollection(identifier, (List)convertToAdminObjects(atomicRequestList)); } - - - /** - * @see org.teiid.adminapi.MonitoringAdmin#getSystem() - * @since 4.3 - */ - public SystemObject getSystem(){ - return super.getSystem(); - } /** * @see org.teiid.adminapi.MonitoringAdmin#getPropertyDefinitions(java.lang.String, java.lang.String) * @since 4.3 */ - public Collection getPropertyDefinitions(String identifier, String className) throws AdminException { - Collection adminObjects = getAdminObjects(identifier, className); - if (adminObjects == null || adminObjects.size() == 0) { - throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.No_Objects_Found", identifier, className)); //$NON-NLS-1$ + public Collection<PropertyDefinition> getConnectorTypePropertyDefinitions(String typeName) throws AdminException { + + if (typeName == null || !typeName.matches(MULTIPLE_WORDS_REGEX)) { + throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.Invalid_ct_name")); //$NON-NLS-1$ } - if (adminObjects.size() > 1) { - throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.Multiple_Objects_Found", identifier, className)); //$NON-NLS-1$ - } - AdminObject adminObject = (AdminObject) adminObjects.iterator().next(); - - - try { - String objectIdentifier = adminObject.getIdentifier(); - ComponentType ctype = null; - - int type = MMAdminObject.getObjectType(className); - switch(type) { - - case MMAdminObject.OBJECT_TYPE_SYSTEM_OBJECT: - Properties properties = getConfigurationService().getSystemProperties(); - return convertPropertyDefinitions(properties); - - case MMAdminObject.OBJECT_TYPE_CONNECTOR_BINDING: - String ctypeName = ((ConnectorBinding) adminObject).getConnectorTypeName(); - ctype = getConfigurationService().getSystemConfiguration().getComponentType(ctypeName); - - //reload the properties so they are not stale - ConnectorBinding binding = (ConnectorBinding) getConnectorBindings(objectIdentifier).iterator().next(); - - return convertPropertyDefinitions(ctype, binding.getProperties()); - - case MMAdminObject.OBJECT_TYPE_CONNECTOR_TYPE: - ctype = getConfigurationService().getSystemConfiguration().getComponentType(adminObject.getName()); - - return convertPropertyDefinitions(ctype, new Properties()); - - default: - throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.Unsupported_Object_Class", className)); //$NON-NLS-1$ - - } - - } catch (MetaMatrixComponentException e) { - throw new AdminComponentException(e); - } + + try { + ConnectorBindingType type = getConfigurationService().getConnectorType(typeName); + if (type == null) { + throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.ct_doesnot_exist", typeName)); //$NON-NLS-1$ + } + + return convertPropertyDefinitions(type, new Properties()); + } catch (MetaMatrixComponentException e) { + throw new AdminComponentException(e); + } } @Override Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPRuntimeStateAdminImpl.java =================================================================== --- trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPRuntimeStateAdminImpl.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPRuntimeStateAdminImpl.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -281,40 +281,10 @@ */ public void changeVDBStatus(String name, String version, int status) throws AdminException { - try { - - if (name == null || version == null || !name.matches(SINGLE_WORD_REGEX)) { - throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.Invalid_vdb_name")); //$NON-NLS-1$ - } - - // Now change the VDB status it self - this.getVDBService().changeVDBStatus(name, version, status); - - // If the VDB is modified and if its status changed to DELETED, then - // we can remove all the connector bindings associated with this VDB - // the above delete will also remove them - } catch (ApplicationLifecycleException e) { - throw new AdminComponentException(e); - } catch (MetaMatrixComponentException e) { - throw new AdminComponentException(e); - } + super.changeVDBStatus(name, version, status); } - - /** - * @see com.metamatrix.admin.api.embedded.EmbeddedRuntimeStateAdmin#setLogListener(java.lang.Object) - * @since 4.3 - */ - public void setLogListener(EmbeddedLogger listener) - throws AdminException { - if(listener != null) { - LogManager.setLogListener(new DQPLogListener(listener)); - } - else { - throw new AdminProcessingException("Admin_invalid_log_listener"); //$NON-NLS-1$ - } - } - + @Override public void terminateTransaction(String transactionId, String sessionId) throws AdminException { Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPSecurityAdminImpl.java =================================================================== --- trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPSecurityAdminImpl.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPSecurityAdminImpl.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -38,7 +38,6 @@ import org.teiid.adminapi.AdminOptions; import org.teiid.adminapi.AdminProcessingException; import org.teiid.adminapi.Group; -import org.teiid.adminapi.Principal; import org.teiid.adminapi.SecurityAdmin; import org.xml.sax.SAXException; @@ -56,8 +55,8 @@ import com.metamatrix.platform.security.api.AuthorizationPolicyFactory; import com.metamatrix.platform.security.api.AuthorizationRealm; import com.metamatrix.platform.security.api.Credentials; +import com.metamatrix.platform.security.api.MetaMatrixPrincipal; import com.metamatrix.platform.security.api.MetaMatrixPrincipalName; -import com.metamatrix.platform.security.api.SessionToken; /** @@ -167,7 +166,7 @@ } Collection roleNames = null; try { - roleNames = getAuthorizationService().getRoleNamesForPrincipal(new MetaMatrixPrincipalName(groupIdentifier, Principal.TYPE_GROUP)); + roleNames = getAuthorizationService().getRoleNamesForPrincipal(new MetaMatrixPrincipalName(groupIdentifier, MetaMatrixPrincipal.TYPE_GROUP)); } catch (InvalidSessionException e) { throw new AdminComponentException(e); } catch (AuthorizationMgmtException e) { Modified: trunk/runtime/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java =================================================================== --- trunk/runtime/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/runtime/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -389,6 +389,7 @@ process.setFreeMemory(rt.freeMemory()); process.setTotalMemory(rt.totalMemory()); process.setProperties(PropertiesUtils.clone(props)); + process.setStartTime(new Date(this.starttime)); if (this.socketTransport != null) { SocketListenerStats socketStats = this.socketTransport.getStats(); Modified: trunk/runtime/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties =================================================================== --- trunk/runtime/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/runtime/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties 2009-08-28 22:27:14 UTC (rev 1291) @@ -193,6 +193,8 @@ 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} DQPEmbeddedManager.start_dqp=Teiid is started at time = {0} DQPEmbeddedManager.shutdown_dqp=Teiid is shutdown at time = {0} Copied: trunk/server/src/main/java/com/metamatrix/admin/api/AdminStatus.java (from rev 1279, trunk/client/src/main/java/org/teiid/adminapi/AdminStatus.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/api/AdminStatus.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/admin/api/AdminStatus.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -0,0 +1,68 @@ +/* + * 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 com.metamatrix.admin.api; + + +/** + * Base interface of admin status objects. + * Status objects are returned by some admin methods to indicate warnings or additional information, + * that doesn't belong in an Exception. + * + * @since 4.3 + */ +public interface AdminStatus { + + + /** + * Status code indicating an unknown status + */ + public final static int CODE_UNKNOWN = -1; + /** + * Status code indicating that the operation succeeded. + */ + public final static int CODE_SUCCESS = 0; + + /** + * Warning status code indicating that an object could not be decrypted. + */ + public final static int CODE_DECRYPTION_FAILED = -101; + + + + + /** + * Get the status code. + * This will be one of the status codes specified by the constants <code>AdminStatus.CODE_*</code>. + * @return String the unique Identifier + * @since 4.3 + */ + int getCode(); + + /** + * Get the status message. + * @return String Name + * @since 4.3 + */ + String getMessage(); + +} Copied: trunk/server/src/main/java/com/metamatrix/admin/api/DQP.java (from rev 1279, trunk/client/src/main/java/org/teiid/adminapi/DQP.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/api/DQP.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/admin/api/DQP.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -0,0 +1,90 @@ +/* + * 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 com.metamatrix.admin.api; + +import java.util.Date; + +import org.teiid.adminapi.AdminObject; + +/** + * The distributed query processor, which is the internal query engine component used by MetaMatrix products. + * + * @since 4.3 + */ +public interface DQP extends + AdminObject { + + + /**Registered by not initialized*/ + public static final int STATE_NOT_INITIALIZED = 0; + /**Open and running*/ + public static final int STATE_OPEN = 1; + /**Registered but closed*/ + public static final int STATE_CLOSED = 2; + /**Failed after running successfully*/ + public static final int STATE_FAILED = 3; + /**Failed during initialization*/ + public static final int STATE_INIT_FAILED = 4; + /**Not registered*/ + public static final int STATE_NOT_REGISTERED = 5; + /**Running, but the underlying data source is unavailable*/ + public static final int STATE_DATA_SOURCE_UNAVAILABLE = 6; + /**Running, not deployed*/ + public static final int STATE_NOT_DEPLOYED = 7; + + /** + * Retrieve the current connector state. This will be one of the constants: + * {@link DQP#STATE_OPEN DQP.STATE_OPEN}. + * {@link DQP#STATE_NOT_INITIALIZED DQP.STATE_NOT_INITIALIZED}. + * {@link DQP#STATE_CLOSED DQP.STATE_CLOSED}. + * {@link DQP#STATE_FAILED DQP.STATE_FAILED}. + * {@link DQP#STATE_INIT_FAILED DQP.STATE_INIT_FAILED}. + * {@link DQP#STATE_NOT_REGISTERED DQP.STATE_NOT_REGISTERED}. + * {@link DQP#STATE_DATA_SOURCE_UNAVAILABLE DQP.STATE_DATA_SOURCE_UNAVAILABLE}. + * {@link DQP#STATE_NOT_DEPLOYED DQP.STATE_NOT_DEPLOYED}. + * @return current connector state. + */ + int getState(); + + /** + * Retrieve the current connector state. + * + * @return current connector state. + */ + String getStateAsString(); + + /** + * Retrieve time of last state change. + * + * @return time of last state change. + * @since 4.3 + */ + Date getStateChangedTime(); + + /** + * Returns the description. + * + * @return description + */ + public String getDescription(); +} Copied: trunk/server/src/main/java/com/metamatrix/admin/api/Host.java (from rev 1279, trunk/client/src/main/java/org/teiid/adminapi/Host.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/api/Host.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/admin/api/Host.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -0,0 +1,77 @@ +/* + * 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 com.metamatrix.admin.api; + +import org.teiid.adminapi.AdminObject; + + + +/** + * Represents a host in the MetaMatrix system. + * + * The identifier pattern for a host is <code>"hostName"</code>. + * A hostName is considered to be unique across the system. + * @since 4.3 + */ +public interface Host extends AdminObject { + + /** + * Install Directory Property + */ + public static final String INSTALL_DIR = "metamatrix.installationDir"; //$NON-NLS-1$ + + /** + * Log Directory Property + */ + public static final String LOG_DIRECTORY = "metamatrix.log.dir"; //$NON-NLS-1$ + + /** + * Host Directory Property + */ + public static final String HOST_DIRECTORY = "metamatrix.host.dir"; //$NON-NLS-1$ + + /** + * Host Enabled Property + */ + public static final String HOST_ENABLED = "host.enabled"; //$NON-NLS-1$ + + /** + * Host Bind Address Property + */ + public static final String HOST_BIND_ADDRESS = "metamatrix.host.bind.address"; //$NON-NLS-1$ + + /** + * Host Physical Address Property + */ + public static final String HOST_PHYSICAL_ADDRESS = "metamatrix.host.physical.address"; //$NON-NLS-1$ + + + /** + * Return true if this Host is executing. + * + * @return if this Host is actively participating + * in the MetaMatrix system. + * @since 4.3 + */ + public boolean isRunning(); +} Copied: trunk/server/src/main/java/com/metamatrix/admin/api/Principal.java (from rev 1279, trunk/client/src/main/java/org/teiid/adminapi/Principal.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/api/Principal.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/admin/api/Principal.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -0,0 +1,70 @@ +/* + * 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 com.metamatrix.admin.api; + +import org.teiid.adminapi.AdminObject; + + +/** + * A Principal may participate in entitlements (authorization). A Principal + * may also posess administrative roles for the system. + * + * The identifier pattern for all principal types is <code>"name"</code>. + * A name is concidered to be unique across the system for all + * principal types. + * @since 4.3 + */ +public interface Principal extends AdminObject { + + /** User internal type. Note that a User can be of type Admin and vice versa. */ + static final int TYPE_USER = 0; + /** Group internal type */ + static final int TYPE_GROUP = 1; + /** Admin internal type. Note that a User can be of type Admin and vice versa. */ + static final int TYPE_ADMIN = 2; + + /** Display String for User type */ + static final String TYPE_LABEL_USER = "User"; //$NON-NLS-1$ + /** Display String for Group type */ + static final String TYPE_LABEL_GROUP = "Group"; //$NON-NLS-1$ + /** Display String for Admin type */ + static final String TYPE_LABEL_ADMIN = "Admin"; //$NON-NLS-1$ + + /** User and Group names can be no longer then this */ + static final int NAME_LEN_LIMIT = 32; + + /** + * Get the Principal type for this principal. + * @return the internal type of this user. + * @since 4.3 + */ + int getType(); + + /** + * Get the Principal type String for this principal. + * @return the String representation type of this user. + * @since 4.3 + */ + String getTypeLabel(); + +} Copied: trunk/server/src/main/java/com/metamatrix/admin/api/Resource.java (from rev 1279, trunk/client/src/main/java/org/teiid/adminapi/Resource.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/api/Resource.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/admin/api/Resource.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -0,0 +1,38 @@ +/* + * 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 com.metamatrix.admin.api; + +import org.teiid.adminapi.AdminObject; + + +/** + * @since 4.3 + */ +public interface Resource extends AdminObject { + + /** + * The environment property that indicates the name of the pool. + */ + public static final String RESOURCE_POOL = "metamatrix.common.pooling.resource.name"; //$NON-NLS-1$ + +} Copied: trunk/server/src/main/java/com/metamatrix/admin/api/ScriptsContainer.java (from rev 1279, trunk/client/src/main/java/org/teiid/adminapi/ScriptsContainer.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/api/ScriptsContainer.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/admin/api/ScriptsContainer.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -0,0 +1,72 @@ +/* + * 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 com.metamatrix.admin.api; + +import java.io.Serializable; +import java.util.Collection; + +import org.teiid.adminapi.AdminException; +import org.teiid.adminapi.AdminOptions; +import org.teiid.adminapi.AdminOptions.OnConflict; + + + + +/** + * Contains all information nessecary to save the scripts that will be run + * by a MetaMatrix utility to load or refresh the data resident in a + * Materialized View. + * + * Users can get the contents of each file and save each with the + * filename associated with it or, more easily, users can save all files + * to a local folder. (See {@link #saveAllToDirectory}) + * + * @since 4.3 + */ +public interface ScriptsContainer extends Serializable { + + /** + * Get the file names of all scripts in this container. + * + * @return The <code>Collection</code> of <code>String</code> + * file names of all scripts in this container. This + * collection may be empty if an error has occured. + * @since 4.3 + */ + Collection getFileNames(); + + /** + * Save all of the scripts contained to the specified local + * directory. + * + * @param directoryLocation the directory location to save + * the contained scripts. Must be accessable from where + * this code is running. + * @param options Specify whether to {@link AdminOptions.OnConflict#OVERWRITE} + * or {@link AdminOptions.OnConflict#EXCEPTION} (default) when script files + * exist in the <code>directoryLocation</code>. + * @throws AdminException if there's an error saving the files. + * @since 4.3 + */ + void saveAllToDirectory(String directoryLocation, AdminOptions options) throws AdminException; +} Copied: trunk/server/src/main/java/com/metamatrix/admin/api/Service.java (from rev 1279, trunk/client/src/main/java/org/teiid/adminapi/Service.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/api/Service.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/admin/api/Service.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -0,0 +1,100 @@ +/* + * 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 com.metamatrix.admin.api; + +import java.util.Date; + +import org.teiid.adminapi.AdminObject; + +/** + * Represents a service in the MetaMatrix system. + * + * The unique identifier pattern is [host]<{@link #DELIMITER}>[process]<{@link #DELIMITER}>[Service Name] + * when running against a MetaMatrix server. The [Service Name] can itself have spaces in the name. + * In the case of the MM Query, a Service does not apply as MM Query is not running within a MM Server VM. + * + * @since 4.3 + */ +public interface Service extends + AdminObject { + /**Registered by not initialized*/ + public static final int STATE_NOT_INITIALIZED = 0; + /**Open and running*/ + public static final int STATE_OPEN = 1; + /**Registered but closed*/ + public static final int STATE_CLOSED = 2; + /**Failed after running successfully*/ + public static final int STATE_FAILED = 3; + /**Failed during initialization*/ + public static final int STATE_INIT_FAILED = 4; + /**Not registered*/ + public static final int STATE_NOT_REGISTERED = 5; + /**Running, but the underlying data source is unavailable*/ + public static final int STATE_DATA_SOURCE_UNAVAILABLE = 6; + /**Running, not deployed*/ + public static final int STATE_NOT_DEPLOYED = 7; + + /** + * Retrieve the current connector state. This will be one of the constants: + * {@link DQP#STATE_OPEN DQP.STATE_OPEN}. + * {@link DQP#STATE_NOT_INITIALIZED DQP.STATE_NOT_INITIALIZED}. + * {@link DQP#STATE_CLOSED DQP.STATE_CLOSED}. + * {@link DQP#STATE_FAILED DQP.STATE_FAILED}. + * {@link DQP#STATE_INIT_FAILED DQP.STATE_INIT_FAILED}. + * {@link DQP#STATE_NOT_REGISTERED DQP.STATE_NOT_REGISTERED}. + * {@link DQP#STATE_DATA_SOURCE_UNAVAILABLE DQP.STATE_DATA_SOURCE_UNAVAILABLE}. + * {@link DQP#STATE_NOT_DEPLOYED DQP.STATE_NOT_DEPLOYED}. + * @return current connector state. + */ + int getState(); + + /** + * Retrieve the current connector state as a printable <code>String</code>. + * @return current connector state in String form. + */ + String getStateAsString(); + + /** + * Returns time of last state change. + * + * @return time of last state change. + * @since 4.3 + */ + Date getStateChangedTime(); + + /** + * Returns the description + * + * @return description + */ + String getDescription(); + + /** + * Get the component type identifier for this service {@link ComponentType}. + * @return the Component Type identifier which can be used to + * find the ComponentType. + * @since 6.1 + */ + String getComponentTypeName(); + +} Property changes on: trunk/server/src/main/java/com/metamatrix/admin/api/Service.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/server/src/main/java/com/metamatrix/admin/api/SystemObject.java (from rev 1279, trunk/client/src/main/java/org/teiid/adminapi/SystemObject.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/api/SystemObject.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/admin/api/SystemObject.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -0,0 +1,52 @@ +/* + * 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 com.metamatrix.admin.api; + +import java.util.Date; + +import org.teiid.adminapi.AdminObject; + + +/** + * @since 4.3 + */ +public interface SystemObject extends AdminObject { + + /** + * @return Returns whether the system is started. + * @since 4.3 + */ + public boolean isStarted(); + + + + /** + * @return Returns the startTime. + * @since 4.3 + */ + public Date getStartTime(); + + + + +} Modified: trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerConfigAdmin.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerConfigAdmin.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerConfigAdmin.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -28,10 +28,10 @@ import org.teiid.adminapi.AdminRoles; import org.teiid.adminapi.ConfigurationAdmin; import org.teiid.adminapi.ConnectorBinding; -import org.teiid.adminapi.ScriptsContainer; import org.teiid.adminapi.VDB; import com.metamatrix.admin.RolesAllowed; +import com.metamatrix.admin.api.ScriptsContainer; /** @@ -72,7 +72,7 @@ * Add a Host with Properties to MetaMatrix System * * @param hostIdentifier - * Name of {@link org.teiid.adminapi.Host Host} to add + * Name of {@link com.metamatrix.admin.api.Host Host} to add * @param properties * name,value * @throws AdminException Modified: trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerMonitoringAdmin.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerMonitoringAdmin.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerMonitoringAdmin.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -44,10 +44,10 @@ /** * Get the hosts that correspond to the specified identifier pattern. * - * @param hostIdentifier the unique identifier for for a {@link org.teiid.adminapi.Host Host} + * @param hostIdentifier the unique identifier for for a {@link com.metamatrix.admin.api.Host Host} * in the system or "{@link org.teiid.adminapi.AdminObject#WILDCARD WILDCARD}" * if all hosts are desired. - * @return Collection of {@link org.teiid.adminapi.Host Host} + * @return Collection of {@link com.metamatrix.admin.api.Host Host} * @throws AdminException if there's a system error. * @since 4.3 */ @@ -71,10 +71,10 @@ * Get the Services that correspond to the specified identifer pattern. * These services represent what is defined for a given {@link Host} | {@link Process}; * - * @param resourceIdentifier the unique identifier for for a {@link org.teiid.adminapi.Service Service} + * @param resourceIdentifier the unique identifier for for a {@link com.metamatrix.admin.api.Service Service} * in the system or "{@link org.teiid.adminapi.AdminObject#WILDCARD WILDCARD}" * if all Services are desired. - * @return Collection of {@link org.teiid.adminapi.Service Service} + * @return Collection of {@link com.metamatrix.admin.api.Service Service} * @throws AdminException if there's a system error. * @since 6.1 */ @@ -85,22 +85,22 @@ /** * Get the Resources that correspond to the specified identifer pattern. * - * @param resourceIdentifier the unique resourceIdentifier for for a {@link org.teiid.adminapi.Resource Resource} + * @param resourceIdentifier the unique resourceIdentifier for for a {@link com.metamatrix.admin.api.Resource Resource} * in the system or "{@link org.teiid.adminapi.AdminObject#WILDCARD WILDCARD}" * if all Resources are desired. - * @return Collection of {@link org.teiid.adminapi.Resource Resource} + * @return Collection of {@link com.metamatrix.admin.api.Resource Resource} * @throws AdminException if there's a system error. * @since 4.3 */ Collection getResources(String resourceIdentifier) throws AdminException; /** - * Get the {@link org.teiid.adminapi.DQP DQP}s that correspond to the specified identifer pattern. + * Get the {@link com.metamatrix.admin.api.DQP DQP}s that correspond to the specified identifer pattern. * - * @param identifier the unique identifier for for a {@link org.teiid.adminapi.DQP DQP} + * @param identifier the unique identifier for for a {@link com.metamatrix.admin.api.DQP DQP} * in the system or "{@link org.teiid.adminapi.AdminObject#WILDCARD WILDCARD}" * if all Resources are desired. - * @return Collection of {@link org.teiid.adminapi.DQP DQP} + * @return Collection of {@link com.metamatrix.admin.api.DQP DQP} * @throws AdminException if there's a system error. * @since 4.3 */ Modified: trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerRuntimeStateAdmin.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerRuntimeStateAdmin.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerRuntimeStateAdmin.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -72,7 +72,7 @@ /** * Start the Host for this cluster - * @param hostIdentifier the unique identifier for for a {@link org.teiid.adminapi.Host Host} + * @param hostIdentifier the unique identifier for for a {@link com.metamatrix.admin.api.Host Host} * in the system. * @param waitUntilDone If true, this method waits until the operation is finished before returning. * This may take a long time to complete. If false, this method returns immediately, even though the operation @@ -84,7 +84,7 @@ /** * Stop the Host for this cluster - * @param hostIdentifier the unique identifier for for a {@link org.teiid.adminapi.Host Host} + * @param hostIdentifier the unique identifier for for a {@link com.metamatrix.admin.api.Host Host} * in the system. * @param stopNow If true, stop the host forcefully. If false, wait until any pending work is done. * @param waitUntilDone If true, this method waits until the operation is finished before returning. Modified: trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerSecurityAdmin.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerSecurityAdmin.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerSecurityAdmin.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -31,11 +31,11 @@ import org.teiid.adminapi.AdminOptions; import org.teiid.adminapi.AdminRoles; import org.teiid.adminapi.Group; -import org.teiid.adminapi.Principal; import org.teiid.adminapi.Role; import org.teiid.adminapi.SecurityAdmin; import com.metamatrix.admin.RolesAllowed; +import com.metamatrix.admin.api.Principal; /** Copied: trunk/server/src/main/java/com/metamatrix/admin/objects/MMAdminStatus.java (from rev 1279, trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminStatus.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/objects/MMAdminStatus.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/admin/objects/MMAdminStatus.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -0,0 +1,111 @@ +/* + * 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 com.metamatrix.admin.objects; + +import java.io.Serializable; + + +import com.metamatrix.admin.AdminPlugin; +import com.metamatrix.admin.api.AdminStatus; + + +/** + * Simple Implementation of MMStatus. + * @since 4.3 + */ +public class MMAdminStatus implements AdminStatus, Serializable { + private static final long serialVersionUID = -3111591335358837218L; + private int code = AdminStatus.CODE_UNKNOWN; + private String message = null; + + + /** + * Construct a new MMAdminStatus + * @param code + * @param messageKey Key of the status message in i18n.properties. + * @since 4.3 + */ + public MMAdminStatus(int code, String messageKey) { + this.code = code; + + this.message = AdminPlugin.Util.getString(messageKey); + } + + /** + * Construct a new MMAdminStatus + * @param code + * @param messageKey Key of the status message in i18n.properties. + * @param value Value to substitute into the internationalized message. + * @since 4.3 + */ + public MMAdminStatus(int code, String messageKey, Object value) { + this.code = code; + + this.message = AdminPlugin.Util.getString(messageKey, value); + } + + /** + * Construct a new MMAdminStatus + * @param code + * @param messageKey Key of the status message in i18n.properties. + * @param values Values to substitute into the internationalized message. + * @since 4.3 + */ + public MMAdminStatus(int code, String messageKey, Object[] values) { + this.code = code; + + this.message = AdminPlugin.Util.getString(messageKey, values); + } + + + + /** + * @see com.metamatrix.admin.api.AdminStatus#getCode() + * @since 4.3 + */ + public int getCode() { + return code; + } + + /** + * @see com.metamatrix.admin.api.AdminStatus#getMessage() + * @since 4.3 + */ + public String getMessage() { + return message; + } + + + /** + * @see java.lang.Object#toString() + * @since 4.3 + */ + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(AdminPlugin.Util.getString("MMAdminStatus.MMAdminStatus")); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMAdminStatus.Code")).append(getCode()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMAdminStatus.Message")).append(getMessage()); //$NON-NLS-1$ + return result.toString(); + } + +} Copied: trunk/server/src/main/java/com/metamatrix/admin/objects/MMDQP.java (from rev 1279, trunk/client/src/main/java/com/metamatrix/admin/objects/MMDQP.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/objects/MMDQP.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/admin/objects/MMDQP.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -0,0 +1,201 @@ +/* + * 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 com.metamatrix.admin.objects; + +import java.util.Date; + + +import com.metamatrix.admin.AdminPlugin; +import com.metamatrix.admin.api.DQP; + + +/** + * A Connector Binding is a Connector Type with properties that have been + * bond to a Connector. + * + * May are may not be assigned to a VDB + */ +public class MMDQP extends MMAdminObject implements DQP { + + private static final long serialVersionUID = -3212002022690786890L; + private String description = ""; //$NON-NLS-1$ + private int currentState; + private Date stateChangedTime; + private long serviceID = -1; + + + /** + * Constructor. + * @param identifierParts + * @since 4.3 + */ + public MMDQP(String[] identifierParts) { + super(identifierParts); + + } + + + + + /** + * @see java.lang.Object#toString() + */ + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(AdminPlugin.Util.getString("MMDQP.MMDQP")).append(getIdentifier()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMDQP.Description")).append(description); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMDQP.Created")).append(getCreatedDate()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMDQP.Created_By")).append(getCreatedBy()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMDQP.Updated")).append(getLastChangedDate()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMDQP.Updated_By")).append(getLastChangedBy()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMDQP.State")).append(getStateAsString()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMDQP.IsRegistered")).append(isRegistered()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMDQP.State_Changed")).append(getStateChangedTime()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMDQP.Properties")).append(getPropertiesAsString()); //$NON-NLS-1$ + return result.toString(); + } + + + + /** + * Returns the description + * @return description + */ + public String getDescription() { + return description; + } + + /** + * Set the description + * @param description + */ + public void setDescription(String description) { + this.description = description; + } + + + + /** + * @return Returns the currentState as int. + * @since 4.3 + */ + public int getState() { + return currentState; + } + + + /** + * @return Returns the currentState as String. + * @since 4.3 + */ + public String getStateAsString() { + switch (currentState) { + case STATE_OPEN: + return AdminPlugin.Util.getString("MMDQP.open"); //$NON-NLS-1$ + case STATE_CLOSED: + return AdminPlugin.Util.getString("MMDQP.closed"); //$NON-NLS-1$ + case STATE_FAILED: + return AdminPlugin.Util.getString("MMDQP.failed"); //$NON-NLS-1$ + case STATE_INIT_FAILED: + return AdminPlugin.Util.getString("MMDQP.initializationFailed"); //$NON-NLS-1$ + case STATE_NOT_INITIALIZED: + return AdminPlugin.Util.getString("MMDQP.notInitialized"); //$NON-NLS-1$ + case STATE_NOT_REGISTERED: + return AdminPlugin.Util.getString("MMDQP.notRegistered"); //$NON-NLS-1$ + case STATE_DATA_SOURCE_UNAVAILABLE: + return AdminPlugin.Util.getString("MMDQP.dataSourceUnavailable"); //$NON-NLS-1$ + default: + return AdminPlugin.Util.getString("MMDQP.unknown"); //$NON-NLS-1$ + } + } + + /** + * Set the state + * @param state + * @since 4.3 + */ + public void setState(int state) { + this.currentState = state; + } + + + /** + * @return Returns time of last state change. + * @since 4.3 + */ + public Date getStateChangedTime() { + return stateChangedTime; + } + + /** + * Set the state changed time + * @param stateChangedTime + * @since 4.3 + */ + public void setStateChangedTime(Date stateChangedTime) { + this.stateChangedTime = stateChangedTime; + + //check on what states mean "registered" + setRegistered(currentState==STATE_OPEN || currentState==STATE_FAILED || currentState==STATE_DATA_SOURCE_UNAVAILABLE); + } + + + + /** + * @return Returns the serviceID. + * @since 4.3 + */ + public long getServiceID() { + return this.serviceID; + } + + /** + * @param serviceID The serviceID to set. + * @since 4.3 + */ + public void setServiceID(long serviceID) { + this.serviceID = serviceID; + } + + + + /** + * @return Returns the processID. + * @since 4.3 + */ + public String getProcessName() { + return this.identifierParts[1]; + } + + /** + * @return Returns the hostName. + * @since 4.3 + */ + public String getHostName() { + return identifierParts[0]; + } + + + + +} \ No newline at end of file Copied: trunk/server/src/main/java/com/metamatrix/admin/objects/MMHost.java (from rev 1279, trunk/client/src/main/java/com/metamatrix/admin/objects/MMHost.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/objects/MMHost.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/admin/objects/MMHost.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -0,0 +1,91 @@ +/* + * 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 com.metamatrix.admin.objects; + + +import com.metamatrix.admin.AdminPlugin; +import com.metamatrix.admin.api.Host; + + +/** + * Simple Host object for the Admin API as represented in the Configuration + */ +public final class MMHost extends MMAdminObject implements Host { + + private static final long serialVersionUID = -779866213549875450L; + private boolean running = false; + + + + /** + * Constructor for creating a MMHost + * + * @param identifierParts of the Host + */ + public MMHost(String[] identifierParts) { + super(identifierParts); + } + + + + /** + * Create a String for this MMHost + * + * @see java.lang.Object#toString() + * @since 4.3 + */ + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(AdminPlugin.Util.getString("MMHost.MMHost")).append(getName()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMHost.Properties")).append(getPropertiesAsString()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMHost.Created")).append(getCreatedDate()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMHost.Created_By")).append(getCreatedBy()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMHost.Updated")).append(getLastChangedDate()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMHost.Updated_By")).append(getLastChangedBy()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMHost.IsRunning")).append(isRegistered()); //$NON-NLS-1$ + return result.toString(); + } + + + + /** + * Return true if this Host is running + * @return if this Host is running + * @since 4.3 + */ + public boolean isRunning() { + return running; + } + + /** + * Set if this Host has been deployed and is executing + * @param running + * @since 4.3 + */ + public void setRunning(boolean running) { + this.running = running; + } + + + +} \ No newline at end of file Copied: trunk/server/src/main/java/com/metamatrix/admin/objects/MMPrincipal.java (from rev 1279, trunk/client/src/main/java/com/metamatrix/admin/objects/MMPrincipal.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/objects/MMPrincipal.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/admin/objects/MMPrincipal.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -0,0 +1,99 @@ +/* + * 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 com.metamatrix.admin.objects; + +import com.metamatrix.admin.api.Principal; +import com.metamatrix.admin.server.AbstractAdminImpl; + + +/** + * @since 4.3 + */ +public class MMPrincipal extends MMAdminObject implements Principal { + + private static final long serialVersionUID = -1383265398519744688L; + + private static final String[] TYPE_NAMES = new String[] { TYPE_LABEL_USER, TYPE_LABEL_GROUP, TYPE_LABEL_ADMIN }; + + private int type; + + /** + * Ctor + * @param principalName The name of the {@link Principal}. + * @param type The value of the {@link Principal}. + * @since 4.3 + */ + public MMPrincipal(String[] principalName, int type) { + super(principalName); + this.type = type; + } + + /** + * @see com.metamatrix.admin.objects.MMAdminObject#toString() + * @since 4.3 + */ + public String toString() { + StringBuffer sb = new StringBuffer(); + sb.append("[Name=\""); //$NON-NLS-1$ + sb.append(this.getName()); + sb.append("\" - Type=\""); //$NON-NLS-1$ + sb.append( TYPE_NAMES[this.type] ); + sb.append("\"]"); //$NON-NLS-1$ + return sb.toString(); + } + + /** + * @see com.metamatrix.admin.api.Principal#getType() + * @since 4.3 + */ + public int getType() { + return type; + } + + /** + * @see com.metamatrix.admin.api.Principal#getTypeLabel() + * @since 4.3 + */ + public String getTypeLabel() { + return TYPE_NAMES[this.type]; + } + + /** + * Determine whether the given <code>className</code> + * is either of {@link #TYPE_USER} or {@link #TYPE_GROUP}. + * @param className the className in question. + * @return <code>true</code> iff the given type represents + * one or the other; User or Group. + * @since 4.3 + */ + public static boolean isUserOrGroup(String className) { + try { + int type = AbstractAdminImpl.getObjectType(className); + return (type == AbstractAdminImpl.OBJECT_TYPE_GROUP); + } catch (Exception e) { + return false; + } + + } + +} Copied: trunk/server/src/main/java/com/metamatrix/admin/objects/MMResource.java (from rev 1279, trunk/client/src/main/java/com/metamatrix/admin/objects/MMResource.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/objects/MMResource.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/admin/objects/MMResource.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -0,0 +1,84 @@ +/* + * 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 com.metamatrix.admin.objects; + + +import com.metamatrix.admin.AdminPlugin; +import com.metamatrix.admin.api.Resource; + +/** + * Dataholder for a resource. + */ +public class MMResource extends MMAdminObject implements Resource { + + private static final long serialVersionUID = -8732882869479091774L; + private String resourceType; + + /** + * Constructor + * @param identifierParts of the resource + */ + public MMResource(String[] identifierParts) { + super(identifierParts); + } + + + /** + * @see java.lang.Object#toString() + */ + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(AdminPlugin.Util.getString("MMResource.MMResource")).append(getIdentifier()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMResource.Type")).append(resourceType); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMResource.Created")).append(getCreatedDate()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMResource.Created_By")).append(getCreatedBy()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMResource.Updated")).append(getLastChangedDate()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMResource.Updated_By")).append(getLastChangedBy()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMResource.Properties")).append(getPropertiesAsString()); //$NON-NLS-1$ + return result.toString(); + } + + + + /** + * Get the Resource Type for this Resource + * @return Returns the String value of the Resource Type for this Resouce. + * @since 4.3 + */ + public String getResourceType() { + return this.resourceType; + } + + + + /** + * Set the Resource Type + * @param resourceType The Resource Type to set. + * @since 4.3 + */ + public void setResourceType(String resourceType) { + this.resourceType = resourceType; + } + + +} Copied: trunk/server/src/main/java/com/metamatrix/admin/objects/MMScriptsContainer.java (from rev 1279, trunk/client/src/main/java/com/metamatrix/admin/objects/MMScriptsContainer.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/objects/MMScriptsContainer.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/admin/objects/MMScriptsContainer.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -0,0 +1,145 @@ +/* + * 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 com.metamatrix.admin.objects; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import org.teiid.adminapi.AdminComponentException; +import org.teiid.adminapi.AdminException; +import org.teiid.adminapi.AdminOptions; +import org.teiid.adminapi.AdminProcessingException; + +import com.metamatrix.admin.AdminPlugin; +import com.metamatrix.admin.api.ScriptsContainer; +import com.metamatrix.core.util.FileUtils; + + +/** + * @since 4.3 + */ +public class MMScriptsContainer implements + ScriptsContainer { + + private static final long serialVersionUID = 1262888652939367623L; + // <String> fileName => <byte[]> file contents + private Map fileMap; + + /** + * + * @since 4.3 + */ + public MMScriptsContainer() { + super(); + fileMap = new HashMap(10); + } + + /** + * @see com.metamatrix.admin.api.ScriptsContainer#getFileNames() + * @since 4.3 + */ + public Collection getFileNames() { + return new ArrayList(this.fileMap.keySet()); + } + + /** + * @see com.metamatrix.admin.api.ScriptsContainer#saveAllToDirectory(java.lang.String, AdminOptions) + * @since 4.3 + */ + public void saveAllToDirectory(String directoryLocation, AdminOptions options) throws AdminException { + String fileSeparator = File.separator; + String path = (directoryLocation.endsWith(fileSeparator) ? directoryLocation : directoryLocation + fileSeparator); + + // Check that the directory exists and is writable + File directory = new File(path); + if ( ! directory.isDirectory() ) { + Object[] params = new Object[] {directoryLocation}; + throw new AdminProcessingException(AdminPlugin.Util.getString("MMScriptsContainer.unable_to_locate_directory", params)); //$NON-NLS-1$ + } + if ( ! directory.canWrite() ) { + Object[] params = new Object[] {directoryLocation}; + throw new AdminProcessingException(AdminPlugin.Util.getString("MMScriptsContainer.unable_to_write_to_directory", params)); //$NON-NLS-1$ + } + + // First check that we will not overwrite any of the files + Collection existingFiles = null; + for ( Iterator fileItr = fileMap.keySet().iterator(); fileItr.hasNext();) { + String fileName = path + (String) fileItr.next(); + File aFile = new File(fileName); + + if ( aFile.exists() ) { + if ( existingFiles == null ) { + existingFiles = new ArrayList(); + } + existingFiles.add(fileName); + } + } + if ( existingFiles != null && (options == null || options.containsOption(AdminOptions.OnConflict.EXCEPTION)) ) { + Object[] params = new Object[] {existingFiles.toString()}; + throw new AdminProcessingException(AdminPlugin.Util.getString("MMScriptsContainer.files_exist", params)); //$NON-NLS-1$ + } + + if ( existingFiles == null || options.containsOption(AdminOptions.OnConflict.OVERWRITE) ) { + // Now write each file + for (Iterator fileItr = fileMap.keySet().iterator(); fileItr.hasNext();) { + String fileName = (String)fileItr.next(); + File target = new File(path + fileName); + + try { + target.createNewFile(); + byte[] fileContents = (byte[])fileMap.get(fileName); + FileUtils.write(fileContents, target); + } catch (IOException err) { + throw new AdminProcessingException(AdminPlugin.Util.getString("MMScriptsContainer.error_writing_file", fileName), err); //$NON-NLS-1$ + } + } + } // if + } + + +//================================================================================================= +// SETTERS ARE NOT IN THE PUBLIIC INTERFACE +//================================================================================================= + + /** + * Add file contents by name. + * + * @param fileName - required + * @param fileContents - required + * @throws AdminComponentException if one of the required args are null or empty. + */ + public void addFile(String fileName, byte[] fileContents) throws AdminComponentException { + if ( fileName == null || fileName.length() == 0 ) { + throw new AdminComponentException(AdminPlugin.Util.getString("MMScriptsContainer.fileName_was_null")); //$NON-NLS-1$ + } + if ( fileContents == null || fileContents.length == 0 ) { + throw new AdminComponentException(AdminPlugin.Util.getString("MMScriptsContainer.fileContents_was_null")); //$NON-NLS-1$ + } + this.fileMap.put(fileName, fileContents); + } +} Copied: trunk/server/src/main/java/com/metamatrix/admin/objects/MMService.java (from rev 1279, trunk/client/src/main/java/com/metamatrix/admin/objects/MMService.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/objects/MMService.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/admin/objects/MMService.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -0,0 +1,209 @@ +/* + * 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 com.metamatrix.admin.objects; + +import java.util.Date; + + +import com.metamatrix.admin.AdminPlugin; +import com.metamatrix.admin.api.Service; + + +/** + * A Service + * + */ +public class MMService extends MMAdminObject implements Service { + + private static final long serialVersionUID = -338643922496948824L; + private String description = ""; //$NON-NLS-1$ + private String componentTypeName = ""; //$NON-NLS-1$ + private int currentState; + private Date stateChangedTime; + private long serviceID = -1; + + + /** + * Constructor. + * @param identifierParts + * @since 6.1 + */ + public MMService(String[] identifierParts) { + super(identifierParts); + } + + + + + + /** + * @see java.lang.Object#toString() + */ + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(AdminPlugin.Util.getString("MMService.MMService")).append(getIdentifier()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMService.Description")).append(description); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMService.Created")).append(getCreatedDate()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMService.Created_By")).append(getCreatedBy()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMService.Updated")).append(getLastChangedDate()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMService.Updated_By")).append(getLastChangedBy()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMService.State")).append(getState()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMService.State_Changed")).append(getStateChangedTime()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMService.IsRegistered")).append(isRegistered()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMService.Properties")).append(getPropertiesAsString()); //$NON-NLS-1$ + return result.toString(); + } + + + + /** + * Returns the description + * @return description + */ + public String getDescription() { + return description; + } + + /** + * Set the description + * @param description + */ + public void setDescription(String description) { + this.description = description; + } + + + /** + * @return the current state of this connector binding. + */ + public int getState() { + return this.currentState; + } + + /** + * @return Returns the currentState as String. + * @since 6.1 + */ + public String getStateAsString() { + switch (currentState) { + case STATE_OPEN: + return AdminPlugin.Util.getString("MMService.open"); //$NON-NLS-1$ + case STATE_CLOSED: + return AdminPlugin.Util.getString("MMService.closed"); //$NON-NLS-1$ + case STATE_FAILED: + return AdminPlugin.Util.getString("MMService.failed"); //$NON-NLS-1$ + case STATE_INIT_FAILED: + return AdminPlugin.Util.getString("MMService.initializationFailed"); //$NON-NLS-1$ + case STATE_NOT_INITIALIZED: + return AdminPlugin.Util.getString("MMService.notInitialized"); //$NON-NLS-1$ + case STATE_NOT_REGISTERED: + return AdminPlugin.Util.getString("MMService.notRegistered"); //$NON-NLS-1$ + case STATE_DATA_SOURCE_UNAVAILABLE: + return AdminPlugin.Util.getString("MMService.dataSourceUnavailable"); //$NON-NLS-1$ + default: + return AdminPlugin.Util.getString("MMService.unknown"); //$NON-NLS-1$ + } + } + + /** + * Set the state + * @param state + * @since 6.1 + */ + public void setState(int state) { + this.currentState = state; + + //check on what states mean "registered" + setRegistered(currentState==STATE_OPEN || currentState==STATE_FAILED || currentState==STATE_DATA_SOURCE_UNAVAILABLE); + } + + + /** + * @return Returns time of last state change. + * @since 6.1 + */ + public Date getStateChangedTime() { + return stateChangedTime; + } + + /** + * Set the state changed time + * @param stateChangedTime + * @since 6.1 + */ + public void setStateChangedTime(Date stateChangedTime) { + this.stateChangedTime = stateChangedTime; + } + + + /** + * @return Returns the serviceID. + * @since 6.1 + */ + public long getServiceID() { + return this.serviceID; + } + + /** + * @param serviceID The serviceID to set. + * @since 6.1 + */ + public void setServiceID(long serviceID) { + this.serviceID = serviceID; + } + + + /** + * @return Returns the processID. + * @since 6.1 + */ + public String getProcessName() { + return identifierParts[1]; + } + + + /** + * @return Returns the hostName. + * @since 6.1 + */ + public String getHostName() { + return identifierParts[0]; + } + + + /** + * @param connectorTypeName the identifier for a connector type + * @since 6.1 + */ + public void setComponentTypeName(String componentTypeName) { + this.componentTypeName = componentTypeName; + } + + /** + * @see com.metamatrix.admin.api.Service#getComponentTypeName() + * @since 6.1 + */ + public String getComponentTypeName() { + return this.componentTypeName; + } +} \ No newline at end of file Property changes on: trunk/server/src/main/java/com/metamatrix/admin/objects/MMService.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/server/src/main/java/com/metamatrix/admin/objects/MMSystem.java (from rev 1279, trunk/client/src/main/java/com/metamatrix/admin/objects/MMSystem.java) =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/objects/MMSystem.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/admin/objects/MMSystem.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -0,0 +1,119 @@ +/* + * 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 com.metamatrix.admin.objects; + +import java.util.Date; + + +import com.metamatrix.admin.AdminPlugin; +import com.metamatrix.admin.api.SystemObject; +import com.metamatrix.core.util.DateUtil; + +/** + * Dataholder for information about the system at-large + */ +public class MMSystem extends MMAdminObject implements SystemObject { + + private static final long serialVersionUID = 7913646658641775637L; + Date startTime; + boolean isStarted; + + + /**Dummy identifier for the system as a whole.*/ + private final static String SYSTEM_IDENTIFIER = "SYSTEM"; //$NON-NLS-1$ + + /** + * Construct a new MMSystem object + * + * @since 4.3 + */ + public MMSystem() { + super(new String[] {SYSTEM_IDENTIFIER}); + } + + + + + /** + * @return Returns whether the system is started. + * @since 4.3 + */ + public boolean isStarted() { + return this.isStarted; + } + + /** + * @param isStarted whether the system is started. + * @since 4.3 + */ + public void setStarted(boolean isStarted) { + this.isStarted = isStarted; + } + + + + + /** + * @return Returns the startTime. + * @since 4.3 + */ + public Date getStartTime() { + return this.startTime; + } + + + /** + * @param startTime The startTime to set. + * @since 4.3 + */ + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + /** + * Get The Start Date as a String + * @return String + * @since 4.3 + */ + public String getStartDateAsString() { + if( this.startTime != null) + return DateUtil.getDateAsString(getStartTime()); + return "Start Date not Set"; //$NON-NLS-1$ + } + + + /** + * @see java.lang.Object#toString() + */ + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(AdminPlugin.Util.getString("MMSystem.MMSystem")).append(getIdentifier()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMSystem.properties")).append(getPropertiesAsString()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMSystem.isStarted")).append(isStarted()); //$NON-NLS-1$ + result.append(AdminPlugin.Util.getString("MMSystem.startTime")).append(getStartDateAsString()); //$NON-NLS-1$ + return result.toString(); + } + + +} + Modified: trunk/server/src/main/java/com/metamatrix/admin/server/AbstractAdminImpl.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/server/AbstractAdminImpl.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/server/src/main/java/com/metamatrix/admin/server/AbstractAdminImpl.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -41,10 +41,13 @@ import org.teiid.adminapi.AdminObject; import org.teiid.adminapi.AdminOptions; import org.teiid.adminapi.AdminProcessingException; +import org.teiid.adminapi.ConnectionPool; +import org.teiid.adminapi.Transaction; import org.teiid.adminapi.VDB; import org.teiid.dqp.internal.process.DQPWorkContext; import org.xml.sax.SAXException; +import com.metamatrix.admin.AdminPlugin; import com.metamatrix.admin.api.exception.security.InvalidSessionException; import com.metamatrix.admin.objects.MMAdminObject; import com.metamatrix.admin.objects.MMConnectorBinding; @@ -92,7 +95,69 @@ /** * @since 4.3 */ -public class AbstractAdminImpl { +public class AbstractAdminImpl { + + /**Package containing the sub-interfaces of AdminObjects*/ + public static final String OBJECTS_PACKAGE = "com.metamatrix.admin.api.objects."; //$NON-NLS-1$ + + + + /**Object type code for Cache*/ + public static final int OBJECT_TYPE_CACHE = 0; + /**Object type code for ConnectorBinding*/ + public static final int OBJECT_TYPE_CONNECTOR_BINDING = 2; + /**Object type code for ConnectorType*/ + public static final int OBJECT_TYPE_CONNECTOR_TYPE = 3; + /**Object type code for ExtensionModule*/ + public static final int OBJECT_TYPE_EXTENSION_MODULE = 6; + /**Object type code for Group*/ + public static final int OBJECT_TYPE_GROUP = 7; + /**Object type code for LogConfiguration*/ + public static final int OBJECT_TYPE_LOG_CONFIGURATION = 9; + /**Object type code for Model*/ + public static final int OBJECT_TYPE_MODEL = 10; + /**Object type code for ProcessObject*/ + public static final int OBJECT_TYPE_PROCESS_OBJECT = 11; + /**Object type code for PropertyDefinition*/ + public static final int OBJECT_TYPE_PROPERTY_DEFINITION = 12; + /**Object type code for QueueWorkerPool*/ + public static final int OBJECT_TYPE_QUEUE_WORKER_POOL = 13; + /**Object type code for Request*/ + public static final int OBJECT_TYPE_REQUEST = 14; + /**Object type code for Role*/ + public static final int OBJECT_TYPE_ROLE = 16; + /**Object type code for Session*/ + public static final int OBJECT_TYPE_SESSION = 17; + /**Object type code for VDB*/ + public static final int OBJECT_TYPE_VDB = 21; + /**Object type code for TRANSACTION*/ + public static final int OBJECT_TYPE_TRANSACTION = 22; + /**Object type code for CONNECTION_POOL*/ + public static final int OBJECT_TYPE_CONNECTION_POOL = 23; + + + //map of String (class name) to Integer (object type code) + private static HashMap objectTypeMap = new HashMap(); + + + static { + objectTypeMap.put(org.teiid.adminapi.Cache.class.getName(), new Integer(OBJECT_TYPE_CACHE)); + objectTypeMap.put(org.teiid.adminapi.ConnectorBinding.class.getName(), new Integer(OBJECT_TYPE_CONNECTOR_BINDING)); + objectTypeMap.put(org.teiid.adminapi.ConnectorType.class.getName(), new Integer(OBJECT_TYPE_CONNECTOR_TYPE)); + objectTypeMap.put(org.teiid.adminapi.ExtensionModule.class.getName(), new Integer(OBJECT_TYPE_EXTENSION_MODULE)); + objectTypeMap.put(org.teiid.adminapi.Group.class.getName(), new Integer(OBJECT_TYPE_GROUP)); + objectTypeMap.put(org.teiid.adminapi.LogConfiguration.class.getName(), new Integer(OBJECT_TYPE_LOG_CONFIGURATION)); + objectTypeMap.put(org.teiid.adminapi.Model.class.getName(), new Integer(OBJECT_TYPE_MODEL)); + objectTypeMap.put(org.teiid.adminapi.ProcessObject.class.getName(), new Integer(OBJECT_TYPE_PROCESS_OBJECT)); + objectTypeMap.put(org.teiid.adminapi.PropertyDefinition.class.getName(), new Integer(OBJECT_TYPE_PROPERTY_DEFINITION)); + objectTypeMap.put(org.teiid.adminapi.QueueWorkerPool.class.getName(), new Integer(OBJECT_TYPE_QUEUE_WORKER_POOL)); + objectTypeMap.put(org.teiid.adminapi.Request.class.getName(), new Integer(OBJECT_TYPE_REQUEST)); + objectTypeMap.put(org.teiid.adminapi.Role.class.getName(), new Integer(OBJECT_TYPE_ROLE)); + objectTypeMap.put(org.teiid.adminapi.Session.class.getName(), new Integer(OBJECT_TYPE_SESSION)); + objectTypeMap.put(org.teiid.adminapi.VDB.class.getName(), new Integer(OBJECT_TYPE_VDB)); + objectTypeMap.put(Transaction.class.getName(), Integer.valueOf(OBJECT_TYPE_TRANSACTION)); + objectTypeMap.put(ConnectionPool.class.getName(), Integer.valueOf(OBJECT_TYPE_CONNECTION_POOL)); + } private static final String DOUBLE_ESCAPED_DELIMITER = "\\" + AdminObject.ESCAPED_DELIMITER; //$NON-NLS-1$ @@ -501,54 +566,54 @@ */ protected Collection getAdminObjects(String identifier, String className) throws AdminException { - int code = MMAdminObject.getObjectType(className); + int code = AbstractAdminImpl.getObjectType(className); ArrayList list = null; switch(code) { - case MMAdminObject.OBJECT_TYPE_CACHE: + case AbstractAdminImpl.OBJECT_TYPE_CACHE: return parent.getCaches(identifier); - case MMAdminObject.OBJECT_TYPE_CONNECTOR_BINDING: + case AbstractAdminImpl.OBJECT_TYPE_CONNECTOR_BINDING: return parent.getConnectorBindings(identifier); - case MMAdminObject.OBJECT_TYPE_CONNECTOR_TYPE: + case AbstractAdminImpl.OBJECT_TYPE_CONNECTOR_TYPE: return parent.getConnectorTypes(identifier); - case MMAdminObject.OBJECT_TYPE_DQP: - return parent.getDQPs(identifier); - case MMAdminObject.OBJECT_TYPE_EXTENSION_MODULE: +// case MMAdminObject.OBJECT_TYPE_DQP: +// return parent.getDQPs(identifier); + case AbstractAdminImpl.OBJECT_TYPE_EXTENSION_MODULE: return parent.getExtensionModules(identifier); - case MMAdminObject.OBJECT_TYPE_GROUP: + case AbstractAdminImpl.OBJECT_TYPE_GROUP: return parent.getGroups(identifier); - case MMAdminObject.OBJECT_TYPE_HOST: - return parent.getHosts(identifier); - case MMAdminObject.OBJECT_TYPE_LOG_CONFIGURATION: +// case MMAdminObject.OBJECT_TYPE_HOST: +// return parent.getHosts(identifier); + case AbstractAdminImpl.OBJECT_TYPE_LOG_CONFIGURATION: list = new ArrayList(); list.add(parent.getLogConfiguration()); return list; - case MMAdminObject.OBJECT_TYPE_PROCESS_OBJECT: + case AbstractAdminImpl.OBJECT_TYPE_PROCESS_OBJECT: return parent.getProcesses(identifier); - case MMAdminObject.OBJECT_TYPE_QUEUE_WORKER_POOL: + case AbstractAdminImpl.OBJECT_TYPE_QUEUE_WORKER_POOL: return parent.getQueueWorkerPools(identifier); - case MMAdminObject.OBJECT_TYPE_REQUEST: + case AbstractAdminImpl.OBJECT_TYPE_REQUEST: return parent.getRequests(identifier); - case MMAdminObject.OBJECT_TYPE_SERVICE: - return parent.getServices(identifier); - case MMAdminObject.OBJECT_TYPE_RESOURCE: - return parent.getResources(identifier); - case MMAdminObject.OBJECT_TYPE_SESSION: +// case MMAdminObject.OBJECT_TYPE_SERVICE: +// return parent.getServices(identifier); +// case MMAdminObject.OBJECT_TYPE_RESOURCE: +// return parent.getResources(identifier); + case AbstractAdminImpl.OBJECT_TYPE_SESSION: return parent.getSessions(identifier); - case MMAdminObject.OBJECT_TYPE_SYSTEM_OBJECT: - list = new ArrayList(); - list.add(parent.getSystem()); - return list; - case MMAdminObject.OBJECT_TYPE_VDB: +// case MMAdminObject.OBJECT_TYPE_SYSTEM_OBJECT: +// list = new ArrayList(); +// list.add(parent.getSystem()); +// return list; + case AbstractAdminImpl.OBJECT_TYPE_VDB: return parent.getVDBs(identifier); - case MMAdminObject.OBJECT_TYPE_TRANSACTION: + case AbstractAdminImpl.OBJECT_TYPE_TRANSACTION: return parent.getTransactions(); - case MMAdminObject.OBJECT_TYPE_CONNECTION_POOL: + case AbstractAdminImpl.OBJECT_TYPE_CONNECTION_POOL: return parent.getConnectionPoolStats(identifier); - case MMAdminObject.OBJECT_TYPE_ENTITLEMENT: - case MMAdminObject.OBJECT_TYPE_MODEL: - case MMAdminObject.OBJECT_TYPE_PROPERTY_DEFINITION: - case MMAdminObject.OBJECT_TYPE_ROLE: + // case MMAdminObject.OBJECT_TYPE_ENTITLEMENT: + case AbstractAdminImpl.OBJECT_TYPE_MODEL: + case AbstractAdminImpl.OBJECT_TYPE_PROPERTY_DEFINITION: + case AbstractAdminImpl.OBJECT_TYPE_ROLE: default: throwProcessingException("AbstractAdminImpl.Unsupported_Admin_Object", new Object[] {className}); //$NON-NLS-1$ @@ -608,5 +673,28 @@ } catch (IOException e) { throw new AdminComponentException(e); } + } + + /** + * Get the object type code for the specified classname. + * @param className This may be fully qualified or not, e.g. + * "com.metamatrix.admin.api.objects.ConnectorBinding" or "ConnectorBinding". + * @return Object type code. The will be one of the constants AdminObject.OBJECT_TYPE_xxx. + * @throws AdminException + * @since 4.3 + */ + public static int getObjectType(String className) throws AdminException { + //convert to the fully qualified className + if (className.indexOf(".") == -1) { //$NON-NLS-1$ + className = OBJECTS_PACKAGE + className; + } + + Integer codeInteger = (Integer) objectTypeMap.get(className); + if (codeInteger == null) { + String message = AdminPlugin.Util.getString("MMAdminObject.Unsupported_Admin_Object", new Object[] {className}); //$NON-NLS-1$ + throw new AdminProcessingException(message); + } + + return codeInteger.intValue(); } } Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -36,11 +36,12 @@ import org.teiid.adminapi.EmbeddedLogger; import org.teiid.adminapi.Group; import org.teiid.adminapi.LogConfiguration; -import org.teiid.adminapi.ScriptsContainer; -import org.teiid.adminapi.SystemObject; +import org.teiid.adminapi.PropertyDefinition; import org.teiid.adminapi.Transaction; import org.teiid.adminapi.VDB; +import com.metamatrix.admin.api.ScriptsContainer; +import com.metamatrix.admin.api.SystemObject; import com.metamatrix.admin.api.server.ServerAdmin; import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.MetaMatrixProcessingException; @@ -1020,4 +1021,19 @@ public void shutdown(int millisToWait) throws AdminException { } + @Override + public void deleteVDB(String vdbName, String version) throws AdminException { + } + + @Override + public void setConnectorBindingProperty(String deployedName, + String propertyName, String propertyValue) throws AdminException { + } + + @Override + public Collection<PropertyDefinition> getConnectorTypePropertyDefinitions( + String connectorTypeIdentifier) throws AdminException { + return null; + } + } \ No newline at end of file Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerConfigAdminImpl.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/server/ServerConfigAdminImpl.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerConfigAdminImpl.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -45,14 +45,15 @@ import org.teiid.adminapi.AdminObject; import org.teiid.adminapi.AdminOptions; import org.teiid.adminapi.AdminProcessingException; -import org.teiid.adminapi.AdminStatus; +import org.teiid.adminapi.EmbeddedLogger; import org.teiid.adminapi.LogConfiguration; import org.teiid.adminapi.ProcessObject; -import org.teiid.adminapi.ScriptsContainer; -import org.teiid.adminapi.SystemObject; import org.teiid.adminapi.VDB; import com.metamatrix.admin.AdminPlugin; +import com.metamatrix.admin.api.AdminStatus; +import com.metamatrix.admin.api.ScriptsContainer; +import com.metamatrix.admin.api.SystemObject; import com.metamatrix.admin.api.exception.security.InvalidSessionException; import com.metamatrix.admin.api.server.ServerConfigAdmin; import com.metamatrix.admin.objects.MMAdminObject; @@ -800,11 +801,11 @@ String mmHost = null; String mmPort = null; Collection hosts = parent.getHosts(AdminObject.WILDCARD); - org.teiid.adminapi.Host aHost = (org.teiid.adminapi.Host) hosts.iterator().next(); + com.metamatrix.admin.api.Host aHost = (com.metamatrix.admin.api.Host) hosts.iterator().next(); mmHost = aHost.getName(); Collection hostProcesses = parent.getProcesses(aHost.getIdentifier() + AdminObject.DELIMITER + AdminObject.WILDCARD); ProcessObject hostProcess = (ProcessObject) hostProcesses.iterator().next(); - mmPort = hostProcess.getPropertyValue(ProcessObject.SERVER_PORT); + mmPort = hostProcess.getPropertyValue(VMComponentDefnType.SERVER_PORT); //boolean useSSL = SSLConfiguration.isSSLEnabled(); boolean useSSL = false; @@ -1469,7 +1470,7 @@ /** - * Supported classes are {@link org.teiid.adminapi.Host}, {@link org.teiid.adminapi.ConnectorBinding}, + * Supported classes are {@link com.metamatrix.admin.api.Host}, {@link org.teiid.adminapi.ConnectorBinding}, * {@link SystemObject}, {@link ProcessObject} * @see com.metamatrix.admin.api.server.ServerConfigAdmin#setProperty(java.lang.String, java.lang.String, java.lang.String) * @since 4.3 @@ -1488,7 +1489,7 @@ /** - * Supported classes are {@link org.teiid.adminapi.ConnectorBinding}, {@link org.teiid.adminapi.Service}, + * Supported classes are {@link org.teiid.adminapi.ConnectorBinding}, {@link com.metamatrix.admin.api.Service}, * {@link SystemObject}, {@link ProcessObject} * @see org.teiid.adminapi.ConfigurationAdmin#updateProperties(java.lang.String, java.lang.String, java.util.Properties) * @since 4.3 @@ -1498,7 +1499,7 @@ Properties properties) throws AdminException { int nodeCount = getNodeCount(identifier); - int type = MMAdminObject.getObjectType(className); + int type = AbstractAdminImpl.getObjectType(className); AdminObject adminObject = null; String hostName; @@ -1506,15 +1507,15 @@ switch (type) { - case MMAdminObject.OBJECT_TYPE_SYSTEM_OBJECT: - this.updateSystemProperties(properties); - break; +// case MMAdminObject.OBJECT_TYPE_SYSTEM_OBJECT: +// this.updateSystemProperties(properties); +// break; - case MMAdminObject.OBJECT_TYPE_PROCESS_OBJECT: + case AbstractAdminImpl.OBJECT_TYPE_PROCESS_OBJECT: adminObject = getAdminObject(identifier, className); ProcessObject process = (ProcessObject)adminObject; String processName = adminObject.getName(); - hostName = process.getHostIdentifier(); + hostName = process.getHostName(); try { VMComponentDefn vmDefn = getVMByName(hostName, processName); Properties processProperties = vmDefn.getProperties(); @@ -1536,7 +1537,7 @@ break; - case MMAdminObject.OBJECT_TYPE_CONNECTOR_BINDING: + case AbstractAdminImpl.OBJECT_TYPE_CONNECTOR_BINDING: String connectorBindingName; if (nodeCount > 1) { adminObject = getAdminObject(identifier, className); @@ -1576,7 +1577,7 @@ throw new AdminComponentException(e); } break; - + /* case MMAdminObject.OBJECT_TYPE_SERVICE: String serviceName; if (nodeCount > 1) { @@ -1628,8 +1629,8 @@ e.printStackTrace(); } break; + */ - default: throwProcessingException("ServerConfigAdminImpl.Unsupported_Admin_Object", new Object[] {className}); //$NON-NLS-1$ } @@ -2380,5 +2381,21 @@ public void extensionModuleModified(String name) throws AdminException { } + + @Override + public void deleteVDB(String vdbName, String version) throws AdminException { + + } + + @Override + public void setConnectorBindingProperty(String deployedName, + String propertyName, String propertyValue) throws AdminException { + + } + + @Override + public void setLogListener(EmbeddedLogger listener) throws AdminException { + + } } \ No newline at end of file Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -46,12 +46,13 @@ import org.teiid.adminapi.AdminObject; import org.teiid.adminapi.AdminProcessingException; import org.teiid.adminapi.Model; -import org.teiid.adminapi.Service; +import org.teiid.adminapi.PropertyDefinition; import org.teiid.adminapi.Session; -import org.teiid.adminapi.SystemObject; import org.teiid.adminapi.Transaction; import org.teiid.adminapi.VDB; +import com.metamatrix.admin.api.Service; +import com.metamatrix.admin.api.SystemObject; import com.metamatrix.admin.api.server.ServerMonitoringAdmin; import com.metamatrix.admin.objects.MMAdminObject; import com.metamatrix.admin.objects.MMConnectionPool; @@ -1206,18 +1207,18 @@ String objectIdentifier = adminObject.getIdentifier(); Configuration config; - int type = MMAdminObject.getObjectType(className); + int type = AbstractAdminImpl.getObjectType(className); switch (type) { - case MMAdminObject.OBJECT_TYPE_SYSTEM_OBJECT: - return convertPropertyDefinitions(getConfigurationServiceProxy().getCurrentConfiguration()); +// case MMAdminObject.OBJECT_TYPE_SYSTEM_OBJECT: +// return convertPropertyDefinitions(getConfigurationServiceProxy().getCurrentConfiguration()); - case MMAdminObject.OBJECT_TYPE_HOST: - return convertPropertyDefinitions(getHostComponent(objectIdentifier)); +// case MMAdminObject.OBJECT_TYPE_HOST: +// return convertPropertyDefinitions(getHostComponent(objectIdentifier)); - case MMAdminObject.OBJECT_TYPE_PROCESS_OBJECT: + case AbstractAdminImpl.OBJECT_TYPE_PROCESS_OBJECT: return convertPropertyDefinitions(getProcessComponent(objectIdentifier)); - case MMAdminObject.OBJECT_TYPE_CONNECTOR_BINDING: + case AbstractAdminImpl.OBJECT_TYPE_CONNECTOR_BINDING: config = getConfigurationServiceProxy().getCurrentConfiguration(); ConnectorBinding configBinding = config.getConnectorBinding(MMAdminObject.getNameFromIdentifier(objectIdentifier)); @@ -1225,27 +1226,27 @@ return convertPropertyDefinitions(component, configBinding.getProperties()); - case MMAdminObject.OBJECT_TYPE_SERVICE: - config = getConfigurationServiceProxy().getCurrentConfiguration(); - ServiceComponentDefn svc = config.getServiceComponentDefn(MMAdminObject.getNameFromIdentifier(objectIdentifier)); - - component = getDeployedComponent(objectIdentifier); - - return convertPropertyDefinitions(component, svc.getProperties()); +// case MMAdminObject.OBJECT_TYPE_SERVICE: +// config = getConfigurationServiceProxy().getCurrentConfiguration(); +// ServiceComponentDefn svc = config.getServiceComponentDefn(MMAdminObject.getNameFromIdentifier(objectIdentifier)); +// +// component = getDeployedComponent(objectIdentifier); +// +// return convertPropertyDefinitions(component, svc.getProperties()); - case MMAdminObject.OBJECT_TYPE_CONNECTOR_TYPE: + case AbstractAdminImpl.OBJECT_TYPE_CONNECTOR_TYPE: ComponentType componentType = getConnectorTypeComponentType(objectIdentifier); return convertPropertyDefinitions(componentType, new Properties()); - case MMAdminObject.OBJECT_TYPE_DQP: - config = getConfigurationServiceProxy().getCurrentConfiguration(); - ServiceComponentDefn defn = config.getServiceComponentDefn(MMAdminObject.getNameFromIdentifier(objectIdentifier)); +// case MMAdminObject.OBJECT_TYPE_DQP: +// config = getConfigurationServiceProxy().getCurrentConfiguration(); +// ServiceComponentDefn defn = config.getServiceComponentDefn(MMAdminObject.getNameFromIdentifier(objectIdentifier)); +// +// return convertPropertyDefinitions(getDQPComponent(objectIdentifier), defn.getProperties()); - return convertPropertyDefinitions(getDQPComponent(objectIdentifier), defn.getProperties()); - - case MMAdminObject.OBJECT_TYPE_RESOURCE: - return convertPropertyDefinitions(getResourceComponent(objectIdentifier)); +// case MMAdminObject.OBJECT_TYPE_RESOURCE: +// return convertPropertyDefinitions(getResourceComponent(objectIdentifier)); default: throwProcessingException("ServerMonitoringAdminImpl.Unsupported_Admin_Object", new Object[] {className}); //$NON-NLS-1$ @@ -1405,5 +1406,11 @@ throws AdminException { return getQueryServiceProxy().getTransactions(); } + + @Override + public Collection<PropertyDefinition> getConnectorTypePropertyDefinitions( + String connectorTypeIdentifier) throws AdminException { + return null; + } } \ No newline at end of file Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerRuntimeStateAdminImpl.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/server/ServerRuntimeStateAdminImpl.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerRuntimeStateAdminImpl.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -362,7 +362,7 @@ if (waitUntilDone) { boolean done = false; while (! done) { - done = isProcessStopped(process.getName(), process.getHostName()); + done = isProcessStopped(process.getName(), process.getProcessName()); try { Thread.sleep(ServerAdminImpl.SERVICE_WAIT_INTERVAL); } catch (InterruptedException e) { @@ -746,10 +746,6 @@ } @Override - public void setLogListener(EmbeddedLogger listener) throws AdminException { - } - - @Override public void bounceSystem(boolean waitUntilDone) throws AdminException { } Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerSecurityAdminImpl.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/server/ServerSecurityAdminImpl.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerSecurityAdminImpl.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -36,8 +36,8 @@ import org.teiid.adminapi.AdminProcessingException; import org.teiid.adminapi.AdminRoles; import org.teiid.adminapi.Group; -import org.teiid.adminapi.Principal; +import com.metamatrix.admin.api.Principal; import com.metamatrix.admin.api.exception.security.InvalidSessionException; import com.metamatrix.admin.api.exception.security.MetaMatrixSecurityException; import com.metamatrix.admin.api.server.ServerSecurityAdmin; Modified: trunk/server/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/server/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -323,11 +323,11 @@ BasicHost host = new BasicHost(new ConfigurationID(name), new HostID(name), Host.HOST_COMPONENT_TYPE_ID); Properties props = new Properties(); - props.setProperty(org.teiid.adminapi.Host.INSTALL_DIR, getBootStrapProperties().getProperty(org.teiid.adminapi.Host.INSTALL_DIR, System.getProperty("user.dir"))); //$NON-NLS-1$ - props.setProperty(org.teiid.adminapi.Host.HOST_DIRECTORY, getBootStrapProperties().getProperty(org.teiid.adminapi.Host.HOST_DIRECTORY, System.getProperty("user.dir"))); //$NON-NLS-1$ - props.setProperty(org.teiid.adminapi.Host.LOG_DIRECTORY, getBootStrapProperties().getProperty(org.teiid.adminapi.Host.LOG_DIRECTORY, System.getProperty("user.dir"))); //$NON-NLS-1$ - props.setProperty(org.teiid.adminapi.Host.HOST_BIND_ADDRESS, getBootStrapProperties().getProperty(org.teiid.adminapi.Host.HOST_BIND_ADDRESS, "")); //$NON-NLS-1$ - props.setProperty(org.teiid.adminapi.Host.HOST_PHYSICAL_ADDRESS, getBootStrapProperties().getProperty(org.teiid.adminapi.Host.HOST_PHYSICAL_ADDRESS, "")); //$NON-NLS-1$ + props.setProperty(com.metamatrix.admin.api.Host.INSTALL_DIR, getBootStrapProperties().getProperty(com.metamatrix.admin.api.Host.INSTALL_DIR, System.getProperty("user.dir"))); //$NON-NLS-1$ + props.setProperty(com.metamatrix.admin.api.Host.HOST_DIRECTORY, getBootStrapProperties().getProperty(com.metamatrix.admin.api.Host.HOST_DIRECTORY, System.getProperty("user.dir"))); //$NON-NLS-1$ + props.setProperty(com.metamatrix.admin.api.Host.LOG_DIRECTORY, getBootStrapProperties().getProperty(com.metamatrix.admin.api.Host.LOG_DIRECTORY, System.getProperty("user.dir"))); //$NON-NLS-1$ + props.setProperty(com.metamatrix.admin.api.Host.HOST_BIND_ADDRESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.Host.HOST_BIND_ADDRESS, "")); //$NON-NLS-1$ + props.setProperty(com.metamatrix.admin.api.Host.HOST_PHYSICAL_ADDRESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.Host.HOST_PHYSICAL_ADDRESS, "")); //$NON-NLS-1$ host.setProperties(props); return host; Modified: trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java =================================================================== --- trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -33,12 +33,12 @@ import org.teiid.adminapi.AdminOptions; import org.teiid.adminapi.AdminProcessingException; import org.teiid.adminapi.ConnectorBinding; -import org.teiid.adminapi.Host; import org.teiid.adminapi.ProcessObject; -import org.teiid.adminapi.Service; import junit.framework.TestCase; +import com.metamatrix.admin.api.Host; +import com.metamatrix.admin.api.Service; import com.metamatrix.admin.objects.MMConnectorBinding; import com.metamatrix.admin.objects.MMProcess; import com.metamatrix.common.application.DQPConfigSource; Modified: trunk/server/src/test/java/com/metamatrix/admin/server/TestServerMonitoringAdminImpl.java =================================================================== --- trunk/server/src/test/java/com/metamatrix/admin/server/TestServerMonitoringAdminImpl.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/server/src/test/java/com/metamatrix/admin/server/TestServerMonitoringAdminImpl.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -159,10 +159,7 @@ * Expects service3 to be running, but not deployed. * @since 6.1 */ - public void testGetServices() throws AdminException { - - - + public void defer_testGetServices() throws AdminException { Collection<MMService> results = admin.getServices(AdminObject.WILDCARD + "dqp*"); assertEquals(3, results.size()); @@ -251,7 +248,7 @@ * Expects dqp3 to be running, but not deployed. * @since 4.3 */ - public void testGetDQPs() throws AdminException { + public void defer_testGetDQPs() throws AdminException { Collection<MMDQP> results = admin.getDQPs(AdminObject.WILDCARD); assertEquals(3, results.size()); Modified: trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestAdminApi.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestAdminApi.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestAdminApi.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -45,6 +45,7 @@ import org.teiid.adminapi.ExtensionModule; import org.teiid.adminapi.LogConfiguration; import org.teiid.adminapi.ProcessObject; +import org.teiid.adminapi.PropertyDefinition; import org.teiid.adminapi.VDB; import org.teiid.runtime.adminapi.Util; @@ -433,7 +434,7 @@ Collection<ConnectorBinding> bindings = getAdmin().getConnectorBindings("BQT_1.BQT1 Oracle 9i Simple Cap"); //$NON-NLS-1$ for (ConnectorBinding binding:bindings) { - getAdmin().setProperty(binding.getIdentifier(), ConnectorBinding.class.getName(), "RowCount", "10"); //$NON-NLS-1$ //$NON-NLS-2$ + getAdmin().setConnectorBindingProperty(binding.getIdentifier(), "RowCount", "10"); //$NON-NLS-1$ //$NON-NLS-2$ getAdmin().stopConnectorBinding(binding.getIdentifier(), true); getAdmin().startConnectorBinding(binding.getIdentifier()); } @@ -1014,7 +1015,32 @@ closeConnection(); } + @Test public void testPropertyDefinitions() throws Exception{ + getConnection(ADMIN, PROPS_FILE); + cleanDeploy(); + Collection<ConnectorType> c = getAdmin().getConnectorTypes("Oracle Connector"); //$NON-NLS-1$ + Collection<PropertyDefinition> defs = getAdmin().getConnectorTypePropertyDefinitions(c.iterator().next().getIdentifier()); + + for (PropertyDefinition d:defs) { + if (d.getName().equalsIgnoreCase("URL")) { //$NON-NLS-1$ + assertTrue(d.isRequired()); + assertTrue(d.getDefaultValue() != null); + assertEquals("JDBC URL", d.getDisplayName()); //$NON-NLS-1$ + assertEquals("String", d.getPropertyType()); //$NON-NLS-1$ + assertEquals("java.lang.String", d.getPropertyTypeClassName()); //$NON-NLS-1$ + assertTrue(d.getAllowedValues().isEmpty()); + assertTrue(!d.isMasked()); + } + + if (d.getName().equalsIgnoreCase("Password")) { //$NON-NLS-1$ + assertTrue(d.isMasked()); + } + } + + closeConnection(); + } + VDB addVDB(String name, String vdbFile) { try { Modified: trunk/test-integration/src/test/java/org/teiid/runtime/adminapi/TestEmbeddedAdmin.java =================================================================== --- trunk/test-integration/src/test/java/org/teiid/runtime/adminapi/TestEmbeddedAdmin.java 2009-08-28 22:23:06 UTC (rev 1290) +++ trunk/test-integration/src/test/java/org/teiid/runtime/adminapi/TestEmbeddedAdmin.java 2009-08-28 22:27:14 UTC (rev 1291) @@ -331,7 +331,7 @@ binding = current; } } - admin.setProperty(binding.getIdentifier(), ConnectorBinding.class.getName(), "RowCount", "10"); //$NON-NLS-1$ //$NON-NLS-2$ + admin.setConnectorBindingProperty(binding.getIdentifier(), "RowCount", "10"); //$NON-NLS-1$ //$NON-NLS-2$ admin.stopConnectorBinding(LOOPBACK, true); admin.startConnectorBinding(LOOPBACK);

15 years, 4 months

1
0
0 / 0

teiid SVN: r1290 - trunk/engine/src/main/java/com/metamatrix/query/processor/relational.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-08-28 18:23:06 -0400 (Fri, 28 Aug 2009) New Revision: 1290 Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/relational/LimitNode.java Log: TEIID-810 the context is needed for reference evaluation at limit nodes Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/relational/LimitNode.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/processor/relational/LimitNode.java 2009-08-28 22:21:19 UTC (rev 1289) +++ trunk/engine/src/main/java/com/metamatrix/query/processor/relational/LimitNode.java 2009-08-28 22:23:06 UTC (rev 1290) @@ -30,7 +30,6 @@ import com.metamatrix.api.exception.MetaMatrixProcessingException; import com.metamatrix.common.buffer.BlockedException; import com.metamatrix.common.buffer.TupleBatch; -import com.metamatrix.core.util.Assertion; import com.metamatrix.query.eval.Evaluator; import com.metamatrix.query.sql.symbol.Expression;

15 years, 4 months

1
0
0 / 0

teiid SVN: r1289 - in trunk/engine/src: test/java/org/teiid/dqp/internal/process and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-08-28 18:21:19 -0400 (Fri, 28 Aug 2009) New Revision: 1289 Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/relational/LimitNode.java trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatement.java Log: TEIID-810 the context is needed for reference evaluation at limit nodes Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/relational/LimitNode.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/processor/relational/LimitNode.java 2009-08-28 20:43:58 UTC (rev 1288) +++ trunk/engine/src/main/java/com/metamatrix/query/processor/relational/LimitNode.java 2009-08-28 22:21:19 UTC (rev 1289) @@ -22,6 +22,7 @@ package com.metamatrix.query.processor.relational; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -109,14 +110,13 @@ super.open(); limit = -1; if (limitExpr != null) { - Integer limitVal = (Integer)Evaluator.evaluate(limitExpr); + Integer limitVal = (Integer)new Evaluator(Collections.emptyMap(), getDataManager(), getContext()).evaluate(limitExpr, Collections.emptyList()); limit = limitVal.intValue(); } if (offsetExpr != null) { - Integer offsetVal = (Integer)Evaluator.evaluate(offsetExpr); + Integer offsetVal = (Integer)new Evaluator(Collections.emptyMap(), getDataManager(), getContext()).evaluate(offsetExpr, Collections.emptyList()); offset = offsetVal.intValue(); - Assertion.assertTrue(offset >= 0); } else { offset = 0; } Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatement.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatement.java 2009-08-28 20:43:58 UTC (rev 1288) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatement.java 2009-08-28 22:21:19 UTC (rev 1289) @@ -413,6 +413,19 @@ helpTestProcessing(preparedSql, values, expected, dataManager, FakeMetadataFactory.example1Cached(), false, false); } + @Test public void testLimitParam() throws Exception { + String preparedSql = "select e1 from pm1.g1 order by e1 desc limit ?"; //$NON-NLS-1$ + + List<?> values = Arrays.asList(1); + List[] expected = new List[] { + Arrays.asList("c"), //$NON-NLS-1$s + }; + + FakeDataManager dataManager = new FakeDataManager(); + TestProcessor.sampleData1(dataManager); + helpTestProcessing(preparedSql, values, expected, dataManager, FakeMetadataFactory.example1Cached(), false, false); + } + @Test public void testXQueryParam() throws Exception { String preparedSql = "exec m.xproc3(?)"; //$NON-NLS-1$

15 years, 4 months

1
0
0 / 0

teiid SVN: r1288 - trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2009-08-28 16:43:58 -0400 (Fri, 28 Aug 2009) New Revision: 1288 Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java Log: TEIID-809: Configuration file by default will be loaded from the classloader, the previous property "dqp.configFile" still be supported for legacy and testing purposes. Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java =================================================================== --- trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java 2009-08-28 15:49:01 UTC (rev 1287) +++ trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java 2009-08-28 20:43:58 UTC (rev 1288) @@ -220,7 +220,7 @@ * @see com.metamatrix.dqp.service.ConfigurationService#getConfigFile() */ public URL getConfigFile() { - String configFile = getUserPreferences().getProperty(DQPEmbeddedProperties.DQP_CONFIGFILE, "configuration.xml"); //$NON-NLS-1$ + String configFile = getUserPreferences().getProperty(DQPEmbeddedProperties.DQP_CONFIGFILE); if (valid(configFile)) { return getFullyQualifiedPath(configFile); }

15 years, 4 months

1
0
0 / 0

teiid SVN: r1287 - trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap.

by teiid-commits＠lists.jboss.org

Author: jdoyle Date: 2009-08-28 11:49:01 -0400 (Fri, 28 Aug 2009) New Revision: 1287 Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java Log: TEIID-614 Added call to parent to log request. Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java =================================================================== --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java 2009-08-28 13:38:52 UTC (rev 1286) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java 2009-08-28 15:49:01 UTC (rev 1287) @@ -87,7 +87,9 @@ Source.class, Service.Mode.PAYLOAD); - StringReader reader = new StringReader(xmlOutputter.outputString(doc)); + String requestDocument = xmlOutputter.outputString(doc); + attemptConditionalLog(requestDocument); + StringReader reader = new StringReader(requestDocument); Source input = new StreamSource(reader); // Invoke the operation. Source output = dispatch.invoke(input);

15 years, 4 months

1
0
0 / 0

teiid SVN: r1286 - trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api.

by teiid-commits＠lists.jboss.org

Author: vhalbert(a)redhat.com Date: 2009-08-28 09:38:52 -0400 (Fri, 28 Aug 2009) New Revision: 1286 Added: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractQueryTest.java Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQueryTestCase.java Log: Teiid-777 : consolidating the core logic for executing sql against a connection Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQueryTestCase.java =================================================================== --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQueryTestCase.java 2009-08-27 19:04:17 UTC (rev 1285) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQueryTestCase.java 2009-08-28 13:38:52 UTC (rev 1286) @@ -23,64 +23,26 @@ package com.metamatrix.jdbc.api; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.Reader; -import java.io.StringReader; import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; import java.sql.SQLException; -import java.sql.Statement; import java.util.Stack; -import org.junit.After; -import org.teiid.adminapi.Admin; import org.teiid.jdbc.TeiidDriver; -import com.metamatrix.script.io.MetadataReader; -import com.metamatrix.script.io.ResultSetReader; -import com.metamatrix.script.io.StringArrayReader; - /** - * This class can be used as the base class to write MMQuery based tests for - * integration testing. Just like the scripted one this one should provide all + * This class can be used as the base class to write Query based tests using + * the Teiid Driver for integration testing. Just like the scripted one this one should provide all * those required flexibility in testing. */ -public class AbstractMMQueryTestCase { +public class AbstractMMQueryTestCase extends AbstractQueryTest { static { new TeiidDriver(); } - protected com.metamatrix.jdbc.api.Connection internalConnection = null; - protected ResultSet internalResultSet = null; - protected Statement internalStatement = null; - protected int updateCount = -1; - protected String DELIMITER = " "; //$NON-NLS-1$ - private Stack<com.metamatrix.jdbc.api.Connection> contexts = new Stack<Connection>(); + private Stack<java.sql.Connection> contexts = new Stack<java.sql.Connection>(); - @After public void tearDown() throws Exception { - closeConnection(); - } - - public Admin getAdmin() { - try { - assertNotNull(this.internalConnection); - return this.internalConnection.getAdminAPI(); - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - public void pushConnection() { this.contexts.push(this.internalConnection); this.internalConnection = null; @@ -90,10 +52,7 @@ this.internalConnection = this.contexts.pop(); } - public void setConnection(com.metamatrix.jdbc.api.Connection c) { - this.internalConnection = c; - } - public com.metamatrix.jdbc.api.Connection getConnection(String vdb, String propsFile){ + public com.metamatrix.jdbc.api.Connection getConnection(String vdb, String propsFile){ return getConnection(vdb, propsFile, ""); //$NON-NLS-1$ } @@ -106,7 +65,7 @@ } catch (SQLException e) { throw new RuntimeException(e); } - return this.internalConnection; + return (com.metamatrix.jdbc.api.Connection) this.internalConnection; } public static com.metamatrix.jdbc.api.Connection createConnection(String vdb, String propsFile, String addtionalStuff) throws SQLException { @@ -114,348 +73,11 @@ return (com.metamatrix.jdbc.api.Connection)DriverManager.getConnection(url); } - public boolean execute(String sql) { - return execute(sql, new Object[] {}); - } - - public boolean execute(String sql, Object[] params) { - closeResultSet(); - closeStatement(); - this.updateCount = -1; - try { - assertNotNull(this.internalConnection); - assertTrue(!this.internalConnection.isClosed()); - boolean result = false; - if (params != null) { - if (sql.startsWith("exec ")) { //$NON-NLS-1$ - sql = sql.substring(5); - this.internalStatement = this.internalConnection.prepareCall("{?=call "+sql+"}"); //$NON-NLS-1$ //$NON-NLS-2$ - } else { - this.internalStatement = this.internalConnection.prepareStatement(sql); - } - setParameters((PreparedStatement)this.internalStatement, params); - result = ((PreparedStatement)this.internalStatement).execute(); - } else { - this.internalStatement = this.internalConnection.createStatement(); - result = this.internalStatement.execute(sql); - } - if (result) { - this.internalResultSet = this.internalStatement.getResultSet(); - } else { - this.updateCount = this.internalStatement.getUpdateCount(); - } - return result; - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - - private void setParameters(PreparedStatement stmt, Object[] params) throws SQLException{ - for (int i = 0; i < params.length; i++) { - stmt.setObject(i+1, params[i]); - } - } - - public void assertResultsSetEquals(File expected) { - assertResultsSetEquals(this.internalResultSet, expected); - } - - public void assertResultsSetEquals(ResultSet resultSet, File expected) { - assertNotNull(resultSet); - - BufferedReader resultReader = null; - BufferedReader expectedReader = null; - try { - resultReader = new BufferedReader(new ResultSetReader(resultSet, DELIMITER)); - expectedReader = new BufferedReader(new FileReader(expected)); - compareResults(resultReader, expectedReader); - } catch (Exception e) { - throw new RuntimeException(e); - }finally { - try { - resultReader.close(); - expectedReader.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - - public void assertResultsSetEquals(String expected) { - assertResultsSetEquals(this.internalResultSet, expected); - } - - public void assertResultsSetEquals(ResultSet resultSet,String expected) { - assertNotNull(resultSet); - - BufferedReader resultReader = null; - BufferedReader expectedReader = null; - try { - resultReader = new BufferedReader(new ResultSetReader(resultSet, DELIMITER)); - expectedReader = new BufferedReader(new StringReader(expected)); - compareResults(resultReader, expectedReader); - }catch(Exception e){ - throw new RuntimeException(e); - }finally { - try { - resultReader.close(); - expectedReader.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - - public void assertResults(String[] expected) { - assertResultsSetEquals(expected); - } - - public void assertResultsSetEquals(String[] expected) { - assertResultsSetEquals(this.internalResultSet, expected); - } - - public void assertResultsSetEquals(ResultSet resultSet, String[] expected) { - assertNotNull(resultSet); - - BufferedReader resultReader = null; - BufferedReader expectedReader = null; - try { - resultReader = new BufferedReader(new ResultSetReader(resultSet, DELIMITER)); - expectedReader = new BufferedReader(new StringArrayReader(expected)); - compareResults(resultReader, expectedReader); - }catch(Exception e){ - throw new RuntimeException(e); - }finally { - try { - resultReader.close(); - expectedReader.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - - public void assertReaderEquals(Reader expected, Reader reader) { - - BufferedReader resultReader = null; - BufferedReader expectedReader = null; - try { - expectedReader = new BufferedReader(expected); - resultReader = new BufferedReader(reader); - compareResults(resultReader, expectedReader); - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - try { - resultReader.close(); - expectedReader.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - - public void assertResultsSetMetadataEquals(ResultSetMetaData metadata, File expected) { - assertNotNull(metadata); - - BufferedReader resultReader = null; - BufferedReader expectedReader = null; - try { - resultReader = new BufferedReader(new MetadataReader(metadata, DELIMITER)); - expectedReader = new BufferedReader(new FileReader(expected)); - compareResults(resultReader, expectedReader); - } catch (Exception e) { - throw new RuntimeException(e); - }finally { - try { - resultReader.close(); - expectedReader.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - - public void assertResultsSetMetadataEquals(ResultSetMetaData metadata, String[] expected) { - assertNotNull(metadata); - - BufferedReader resultReader = null; - BufferedReader expectedReader = null; - try { - resultReader = new BufferedReader(new MetadataReader(metadata, DELIMITER)); - expectedReader = new BufferedReader(new StringArrayReader(expected)); - compareResults(resultReader, expectedReader); - } catch (Exception e) { - throw new RuntimeException(e); - }finally { - try { - resultReader.close(); - expectedReader.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - - static String read(BufferedReader r) throws IOException { - StringBuffer result = new StringBuffer(); - String s = null; - try { - while ((s = r.readLine()) != null) { - result.append(s.trim()); - result.append("\n"); //$NON-NLS-1$ - } - } finally { - r.close(); - } - return result.toString(); - } - - void compareResults(BufferedReader resultReader, BufferedReader expectedReader) throws IOException { - assertEquals(read(expectedReader), read(resultReader)); - } - - public void printResults() { - printResults(this.internalResultSet); - } - - public void printResults(ResultSet results) { - printResults(results, false); - } - - public void printResults(boolean comparePrint) { - assertNotNull(this.internalResultSet); - printResults(this.internalResultSet, comparePrint); - } - - public void walkResults() { - assertNotNull(this.internalResultSet); - - try { - int columnCount = this.internalResultSet.getMetaData().getColumnCount(); - while(this.internalResultSet.next()) { - for (int col = 1; col <= columnCount; col++) { - this.internalResultSet.getObject(col); - } - } - closeResultSet(); - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - - void printResults(ResultSet results, boolean comparePrint) { - if(results == null) { - System.out.println("ResultSet is null"); //$NON-NLS-1$ - return; - } - int row; - try { - row = -1; - BufferedReader in = new BufferedReader(new ResultSetReader(results, DELIMITER)); - String line = in.readLine(); - while(line != null) { - row++; - if (comparePrint) { - line=line.replaceAll("\"", "\\\\\""); //$NON-NLS-1$ //$NON-NLS-2$ - System.out.println("\""+line+"\","); //$NON-NLS-1$ //$NON-NLS-2$ - } - else { - System.out.println(line); - } - line = in.readLine(); - } - System.out.println("Fetched "+row+" rows\n"); //$NON-NLS-1$ //$NON-NLS-2$ - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - public void assertUpdateCount(int expected) { - assertEquals(expected, updateCount); - } - - public void assertRowCount(int expected) { - int count = getRowCount(); - assertEquals(expected, count); - } - - public int getRowCount() { - assertNotNull(this.internalResultSet); - // Count all - try { - int count = 0; - while(this.internalResultSet.next()) { - count++; - } - return count; - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - - public void closeStatement() { - closeResultSet(); - - if (this.internalStatement != null){ - try { - this.internalStatement.close(); - } catch(SQLException e) { - throw new RuntimeException(e); - } finally { - this.internalStatement = null; - } - } - } - - public void closeResultSet() { - if (this.internalResultSet != null) { - try { - this.internalResultSet.close(); - } catch(SQLException e) { - // ignore - } finally { - this.internalResultSet = null; - } - } - } - - public void closeConnection() { - closeStatement(); - try { - if (this.internalConnection != null) { - try { - this.internalConnection.close(); - } catch(SQLException e) { - throw new RuntimeException(e); - } - } - } finally { - this.internalConnection = null; - } - } - - public void print(String msg) { - System.out.println(msg); - } - - public void print(Throwable e) { - e.printStackTrace(); - } - + protected void helpTest(String query, String[] expected, String vdb, String props, String urlProperties) { getConnection(vdb, props, urlProperties); executeAndAssertResults(query, expected); closeConnection(); } - - protected void executeAndAssertResults(String query, String[] expected) { - execute(query); - if (expected != null) { - assertResults(expected); - } - else { - printResults(); - } - } + } \ No newline at end of file Added: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractQueryTest.java =================================================================== --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractQueryTest.java (rev 0) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractQueryTest.java 2009-08-28 13:38:52 UTC (rev 1286) @@ -0,0 +1,483 @@ +/* + * 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 com.metamatrix.jdbc.api; + + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Connection; + +import org.junit.After; +import org.teiid.adminapi.Admin; + +import com.metamatrix.script.io.MetadataReader; +import com.metamatrix.script.io.ResultSetReader; +import com.metamatrix.script.io.StringArrayReader; + + +/** + * This class can be used as the base class to write Query tests for + * integration testing. Just like the scripted one this one should provide all + * those required flexibility in testing. + */ +public abstract class AbstractQueryTest { + + + protected Connection internalConnection = null; + protected ResultSet internalResultSet = null; + protected Statement internalStatement = null; + protected int updateCount = -1; + protected String DELIMITER = " "; //$NON-NLS-1$ + + @After public void tearDown() throws Exception { + closeConnection(); + } + + public Admin getAdmin() { + try { + assertNotNull(this.internalConnection); + com.metamatrix.jdbc.api.Connection conn = (com.metamatrix.jdbc.api.Connection) this.internalConnection; + return conn.getAdminAPI(); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + public void setConnection(Connection c) { + this.internalConnection = c; + } + + public Connection getConnection() { + return this.internalConnection; + } + + public boolean execute(String sql) { + return execute(sql, new Object[] {}); + } + + public boolean execute(String sql, Object[] params) { + closeResultSet(); + closeStatement(); + this.updateCount = -1; + try { + assertNotNull(this.internalConnection); + assertTrue(!this.internalConnection.isClosed()); + boolean result = false; + if (params != null) { + if (sql.startsWith("exec ")) { //$NON-NLS-1$ + sql = sql.substring(5); + this.internalStatement = this.internalConnection.prepareCall("{?=call "+sql+"}"); //$NON-NLS-1$ //$NON-NLS-2$ + } else { + this.internalStatement = this.internalConnection.prepareStatement(sql); + } + setParameters((PreparedStatement)this.internalStatement, params); + assignExecutionProperties(this.internalStatement); + result = ((PreparedStatement)this.internalStatement).execute(); + } else { + this.internalStatement = this.internalConnection.createStatement(); + assignExecutionProperties(this.internalStatement); + result = this.internalStatement.execute(sql); + } + if (result) { + this.internalResultSet = this.internalStatement.getResultSet(); + } else { + this.updateCount = this.internalStatement.getUpdateCount(); + } + return result; + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + private void setParameters(PreparedStatement stmt, Object[] params) throws SQLException{ + for (int i = 0; i < params.length; i++) { + stmt.setObject(i+1, params[i]); + } + } + + public int[] executeBatch(String[] sql) { + return executeBatch(sql, -1); + } + + public int[] executeBatch(String[] sql, int timeout) { + closeResultSet(); + closeStatement(); + + try { + assertNotNull(this.internalConnection); + assertTrue(!this.internalConnection.isClosed()); + + for (int i = 0; i < sql.length; i++) { + if (sql[i].indexOf("?") != -1) { //$NON-NLS-1$ + throw new RuntimeException("no prepared statements allowed in the batch command"); //$NON-NLS-1$ + } + } + + this.internalStatement = this.internalConnection.createStatement(); + assignExecutionProperties(this.internalStatement); + + if (timeout != -1) { + this.internalStatement.setQueryTimeout(timeout); + } + for (int i = 0; i < sql.length; i++) { + this.internalStatement.addBatch(sql[i]); + } + + return this.internalStatement.executeBatch(); + + } catch (SQLException e) { + throw new RuntimeException(e); + } + + } + + /** + * Override when you need to set an execution property on the statement before execution. + * + * Example: + *<code>if (this.executionProperties.getProperty(ExecutionProperties.PROP_FETCH_SIZE) != null) { + * statement.setExecutionProperty(ExecutionProperties.PROP_FETCH_SIZE, this.executionProperties.getProperty(ExecutionProperties.PROP_FETCH_SIZE)); + * } + *</code> + * + * @param stmt + * + * @since + */ + + + protected void assignExecutionProperties(Statement stmt) { + } + + + public void assertResultsSetEquals(File expected) { + assertResultsSetEquals(this.internalResultSet, expected); + } + + public void assertResultsSetEquals(ResultSet resultSet, File expected) { + assertNotNull(resultSet); + + BufferedReader resultReader = null; + BufferedReader expectedReader = null; + try { + resultReader = new BufferedReader(new ResultSetReader(resultSet, DELIMITER)); + expectedReader = new BufferedReader(new FileReader(expected)); + compareResults(resultReader, expectedReader); + } catch (Exception e) { + throw new RuntimeException(e); + }finally { + try { + resultReader.close(); + expectedReader.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + public void assertResultsSetEquals(String expected) { + assertResultsSetEquals(this.internalResultSet, expected); + } + + public void assertResultsSetEquals(ResultSet resultSet,String expected) { + assertNotNull(resultSet); + + BufferedReader resultReader = null; + BufferedReader expectedReader = null; + try { + resultReader = new BufferedReader(new ResultSetReader(resultSet, DELIMITER)); + expectedReader = new BufferedReader(new StringReader(expected)); + compareResults(resultReader, expectedReader); + }catch(Exception e){ + throw new RuntimeException(e); + }finally { + try { + resultReader.close(); + expectedReader.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + public void assertResults(String[] expected) { + assertResultsSetEquals(expected); + } + + public void assertResultsSetEquals(String[] expected) { + assertResultsSetEquals(this.internalResultSet, expected); + } + + public void assertResultsSetEquals(ResultSet resultSet, String[] expected) { + assertNotNull(resultSet); + + BufferedReader resultReader = null; + BufferedReader expectedReader = null; + try { + resultReader = new BufferedReader(new ResultSetReader(resultSet, DELIMITER)); + expectedReader = new BufferedReader(new StringArrayReader(expected)); + compareResults(resultReader, expectedReader); + }catch(Exception e){ + throw new RuntimeException(e); + }finally { + try { + resultReader.close(); + expectedReader.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + public void assertReaderEquals(Reader expected, Reader reader) { + + BufferedReader resultReader = null; + BufferedReader expectedReader = null; + try { + expectedReader = new BufferedReader(expected); + resultReader = new BufferedReader(reader); + compareResults(resultReader, expectedReader); + } catch (Exception e) { + throw new RuntimeException(e); + } finally { + try { + resultReader.close(); + expectedReader.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + public void assertResultsSetMetadataEquals(ResultSetMetaData metadata, File expected) { + assertNotNull(metadata); + + BufferedReader resultReader = null; + BufferedReader expectedReader = null; + try { + resultReader = new BufferedReader(new MetadataReader(metadata, DELIMITER)); + expectedReader = new BufferedReader(new FileReader(expected)); + compareResults(resultReader, expectedReader); + } catch (Exception e) { + throw new RuntimeException(e); + }finally { + try { + resultReader.close(); + expectedReader.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + public void assertResultsSetMetadataEquals(ResultSetMetaData metadata, String[] expected) { + assertNotNull(metadata); + + BufferedReader resultReader = null; + BufferedReader expectedReader = null; + try { + resultReader = new BufferedReader(new MetadataReader(metadata, DELIMITER)); + expectedReader = new BufferedReader(new StringArrayReader(expected)); + compareResults(resultReader, expectedReader); + } catch (Exception e) { + throw new RuntimeException(e); + }finally { + try { + resultReader.close(); + expectedReader.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + static String read(BufferedReader r) throws IOException { + StringBuffer result = new StringBuffer(); + String s = null; + try { + while ((s = r.readLine()) != null) { + result.append(s.trim()); + result.append("\n"); //$NON-NLS-1$ + } + } finally { + r.close(); + } + return result.toString(); + } + + void compareResults(BufferedReader resultReader, BufferedReader expectedReader) throws IOException { + assertEquals(read(expectedReader), read(resultReader)); + } + + public void printResults() { + printResults(this.internalResultSet); + } + + public void printResults(ResultSet results) { + printResults(results, false); + } + + public void printResults(boolean comparePrint) { + assertNotNull(this.internalResultSet); + printResults(this.internalResultSet, comparePrint); + } + + public void walkResults() { + assertNotNull(this.internalResultSet); + + try { + int columnCount = this.internalResultSet.getMetaData().getColumnCount(); + while(this.internalResultSet.next()) { + for (int col = 1; col <= columnCount; col++) { + this.internalResultSet.getObject(col); + } + } + closeResultSet(); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + void printResults(ResultSet results, boolean comparePrint) { + if(results == null) { + System.out.println("ResultSet is null"); //$NON-NLS-1$ + return; + } + int row; + try { + row = -1; + BufferedReader in = new BufferedReader(new ResultSetReader(results, DELIMITER)); + String line = in.readLine(); + while(line != null) { + row++; + if (comparePrint) { + line=line.replaceAll("\"", "\\\\\""); //$NON-NLS-1$ //$NON-NLS-2$ + System.out.println("\""+line+"\","); //$NON-NLS-1$ //$NON-NLS-2$ + } + else { + System.out.println(line); + } + line = in.readLine(); + } + System.out.println("Fetched "+row+" rows\n"); //$NON-NLS-1$ //$NON-NLS-2$ + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public void assertUpdateCount(int expected) { + assertEquals(expected, updateCount); + } + + public void assertRowCount(int expected) { + int count = getRowCount(); + assertEquals(expected, count); + } + + public int getRowCount() { + assertNotNull(this.internalResultSet); + // Count all + try { + int count = 0; + while(this.internalResultSet.next()) { + count++; + } + return count; + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + public void closeStatement() { + closeResultSet(); + + if (this.internalStatement != null){ + try { + this.internalStatement.close(); + } catch(SQLException e) { + throw new RuntimeException(e); + } finally { + this.internalStatement = null; + } + } + } + + public void closeResultSet() { + if (this.internalResultSet != null) { + try { + this.internalResultSet.close(); + } catch(SQLException e) { + // ignore + } finally { + this.internalResultSet = null; + } + } + } + + public void closeConnection() { + closeStatement(); + try { + if (this.internalConnection != null) { + try { + this.internalConnection.close(); + } catch(SQLException e) { + throw new RuntimeException(e); + } + } + } finally { + this.internalConnection = null; + } + } + + public void print(String msg) { + System.out.println(msg); + } + + public void print(Throwable e) { + e.printStackTrace(); + } + + + protected void executeAndAssertResults(String query, String[] expected) { + execute(query); + if (expected != null) { + assertResults(expected); + } + else { + printResults(); + } + } +} \ No newline at end of file Property changes on: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractQueryTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 4 months

1
0
0 / 0

teiid SVN: r1285 - in trunk/engine/src: test/java/com/metamatrix/query/function and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2009-08-27 15:04:17 -0400 (Thu, 27 Aug 2009) New Revision: 1285 Modified: trunk/engine/src/main/java/com/metamatrix/query/function/FunctionMethods.java trunk/engine/src/test/java/com/metamatrix/query/function/TestFunction.java Log: TEIID-671 mod with big integer inputs should use the remainder function, not mod Modified: trunk/engine/src/main/java/com/metamatrix/query/function/FunctionMethods.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/function/FunctionMethods.java 2009-08-27 15:04:32 UTC (rev 1284) +++ trunk/engine/src/main/java/com/metamatrix/query/function/FunctionMethods.java 2009-08-27 19:04:17 UTC (rev 1285) @@ -154,23 +154,29 @@ // ================== Function = abs ===================== - public static Object abs(Object x) throws FunctionExecutionException { - if(x instanceof Integer) { - return new Integer(Math.abs(((Integer)x).intValue())); - } else if(x instanceof Long) { - return new Long(Math.abs(((Long)x).longValue())); - } else if(x instanceof Float) { - return new Float(Math.abs(((Float)x).floatValue())); - } else if(x instanceof Double) { - return new Double(Math.abs(((Double)x).doubleValue())); - } else if(x instanceof BigInteger) { - return ((BigInteger)x).abs(); - } else if(x instanceof BigDecimal) { - return ((BigDecimal)x).abs(); - } - - throw new FunctionExecutionException(ErrorMessageKeys.FUNCTION_0015, QueryPlugin.Util.getString(ErrorMessageKeys.FUNCTION_0015, "abs", x.getClass().getName())); //$NON-NLS-1$ + public static int abs(int x) { + return Math.abs(x); } + + public static long abs(long x) { + return Math.abs(x); + } + + public static float abs(float x) { + return Math.abs(x); + } + + public static double abs(double x) { + return Math.abs(x); + } + + public static Object abs(BigInteger x) { + return x.abs(); + } + + public static Object abs(BigDecimal x) { + return x.abs(); + } // ================== Function = ceiling ===================== @@ -226,38 +232,30 @@ // ================== Function = mod ===================== - public static Object mod(Object x, Object y) throws FunctionExecutionException { - if(x == null || y == null) { - return null; - } else if(x instanceof Integer) { - if(y instanceof Integer) { - return new Integer(((Integer)x).intValue() % ((Integer)y).intValue()); - } - } else if(x instanceof Long) { - if(y instanceof Long) { - return new Long(((Long)x).longValue() % ((Long)y).longValue()); - } - } else if(x instanceof Float) { - if(y instanceof Float) { - return new Float(((Float)x).floatValue() % ((Float)y).floatValue()); - } - } else if(x instanceof Double) { - if(y instanceof Double) { - return new Double(((Double)x).doubleValue() % ((Double)y).doubleValue()); - } - } else if(x instanceof BigInteger) { - if(y instanceof BigInteger) { - return ((BigInteger)x).mod((BigInteger) y); - } - } else if(x instanceof BigDecimal) { - if(y instanceof BigDecimal) { - return ((BigDecimal)x).remainder((BigDecimal) y); - } - } - - throw new FunctionExecutionException(ErrorMessageKeys.FUNCTION_0007, QueryPlugin.Util.getString(ErrorMessageKeys.FUNCTION_0007, new Object[]{"mod", x.getClass().getName(), y.getClass().getName()})); //$NON-NLS-1$ + public static int mod(int x, int y) { + return x % y; } - + + public static long mod(long x, long y) { + return x % y; + } + + public static float mod(float x, float y) { + return x % y; + } + + public static double mod(double x, double y) { + return x % y; + } + + public static Object mod(BigInteger x, BigInteger y) { + return x.remainder(y); + } + + public static Object mod(BigDecimal x, BigDecimal y) { + return x.remainder(y); + } + // ================== Function = power ===================== public static double power(double x, double y) { Modified: trunk/engine/src/test/java/com/metamatrix/query/function/TestFunction.java =================================================================== --- trunk/engine/src/test/java/com/metamatrix/query/function/TestFunction.java 2009-08-27 15:04:32 UTC (rev 1284) +++ trunk/engine/src/test/java/com/metamatrix/query/function/TestFunction.java 2009-08-27 19:04:17 UTC (rev 1285) @@ -1170,4 +1170,28 @@ assertEquals(TimestampUtil.createTime(15, 0, 0), FunctionMethods.parseTime(" 15:00:00 ", "HH:mm:ss")); //$NON-NLS-1$ //$NON-NLS-2$ } + @Test public void testMod() { + assertEquals(new BigDecimal("-1.1"), FunctionMethods.mod(new BigDecimal("-3.1"), new BigDecimal("2"))); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + @Test public void testMod1() { + assertEquals(new BigDecimal("-1.1"), FunctionMethods.mod(new BigDecimal("-3.1"), new BigDecimal("-2"))); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + @Test public void testMod2() { + assertEquals(-40, FunctionMethods.mod(-340, 60), 0); + } + + @Test public void testMod3() { + assertEquals(-40, FunctionMethods.mod(-340, -60), 0); + } + + @Test public void testMod4() { + assertEquals(new BigInteger("-1"), FunctionMethods.mod(new BigInteger("-3"), new BigInteger("2"))); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + @Test public void testMod5() { + assertEquals(new BigInteger("-1"), FunctionMethods.mod(new BigInteger("-3"), new BigInteger("-2"))); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + }

15 years, 4 months

1
0
0 / 0

teiid SVN: r1284 - trunk/build/assembly.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2009-08-27 11:04:32 -0400 (Thu, 27 Aug 2009) New Revision: 1284 Modified: trunk/build/assembly/src.xml Log: TEIID-804: src zip file is fixed to represent the form that is read to develop Modified: trunk/build/assembly/src.xml =================================================================== --- trunk/build/assembly/src.xml 2009-08-26 20:23:56 UTC (rev 1283) +++ trunk/build/assembly/src.xml 2009-08-27 15:04:32 UTC (rev 1284) @@ -11,38 +11,15 @@ <fileSets> <fileSet> - <includes> - <include>*.txt</include> - <include>pom.xml</include> - </includes> + <directory>${project.basedir}</directory> <useDefaultExcludes>true</useDefaultExcludes> + <outputDirectory>teiid</outputDirectory> + <excludes> + <exclude>**/target/**</exclude> + <exclude>**/.settings/**</exclude> + <exclude>**/*.log</exclude> + </excludes> </fileSet> </fileSets> - - <moduleSets> - <moduleSet> - <includeSubModules>true</includeSubModules> - <sources> - <includeModuleDirectory>true</includeModuleDirectory> - <excludeSubModuleDirectories>false</excludeSubModuleDirectories> - <useDefaultExcludes>true</useDefaultExcludes> - <fileSets> - <fileSet> - <directory>.</directory> - <outputDirectory></outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - <excludes> - <exclude>**/target/**</exclude> - <exclude>.classpath</exclude> - <exclude>.project</exclude> - <exclude>**/.settings/**</exclude> - <exclude>**/*.log</exclude> - - </excludes> - </fileSet> - </fileSets> - </sources> - </moduleSet> - </moduleSets> - + </assembly> \ No newline at end of file

15 years, 4 months

1
0
0 / 0

Teiid - Continuous Build - Build # 793 - Fixed!

by jboss-qa-internal＠redhat.com

Teiid - Continuous Build - Build # 793 - Fixed: Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid%20-%20Continuous%20Build/793/ to view the results.

15 years, 4 months

1
0
0 / 0

teiid SVN: r1283 - in trunk/server/src/main/java/com/metamatrix/server: query/service and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2009-08-26 16:23:56 -0400 (Wed, 26 Aug 2009) New Revision: 1283 Modified: trunk/server/src/main/java/com/metamatrix/server/dqp/config/PlatformConfigSource.java trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServicePropertyNames.java Log: TEIID-802: consolidated all the proeprties to DQPEmbeddedProperties and renames some of the process based properties Modified: trunk/server/src/main/java/com/metamatrix/server/dqp/config/PlatformConfigSource.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/server/dqp/config/PlatformConfigSource.java 2009-08-26 16:31:05 UTC (rev 1282) +++ trunk/server/src/main/java/com/metamatrix/server/dqp/config/PlatformConfigSource.java 2009-08-26 20:23:56 UTC (rev 1283) @@ -36,6 +36,7 @@ import com.metamatrix.common.config.api.Host; import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.core.MetaMatrixRuntimeException; +import com.metamatrix.dqp.embedded.DQPEmbeddedProperties; import com.metamatrix.dqp.service.DQPServiceNames; import com.metamatrix.dqp.service.metadata.IndexMetadataService; import com.metamatrix.metadata.runtime.RuntimeMetadataCatalog; @@ -66,12 +67,12 @@ String procDebugStr = currentConfiguration.getProperty(PROC_DEBUG_ALLOWED); if(procDebugStr != null) { - dqpProps.setProperty(DQPConfigSource.PROCESSOR_DEBUG_ALLOWED, procDebugStr); + dqpProps.setProperty(DQPEmbeddedProperties.PROCESSOR_DEBUG_ALLOWED, procDebugStr); } - String streamingBatchSize = currentConfiguration.getProperty(DQPConfigSource.STREAMING_BATCH_SIZE); + String streamingBatchSize = currentConfiguration.getProperty(DQPEmbeddedProperties.STREAMING_BATCH_SIZE); if(streamingBatchSize != null) { - dqpProps.setProperty(DQPConfigSource.STREAMING_BATCH_SIZE, streamingBatchSize); + dqpProps.setProperty(DQPEmbeddedProperties.STREAMING_BATCH_SIZE, streamingBatchSize); } this.host = host; Modified: trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServicePropertyNames.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServicePropertyNames.java 2009-08-26 16:31:05 UTC (rev 1282) +++ trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServicePropertyNames.java 2009-08-26 20:23:56 UTC (rev 1283) @@ -22,29 +22,29 @@ package com.metamatrix.server.query.service; -import com.metamatrix.common.application.DQPConfigSource; +import com.metamatrix.dqp.embedded.DQPEmbeddedProperties; public class QueryServicePropertyNames { - public static final String PROCESS_POOL_MAX_THREADS = DQPConfigSource.PROCESS_POOL_MAX_THREADS; + public static final String PROCESS_POOL_MAX_THREADS = DQPEmbeddedProperties.PROCESS_POOL_MAX_THREADS; - public static final String MAX_FETCH_SIZE = DQPConfigSource.MAX_FETCH_SIZE; + public static final String MAX_FETCH_SIZE = DQPEmbeddedProperties.MAX_FETCH_SIZE; - public static final String MAX_CODE_TABLE_RECORDS = DQPConfigSource.MAX_CODE_TABLE_RECORDS; + public static final String MAX_CODE_TABLE_RECORDS = DQPEmbeddedProperties.MAX_CODE_TABLE_RECORDS; - public static final String MAX_CODE_TABLES = DQPConfigSource.MAX_CODE_TABLES; + public static final String MAX_CODE_TABLES = DQPEmbeddedProperties.MAX_CODE_TABLES; - public static final String PROCESSOR_TIMESLICE = DQPConfigSource.PROCESSOR_TIMESLICE; + public static final String PROCESSOR_TIMESLICE = DQPEmbeddedProperties.PROCESS_TIMESLICE; public static final String UDF_SOURCE = "UDFSource"; //$NON-NLS-1$ - public static final String USE_RESULTSET_CACHE = DQPConfigSource.USE_RESULTSET_CACHE; + public static final String USE_RESULTSET_CACHE = DQPEmbeddedProperties.USE_RESULTSET_CACHE; - public static final String MAX_RESULTSET_CACHE_SIZE = DQPConfigSource.MAX_RESULTSET_CACHE_SIZE; + public static final String MAX_RESULTSET_CACHE_SIZE = DQPEmbeddedProperties.MAX_RESULTSET_CACHE_SIZE; - public static final String MAX_RESULTSET_CACHE_AGE = DQPConfigSource.MAX_RESULTSET_CACHE_AGE; + public static final String MAX_RESULTSET_CACHE_AGE = DQPEmbeddedProperties.MAX_RESULTSET_CACHE_AGE; - public static final String RESULTSET_CACHE_SCOPE = DQPConfigSource.RESULTSET_CACHE_SCOPE; + public static final String RESULTSET_CACHE_SCOPE = DQPEmbeddedProperties.RESULTSET_CACHE_SCOPE; - public static final String MAX_PLAN_CACHE_SIZE = DQPConfigSource.MAX_PLAN_CACHE_SIZE; + public static final String MAX_PLAN_CACHE_SIZE = DQPEmbeddedProperties.MAX_PLAN_CACHE_SIZE; }

15 years, 4 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

teiid-commits August 2009