[teiid-commits] teiid SVN: r1090 - in trunk: client/src/main/java/com/metamatrix/admin/api/exception and 43 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Tue Jun 30 17:19:02 EDT 2009
Author: rareddy
Date: 2009-06-30 17:19:01 -0400 (Tue, 30 Jun 2009)
New Revision: 1090
Added:
trunk/client/src/main/java/org/teiid/adminapi/
trunk/client/src/main/java/org/teiid/adminapi/Admin.java
trunk/client/src/main/java/org/teiid/adminapi/AdminComponentException.java
trunk/client/src/main/java/org/teiid/adminapi/AdminException.java
trunk/client/src/main/java/org/teiid/adminapi/AdminObject.java
trunk/client/src/main/java/org/teiid/adminapi/AdminOptions.java
trunk/client/src/main/java/org/teiid/adminapi/AdminProcessingException.java
trunk/client/src/main/java/org/teiid/adminapi/AdminRoles.java
trunk/client/src/main/java/org/teiid/adminapi/AdminStatus.java
trunk/client/src/main/java/org/teiid/adminapi/Cache.java
trunk/client/src/main/java/org/teiid/adminapi/ConfigurationAdmin.java
trunk/client/src/main/java/org/teiid/adminapi/ConnectionPool.java
trunk/client/src/main/java/org/teiid/adminapi/ConnectorBinding.java
trunk/client/src/main/java/org/teiid/adminapi/ConnectorType.java
trunk/client/src/main/java/org/teiid/adminapi/DQP.java
trunk/client/src/main/java/org/teiid/adminapi/EmbeddedLogger.java
trunk/client/src/main/java/org/teiid/adminapi/Entitlement.java
trunk/client/src/main/java/org/teiid/adminapi/ExtensionModule.java
trunk/client/src/main/java/org/teiid/adminapi/Group.java
trunk/client/src/main/java/org/teiid/adminapi/Host.java
trunk/client/src/main/java/org/teiid/adminapi/LogConfiguration.java
trunk/client/src/main/java/org/teiid/adminapi/Model.java
trunk/client/src/main/java/org/teiid/adminapi/MonitoringAdmin.java
trunk/client/src/main/java/org/teiid/adminapi/Principal.java
trunk/client/src/main/java/org/teiid/adminapi/ProcessObject.java
trunk/client/src/main/java/org/teiid/adminapi/PropertyDefinition.java
trunk/client/src/main/java/org/teiid/adminapi/QueueWorkerPool.java
trunk/client/src/main/java/org/teiid/adminapi/Request.java
trunk/client/src/main/java/org/teiid/adminapi/Resource.java
trunk/client/src/main/java/org/teiid/adminapi/Role.java
trunk/client/src/main/java/org/teiid/adminapi/RuntimeStateAdmin.java
trunk/client/src/main/java/org/teiid/adminapi/ScriptsContainer.java
trunk/client/src/main/java/org/teiid/adminapi/SecurityAdmin.java
trunk/client/src/main/java/org/teiid/adminapi/Service.java
trunk/client/src/main/java/org/teiid/adminapi/Session.java
trunk/client/src/main/java/org/teiid/adminapi/SystemObject.java
trunk/client/src/main/java/org/teiid/adminapi/Transaction.java
trunk/client/src/main/java/org/teiid/adminapi/User.java
trunk/client/src/main/java/org/teiid/adminapi/VDB.java
trunk/server/src/main/java/com/metamatrix/admin/api/
trunk/server/src/main/java/com/metamatrix/admin/api/server/
trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerAdmin.java
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
Removed:
trunk/client/src/main/java/com/metamatrix/admin/api/core/
trunk/client/src/main/java/com/metamatrix/admin/api/embedded/
trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminComponentException.java
trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminException.java
trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminProcessingException.java
trunk/client/src/main/java/com/metamatrix/admin/api/objects/
trunk/client/src/main/java/com/metamatrix/admin/api/server/
Modified:
trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java
trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java
trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/Connection.java
trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQueryTestCase.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminObject.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminStatus.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectionPool.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectorBinding.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectorType.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMDQP.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMExtensionModule.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMGroup.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMHost.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMLogConfiguration.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMModel.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMPrincipal.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMProcess.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMPropertyDefinition.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMQueueWorkerPool.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMRequest.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMResource.java
trunk/client/src/main/java/com/metamatrix/admin/objects/MMRole.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/MMSession.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/com/metamatrix/admin/objects/MMVDB.java
trunk/client/src/main/java/com/metamatrix/admin/objects/TransactionImpl.java
trunk/client/src/main/java/com/metamatrix/client/ExceptionUtil.java
trunk/client/src/main/java/com/metamatrix/common/comm/api/ServerConnectionFactory.java
trunk/client/src/main/java/com/metamatrix/common/comm/platform/client/ServerAdminFactory.java
trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/AdminApiServerDiscovery.java
trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnectionFactory.java
trunk/client/src/test/java/com/metamatrix/admin/api/objects/TestAdminOptions.java
trunk/client/src/test/java/com/metamatrix/common/comm/platform/client/TestSeverAdminFactory.java
trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestAdminApiServerDiscovery.java
trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServiceRegistry.java
trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ComponentTypePropDefn.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/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLHelperImpl.java
trunk/common-internal/src/main/java/com/metamatrix/common/object/PropertyDefinition.java
trunk/common-internal/src/main/java/com/metamatrix/common/object/PropertyDefinitionImpl.java
trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicModelInfo.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnection.java
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPLogListener.java
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPRuntimeStateAdminImpl.java
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPSecurityAdminImpl.java
trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java
trunk/embedded/src/main/java/com/metamatrix/platform/security/authorization/service/AuthorizationServiceImpl.java
trunk/embedded/src/main/java/org/teiid/Server.java
trunk/embedded/src/main/java/org/teiid/ServerMBean.java
trunk/embedded/src/main/java/org/teiid/transport/AdminAuthorizationInterceptor.java
trunk/embedded/src/main/java/org/teiid/transport/ServerWorkItem.java
trunk/embedded/src/main/java/org/teiid/transport/SocketTransport.java
trunk/embedded/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties
trunk/embedded/src/test/java/com/metamatrix/platform/security/TestAdminAuthInterceptor.java
trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationService.java
trunk/engine/src/main/java/com/metamatrix/dqp/service/TransactionService.java
trunk/engine/src/main/java/org/teiid/dqp/internal/transaction/TransactionServerImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/service/FakeAuthorizationService.java
trunk/engine/src/test/java/org/teiid/dqp/internal/transaction/TestTransactionServer.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/main/java/com/metamatrix/platform/admin/apiimpl/AuthorizationAdminAPIImpl.java
trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/ConfigurationAdminAPIImpl.java
trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/ExtensionSourceAdminAPIImpl.java
trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/RuntimeStateAdminAPIHelper.java
trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/RuntimeStateAdminAPIImpl.java
trunk/server/src/main/java/com/metamatrix/platform/security/api/service/AuthorizationServiceInterface.java
trunk/server/src/main/java/com/metamatrix/platform/security/authorization/service/AuthorizationServiceImpl.java
trunk/server/src/main/java/com/metamatrix/platform/vm/api/controller/ProcessManagement.java
trunk/server/src/main/java/com/metamatrix/platform/vm/controller/ProcessController.java
trunk/server/src/main/java/com/metamatrix/server/admin/apiimpl/RuntimeMetadataAdminAPIImpl.java
trunk/server/src/main/java/com/metamatrix/server/admin/apiimpl/RuntimeMetadataHelper.java
trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformAuthorizationService.java
trunk/server/src/main/java/com/metamatrix/server/query/service/QueryService.java
trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServiceInterface.java
trunk/server/src/test/java/com/metamatrix/admin/server/FakeCacheAdmin.java
trunk/server/src/test/java/com/metamatrix/admin/server/FakeConfigurationService.java
trunk/server/src/test/java/com/metamatrix/admin/server/FakeQueryService.java
trunk/server/src/test/java/com/metamatrix/admin/server/FakeRuntimeStateAdminAPIHelper.java
trunk/server/src/test/java/com/metamatrix/admin/server/IdentifierConstants.java
trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java
trunk/server/src/test/java/com/metamatrix/admin/server/TestServerMonitoringAdminImpl.java
trunk/server/src/test/java/com/metamatrix/admin/server/TestServerRuntimeStateAdminImpl.java
Log:
TEIID-697: moved the admin api to single package (core+embedded-server); and bought in some of the needed methods from the server admin api into core one.
Deleted: trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminComponentException.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminComponentException.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminComponentException.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -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 com.metamatrix.admin.api.exception;
-
-
-/**
- * An <code>AdminComponentException</code> is thrown when an error occurs as a
- * result of an internal component error.
- *
- * <p>This exception class is capable of containing multiple exceptions. See
- * {@link AdminException} for details.
- */
-public final class AdminComponentException extends AdminException {
-
- /**
- * No-arg ctor.
- *
- * @since 4.3
- */
- public AdminComponentException() {
- super();
- }
-
- /**
- * Construct with a message.
- * @param msg the error message.
- * @since 4.3
- */
- public AdminComponentException(String msg) {
- super(msg);
- }
-
- public AdminComponentException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Construct with an optional error code and a message.
- * @param code an optional error code
- * @param msg the error message.
- * @since 4.3
- */
- public AdminComponentException(int code, String msg) {
- super(code, msg);
- }
-
- public AdminComponentException(String msg, Throwable cause) {
- super(msg, cause);
- }
-
- public AdminComponentException(int code, String msg, Throwable cause) {
- super(code, msg, cause);
- }
-
-}
Deleted: trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminException.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminException.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminException.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -1,123 +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.api.exception;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import com.metamatrix.core.MetaMatrixCoreException;
-
-/**
- * <code>AdminException</code> is the base exception for the admin package. Many *Admin methods throw this
- * exception. Instances will be one of the concrete subtypes:
- * {@link AdminComponentException} or {@link AdminProcessingException}</p>
- *
- * <p><code>AdminException</code>s may contain multiple child exceptions. An example
- * of this could be when performing an admin action results in multiple failures. Admin
- * clients should be aware of this and use the {@link #hasMultiple()} method to
- * determine if they need to check the child exceptions.</p>
- */
-public abstract class AdminException extends MetaMatrixCoreException {
-
- // List of Admin exceptions in
- // case of multiple failure
- private List children;
-
- /**
- * No-arg ctor.
- *
- * @since 4.3
- */
- AdminException() {
- super();
- }
-
- /**
- * Construct with a message.
- * @param msg the error message.
- * @since 4.3
- */
- AdminException(String msg) {
- super(msg);
- }
-
- AdminException(Throwable cause) {
- this(cause.getMessage(), cause);
- }
-
- /**
- * Construct with an optional error code and a message.
- * @param code an optional error code
- * @param msg the error message.
- * @since 4.3
- */
- AdminException(int code, String msg) {
- super(Integer.toString(code), msg);
- }
-
- AdminException(String msg, Throwable cause) {
- super(cause, msg);
- }
-
- AdminException(int code, String msg, Throwable cause) {
- super(cause, Integer.toString(code),msg);
- }
-
- /**
- * Determine whether this exception is representing
- * mutliple component failures.
- * @return <code>true</code> iff this exception contains multiple
- * component failure exceptions.
- * @since 4.3
- */
- public boolean hasMultiple() {
- return (children != null && children.size() > 0);
- }
-
- /**
- * Returns a non-null list of failures (<code>AdminException</code>s), one for each
- * component that failed.
- *
- * <p>The list will have members when {@link #hasMultiple()} returns <code>true</code>.</p>
- * @return The non-null list of failures.
- * @since 4.3
- */
- public List getChildren() {
- return (children != null ? children : Collections.EMPTY_LIST);
- }
-
- /**
- * Add a child <code>AdminException</code> for a particular failure
- * if and action resulted in multiple failures.
- *
- * @param child a specific failure
- * @since 4.3
- */
- public void addChild(AdminException child) {
- if ( children == null ) {
- children = new ArrayList();
- }
- children.add(child);
- }
-}
Deleted: trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminProcessingException.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminProcessingException.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminProcessingException.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -1,76 +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.api.exception;
-
-
-/**
- * An <code>AdminProcessingException</code> indicates that an error occured during processing as a result
- * of user input. This exception is the result of handling an invalid user
- * request, not the result of an internal error.</p>
- *
- * <p>This exception class is capable of containing multiple exceptions. See
- * {@link AdminException} for details.
- */
-public final class AdminProcessingException extends AdminException {
-
- /**
- * No-arg ctor.
- *
- * @since 4.3
- */
- public AdminProcessingException() {
- super();
- }
-
- /**
- * Construct with a message.
- * @param msg the error message.
- * @since 4.3
- */
- public AdminProcessingException(String msg) {
- super(msg);
- }
-
- public AdminProcessingException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Construct with an optional error code and a message.
- * @param code an optional error code
- * @param msg the error message.
- * @since 4.3
- */
- public AdminProcessingException(int code, String msg) {
- super(code, msg);
- }
-
- public AdminProcessingException(String msg, Throwable cause) {
- super(msg);
- }
-
- public AdminProcessingException(int code, String msg, Throwable cause) {
- super(code, msg, cause);
- }
-
-}
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminObject.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminObject.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminObject.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -28,11 +28,12 @@
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.Transaction;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
-import com.metamatrix.admin.api.objects.AdminObject;
-import com.metamatrix.admin.api.objects.Transaction;
import com.metamatrix.common.util.PropertiesUtils;
import com.metamatrix.core.util.StringUtil;
@@ -101,27 +102,27 @@
static {
- objectTypeMap.put(com.metamatrix.admin.api.objects.Cache.class.getName(), new Integer(OBJECT_TYPE_CACHE));
- objectTypeMap.put(com.metamatrix.admin.api.objects.Service.class.getName(), new Integer(OBJECT_TYPE_SERVICE));
- objectTypeMap.put(com.metamatrix.admin.api.objects.ConnectorBinding.class.getName(), new Integer(OBJECT_TYPE_CONNECTOR_BINDING));
- objectTypeMap.put(com.metamatrix.admin.api.objects.ConnectorType.class.getName(), new Integer(OBJECT_TYPE_CONNECTOR_TYPE));
- objectTypeMap.put(com.metamatrix.admin.api.objects.DQP.class.getName(), new Integer(OBJECT_TYPE_DQP));
- objectTypeMap.put(com.metamatrix.admin.api.objects.Entitlement.class.getName(), new Integer(OBJECT_TYPE_ENTITLEMENT));
- objectTypeMap.put(com.metamatrix.admin.api.objects.ExtensionModule.class.getName(), new Integer(OBJECT_TYPE_EXTENSION_MODULE));
- objectTypeMap.put(com.metamatrix.admin.api.objects.Group.class.getName(), new Integer(OBJECT_TYPE_GROUP));
- objectTypeMap.put(com.metamatrix.admin.api.objects.Host.class.getName(), new Integer(OBJECT_TYPE_HOST));
- objectTypeMap.put(com.metamatrix.admin.api.objects.LogConfiguration.class.getName(), new Integer(OBJECT_TYPE_LOG_CONFIGURATION));
- objectTypeMap.put(com.metamatrix.admin.api.objects.Model.class.getName(), new Integer(OBJECT_TYPE_MODEL));
- objectTypeMap.put(com.metamatrix.admin.api.objects.ProcessObject.class.getName(), new Integer(OBJECT_TYPE_PROCESS_OBJECT));
- objectTypeMap.put(com.metamatrix.admin.api.objects.PropertyDefinition.class.getName(), new Integer(OBJECT_TYPE_PROPERTY_DEFINITION));
- objectTypeMap.put(com.metamatrix.admin.api.objects.QueueWorkerPool.class.getName(), new Integer(OBJECT_TYPE_QUEUE_WORKER_POOL));
- objectTypeMap.put(com.metamatrix.admin.api.objects.Request.class.getName(), new Integer(OBJECT_TYPE_REQUEST));
- objectTypeMap.put(com.metamatrix.admin.api.objects.Resource.class.getName(), new Integer(OBJECT_TYPE_RESOURCE));
- objectTypeMap.put(com.metamatrix.admin.api.objects.Role.class.getName(), new Integer(OBJECT_TYPE_ROLE));
- objectTypeMap.put(com.metamatrix.admin.api.objects.Session.class.getName(), new Integer(OBJECT_TYPE_SESSION));
- objectTypeMap.put(com.metamatrix.admin.api.objects.SystemObject.class.getName(), new Integer(OBJECT_TYPE_SYSTEM_OBJECT));
- objectTypeMap.put(com.metamatrix.admin.api.objects.User.class.getName(), new Integer(OBJECT_TYPE_USER));
- objectTypeMap.put(com.metamatrix.admin.api.objects.VDB.class.getName(), new Integer(OBJECT_TYPE_VDB));
+ 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));
}
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminStatus.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminStatus.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminStatus.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,8 +24,9 @@
import java.io.Serializable;
+import org.teiid.adminapi.AdminStatus;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.AdminStatus;
/**
@@ -79,7 +80,7 @@
/**
- * @see com.metamatrix.admin.api.objects.AdminStatus#getCode()
+ * @see org.teiid.adminapi.AdminStatus#getCode()
* @since 4.3
*/
public int getCode() {
@@ -87,7 +88,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.AdminStatus#getMessage()
+ * @see org.teiid.adminapi.AdminStatus#getMessage()
* @since 4.3
*/
public String getMessage() {
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectionPool.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectionPool.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectionPool.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -1,6 +1,6 @@
package com.metamatrix.admin.objects;
-import com.metamatrix.admin.api.objects.ConnectionPool;
+import org.teiid.adminapi.ConnectionPool;
public class MMConnectionPool extends MMAdminObject implements ConnectionPool {
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectorBinding.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectorBinding.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectorBinding.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,8 +24,9 @@
import java.util.Date;
+import org.teiid.adminapi.ConnectorBinding;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.ConnectorBinding;
/**
@@ -220,7 +221,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.ConnectorBinding#getConnectorTypeName()
+ * @see org.teiid.adminapi.ConnectorBinding#getConnectorTypeName()
* @since 4.3
*/
public String getConnectorTypeName() {
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectorType.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectorType.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectorType.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -22,8 +22,9 @@
package com.metamatrix.admin.objects;
+import org.teiid.adminapi.ConnectorType;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.ConnectorType;
/**
* Dataholder for a connector type.
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMDQP.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMDQP.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMDQP.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,8 +24,9 @@
import java.util.Date;
+import org.teiid.adminapi.DQP;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.DQP;
/**
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMExtensionModule.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMExtensionModule.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMExtensionModule.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -22,8 +22,9 @@
package com.metamatrix.admin.objects;
+import org.teiid.adminapi.ExtensionModule;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.ExtensionModule;
/**
* A simple Extension Modules for the Admin API
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMGroup.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMGroup.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMGroup.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -22,7 +22,7 @@
package com.metamatrix.admin.objects;
-import com.metamatrix.admin.api.objects.Group;
+import org.teiid.adminapi.Group;
/**
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMHost.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMHost.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMHost.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -22,8 +22,9 @@
package com.metamatrix.admin.objects;
+import org.teiid.adminapi.Host;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.Host;
/**
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMLogConfiguration.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMLogConfiguration.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMLogConfiguration.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -26,9 +26,10 @@
import java.util.Map;
import java.util.Set;
-import com.metamatrix.admin.api.objects.LogConfiguration;
+import org.teiid.adminapi.LogConfiguration;
+
/**
* @since 4.3
*/
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMModel.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMModel.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMModel.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -25,8 +25,9 @@
import java.util.ArrayList;
import java.util.List;
+import org.teiid.adminapi.Model;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.Model;
/**
*/
@@ -69,7 +70,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.Model#getConnectorBindingNames()
+ * @see org.teiid.adminapi.Model#getConnectorBindingNames()
* @since 4.3
*/
public List getConnectorBindingNames() {
@@ -77,7 +78,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.Model#isPhysical()
+ * @see org.teiid.adminapi.Model#isPhysical()
* @since 4.3
*/
public boolean isPhysical() {
@@ -85,7 +86,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.Model#isVisible()
+ * @see org.teiid.adminapi.Model#isVisible()
* @since 4.3
*/
public boolean isVisible() {
@@ -93,7 +94,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.Model#getModelType()
+ * @see org.teiid.adminapi.Model#getModelType()
* @since 4.3
*/
public String getModelType() {
@@ -101,7 +102,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.Model#getModelURI()
+ * @see org.teiid.adminapi.Model#getModelURI()
* @since 4.3
*/
public String getModelURI() {
@@ -109,7 +110,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.Model#supportsMultiSourceBindings()
+ * @see org.teiid.adminapi.Model#supportsMultiSourceBindings()
* @since 4.3
*/
public boolean supportsMultiSourceBindings() {
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMPrincipal.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMPrincipal.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMPrincipal.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -22,7 +22,7 @@
package com.metamatrix.admin.objects;
-import com.metamatrix.admin.api.objects.Principal;
+import org.teiid.adminapi.Principal;
/**
@@ -60,7 +60,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.Principal#getType()
+ * @see org.teiid.adminapi.Principal#getType()
* @since 4.3
*/
public int getType() {
@@ -68,7 +68,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.Principal#getTypeLabel()
+ * @see org.teiid.adminapi.Principal#getTypeLabel()
* @since 4.3
*/
public String getTypeLabel() {
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMProcess.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMProcess.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMProcess.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,10 +24,11 @@
import java.net.InetAddress;
+import org.teiid.adminapi.AdminObject;
+import org.teiid.adminapi.ProcessObject;
+import org.teiid.adminapi.QueueWorkerPool;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.AdminObject;
-import com.metamatrix.admin.api.objects.ProcessObject;
-import com.metamatrix.admin.api.objects.QueueWorkerPool;
/**
* Data holder for information about a Process.
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMPropertyDefinition.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMPropertyDefinition.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMPropertyDefinition.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -25,8 +25,9 @@
import java.util.ArrayList;
import java.util.Collection;
+import org.teiid.adminapi.PropertyDefinition;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.PropertyDefinition;
/**
@@ -87,7 +88,7 @@
/**
- * @see com.metamatrix.admin.api.objects.PropertyDefinition#getValue()
+ * @see org.teiid.adminapi.PropertyDefinition#getValue()
* @since 4.3
*/
public String getValue() {
@@ -95,7 +96,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.PropertyDefinition#getAllowedValues()
+ * @see org.teiid.adminapi.PropertyDefinition#getAllowedValues()
* @since 4.3
*/
public Collection getAllowedValues() {
@@ -103,7 +104,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.PropertyDefinition#getDefaultValue()
+ * @see org.teiid.adminapi.PropertyDefinition#getDefaultValue()
* @since 4.3
*/
public Object getDefaultValue() {
@@ -111,7 +112,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.PropertyDefinition#getDescription()
+ * @see org.teiid.adminapi.PropertyDefinition#getDescription()
* @since 4.3
*/
public String getDescription() {
@@ -119,7 +120,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.PropertyDefinition#getDisplayName()
+ * @see org.teiid.adminapi.PropertyDefinition#getDisplayName()
* @since 4.3
*/
public String getDisplayName() {
@@ -127,7 +128,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.PropertyDefinition#getPropertyType()
+ * @see org.teiid.adminapi.PropertyDefinition#getPropertyType()
* @since 4.3
*/
public String getPropertyType() {
@@ -135,7 +136,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.PropertyDefinition#getPropertyTypeClassName()
+ * @see org.teiid.adminapi.PropertyDefinition#getPropertyTypeClassName()
* @since 4.3
*/
public String getPropertyTypeClassName() {
@@ -144,7 +145,7 @@
/**
- * @see com.metamatrix.admin.api.objects.PropertyDefinition#getRequiresRestart()
+ * @see org.teiid.adminapi.PropertyDefinition#getRequiresRestart()
* @since 4.3
*/
public RestartType getRequiresRestart() {
@@ -152,7 +153,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.PropertyDefinition#isExpert()
+ * @see org.teiid.adminapi.PropertyDefinition#isExpert()
* @since 4.3
*/
public boolean isExpert() {
@@ -160,7 +161,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.PropertyDefinition#isMasked()
+ * @see org.teiid.adminapi.PropertyDefinition#isMasked()
* @since 4.3
*/
public boolean isMasked() {
@@ -168,7 +169,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.PropertyDefinition#isModifiable()
+ * @see org.teiid.adminapi.PropertyDefinition#isModifiable()
* @since 4.3
*/
public boolean isModifiable() {
@@ -176,7 +177,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.PropertyDefinition#isRequired()
+ * @see org.teiid.adminapi.PropertyDefinition#isRequired()
* @since 4.3
*/
public boolean isRequired() {
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMQueueWorkerPool.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMQueueWorkerPool.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMQueueWorkerPool.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -22,8 +22,9 @@
package com.metamatrix.admin.objects;
+import org.teiid.adminapi.QueueWorkerPool;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.QueueWorkerPool;
/**
* Dataholder for all the statistics gathered about a worker pool.
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMRequest.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMRequest.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMRequest.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,8 +24,9 @@
import java.util.Date;
+import org.teiid.adminapi.Request;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.Request;
import com.metamatrix.core.util.DateUtil;
/**
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMResource.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMResource.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMResource.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -22,8 +22,9 @@
package com.metamatrix.admin.objects;
+import org.teiid.adminapi.Resource;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.Resource;
/**
* Dataholder for a resource.
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMRole.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMRole.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMRole.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,9 +24,10 @@
import java.util.Properties;
-import com.metamatrix.admin.api.objects.Role;
+import org.teiid.adminapi.Role;
+
/**
* @since 4.3
*/
@@ -52,7 +53,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.AdminObject#getIdentifier()
+ * @see org.teiid.adminapi.AdminObject#getIdentifier()
* @since 4.3
*/
public String getIdentifier() {
@@ -60,7 +61,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.AdminObject#getName()
+ * @see org.teiid.adminapi.AdminObject#getName()
* @since 4.3
*/
public String getName() {
@@ -70,7 +71,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.AdminObject#getProperties()
+ * @see org.teiid.adminapi.AdminObject#getProperties()
* @since 4.3
*/
public Properties getProperties() {
@@ -78,7 +79,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.AdminObject#getPropertyValue(java.lang.String)
+ * @see org.teiid.adminapi.AdminObject#getPropertyValue(java.lang.String)
* @since 4.3
*/
public String getPropertyValue(String name) {
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMScriptsContainer.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMScriptsContainer.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMScriptsContainer.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -30,12 +30,13 @@
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.admin.api.exception.AdminComponentException;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
-import com.metamatrix.admin.api.objects.AdminOptions;
-import com.metamatrix.admin.api.objects.ScriptsContainer;
import com.metamatrix.core.util.FileUtils;
@@ -58,7 +59,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.ScriptsContainer#getFileNames()
+ * @see org.teiid.adminapi.ScriptsContainer#getFileNames()
* @since 4.3
*/
public Collection getFileNames() {
@@ -66,7 +67,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.ScriptsContainer#saveAllToDirectory(java.lang.String, AdminOptions)
+ * @see org.teiid.adminapi.ScriptsContainer#saveAllToDirectory(java.lang.String, AdminOptions)
* @since 4.3
*/
public void saveAllToDirectory(String directoryLocation, AdminOptions options) throws AdminException {
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMService.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMService.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMService.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,9 +24,10 @@
import java.util.Date;
+import org.teiid.adminapi.ConnectorBinding;
+import org.teiid.adminapi.Service;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.ConnectorBinding;
-import com.metamatrix.admin.api.objects.Service;
/**
@@ -199,7 +200,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.Service#getComponentTypeName()
+ * @see org.teiid.adminapi.Service#getComponentTypeName()
* @since 6.1
*/
public String getComponentTypeName() {
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMSession.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMSession.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMSession.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,8 +24,9 @@
import java.util.Date;
+import org.teiid.adminapi.Session;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.Session;
import com.metamatrix.core.util.DateUtil;
/**
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMSystem.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMSystem.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMSystem.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,8 +24,9 @@
import java.util.Date;
+import org.teiid.adminapi.SystemObject;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.SystemObject;
import com.metamatrix.core.util.DateUtil;
/**
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMUser.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMUser.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMUser.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -22,7 +22,7 @@
package com.metamatrix.admin.objects;
-import com.metamatrix.admin.api.objects.User;
+import org.teiid.adminapi.User;
/**
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMVDB.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMVDB.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMVDB.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -25,9 +25,10 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
+
+import org.teiid.adminapi.VDB;
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.VDB;
import com.metamatrix.core.util.HashCodeUtil;
/**
@@ -208,7 +209,7 @@
}
/**
- * @see com.metamatrix.admin.api.objects.VDB#hasMaterializedViews()
+ * @see org.teiid.adminapi.VDB#hasMaterializedViews()
* @since 4.3
*/
public boolean hasMaterializedViews() {
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/TransactionImpl.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/TransactionImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/TransactionImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,8 +24,9 @@
import javax.transaction.xa.Xid;
+import org.teiid.adminapi.Transaction;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.objects.Transaction;
import com.metamatrix.common.xa.MMXid;
public class TransactionImpl extends MMAdminObject implements Transaction {
Modified: trunk/client/src/main/java/com/metamatrix/client/ExceptionUtil.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/client/ExceptionUtil.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/client/ExceptionUtil.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,9 +24,10 @@
import java.lang.reflect.Method;
-import com.metamatrix.admin.api.exception.AdminComponentException;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
+import org.teiid.adminapi.AdminComponentException;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.AdminProcessingException;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.MetaMatrixProcessingException;
import com.metamatrix.common.xa.XATransactionException;
Modified: trunk/client/src/main/java/com/metamatrix/common/comm/api/ServerConnectionFactory.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/common/comm/api/ServerConnectionFactory.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/common/comm/api/ServerConnectionFactory.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -22,11 +22,11 @@
package com.metamatrix.common.comm.api;
-import java.net.URL;
import java.util.Properties;
-import com.metamatrix.admin.api.core.Admin;
-import com.metamatrix.admin.api.exception.AdminException;
+import org.teiid.adminapi.Admin;
+import org.teiid.adminapi.AdminException;
+
import com.metamatrix.common.comm.exception.CommunicationException;
import com.metamatrix.common.comm.exception.ConnectionException;
@@ -49,6 +49,6 @@
/**
* Shutdown the connection factory, including the DQP and all its existing connections
*/
- public void shutdown();
+ public void shutdown(boolean restart);
}
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-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/client/ServerAdminFactory.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -28,10 +28,11 @@
import java.lang.reflect.Proxy;
import java.util.Properties;
+import org.teiid.adminapi.Admin;
+import org.teiid.adminapi.AdminComponentException;
+import org.teiid.adminapi.AdminException;
+
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.exception.AdminComponentException;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.server.ServerAdmin;
import com.metamatrix.api.exception.security.LogonException;
import com.metamatrix.client.ExceptionUtil;
import com.metamatrix.common.api.MMURL;
@@ -54,7 +55,7 @@
private final class ReconnectingProxy implements InvocationHandler {
- private ServerAdmin target;
+ private Admin target;
private ServerConnection registry;
private Properties p;
private boolean closed;
@@ -63,7 +64,7 @@
this.p = p;
}
- private synchronized ServerAdmin getTarget() throws AdminComponentException, CommunicationException {
+ private synchronized Admin getTarget() throws AdminComponentException, CommunicationException {
if (closed) {
throw new AdminComponentException(CommPlatformPlugin.Util.getString("ERR.014.001.0001")); //$NON-NLS-1$
}
@@ -75,7 +76,7 @@
} catch (ConnectionException e) {
throw new AdminComponentException(e.getMessage());
}
- target = registry.getService(ServerAdmin.class);
+ target = registry.getService(Admin.class);
return target;
}
@@ -93,8 +94,8 @@
try {
return method.invoke(getTarget(), args);
} catch (InvocationTargetException e) {
- if (method.getName().endsWith("bounceSystem") && ExceptionUtil.getExceptionOfType(e, CommunicationException.class) != null) { //$NON-NLS-1$
- bounceSystem(((Boolean)args[0]).booleanValue());
+ if (method.getName().endsWith("restart") && ExceptionUtil.getExceptionOfType(e, CommunicationException.class) != null) { //$NON-NLS-1$
+ bounceSystem(true);
return null;
}
throw e.getTargetException();
@@ -174,7 +175,7 @@
* @throws LogonException
* @since 4.3
*/
- public ServerAdmin createAdmin(String userName,
+ public Admin createAdmin(String userName,
char[] password,
String serverURL) throws AdminException {
@@ -194,7 +195,7 @@
* @throws LogonException
* @since 4.3
*/
- public ServerAdmin createAdmin(String userName,
+ public Admin createAdmin(String userName,
char[] password,
String serverURL,
String applicationName) throws AdminException {
@@ -213,12 +214,12 @@
return createAdmin(p);
}
- public ServerAdmin createAdmin(Properties p) {
+ public Admin createAdmin(Properties p) {
p = PropertiesUtils.clone(p);
p.remove(MMURL.JDBC.VDB_NAME);
p.remove(MMURL.JDBC.VDB_VERSION);
p.setProperty(MMURL.CONNECTION.AUTO_FAILOVER, Boolean.TRUE.toString());
- ServerAdmin serverAdmin = (ServerAdmin)Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class[] { ServerAdmin.class }, new ReconnectingProxy(p));
+ Admin serverAdmin = (Admin)Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class[] { Admin.class }, new ReconnectingProxy(p));
return serverAdmin;
}
Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/AdminApiServerDiscovery.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/AdminApiServerDiscovery.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/AdminApiServerDiscovery.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -30,9 +30,10 @@
import java.util.Map;
import java.util.Properties;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.objects.ProcessObject;
-import com.metamatrix.admin.api.server.ServerAdmin;
+import org.teiid.adminapi.Admin;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.ProcessObject;
+
import com.metamatrix.common.api.HostInfo;
import com.metamatrix.common.api.MMURL;
import com.metamatrix.platform.security.api.LogonResult;
@@ -79,7 +80,7 @@
synchronized (info) {
if (instance != null
&& (info.lastDiscoveryTime < System.currentTimeMillis() - DISCOVERY_TIMEOUT || info.knownHosts.isEmpty())) {
- ServerAdmin serverAdmin = instance.getService(ServerAdmin.class);
+ Admin serverAdmin = instance.getService(Admin.class);
try {
Collection<ProcessObject> processes = serverAdmin.getProcesses("*");
info.knownHosts.clear();
Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnectionFactory.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnectionFactory.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnectionFactory.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -43,8 +43,9 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import com.metamatrix.admin.api.core.Admin;
-import com.metamatrix.admin.api.exception.AdminException;
+import org.teiid.adminapi.Admin;
+import org.teiid.adminapi.AdminException;
+
import com.metamatrix.common.api.HostInfo;
import com.metamatrix.common.api.MMURL;
import com.metamatrix.common.comm.api.ServerConnectionFactory;
@@ -299,7 +300,7 @@
}
@Override
- public void shutdown() {
+ public void shutdown(boolean restart) {
// only applies in the Embedded scenario.
}
Copied: trunk/client/src/main/java/org/teiid/adminapi/Admin.java (from rev 1088, trunk/client/src/main/java/com/metamatrix/admin/api/core/Admin.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/Admin.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/Admin.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,40 @@
+/*
+ * 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 com.metamatrix.admin.RolesAllowed;
+
+
+/**
+ * Marker interface for all MetaMatrix administration - core.
+ *
+ * @since 4.3
+ */
+public interface Admin extends ConfigurationAdmin, MonitoringAdmin, RuntimeStateAdmin, SecurityAdmin {
+ /**
+ * Closes connection.
+ * @since 4.3
+ */
+ @RolesAllowed(value=AdminRoles.RoleName.ANONYMOUS)
+ void close();
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/AdminComponentException.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminComponentException.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/AdminComponentException.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/AdminComponentException.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,75 @@
+/*
+ * 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;
+
+
+/**
+ * An <code>AdminComponentException</code> is thrown when an error occurs as a
+ * result of an internal component error.
+ *
+ * <p>This exception class is capable of containing multiple exceptions. See
+ * {@link AdminException} for details.
+ */
+public final class AdminComponentException extends AdminException {
+
+ /**
+ * No-arg ctor.
+ *
+ * @since 4.3
+ */
+ public AdminComponentException() {
+ super();
+ }
+
+ /**
+ * Construct with a message.
+ * @param msg the error message.
+ * @since 4.3
+ */
+ public AdminComponentException(String msg) {
+ super(msg);
+ }
+
+ public AdminComponentException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Construct with an optional error code and a message.
+ * @param code an optional error code
+ * @param msg the error message.
+ * @since 4.3
+ */
+ public AdminComponentException(int code, String msg) {
+ super(code, msg);
+ }
+
+ public AdminComponentException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+
+ public AdminComponentException(int code, String msg, Throwable cause) {
+ super(code, msg, cause);
+ }
+
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/AdminException.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminException.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/AdminException.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/AdminException.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,123 @@
+/*
+ * 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.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.metamatrix.core.MetaMatrixCoreException;
+
+/**
+ * <code>AdminException</code> is the base exception for the admin package. Many *Admin methods throw this
+ * exception. Instances will be one of the concrete subtypes:
+ * {@link AdminComponentException} or {@link AdminProcessingException}</p>
+ *
+ * <p><code>AdminException</code>s may contain multiple child exceptions. An example
+ * of this could be when performing an admin action results in multiple failures. Admin
+ * clients should be aware of this and use the {@link #hasMultiple()} method to
+ * determine if they need to check the child exceptions.</p>
+ */
+public abstract class AdminException extends MetaMatrixCoreException {
+
+ // List of Admin exceptions in
+ // case of multiple failure
+ private List children;
+
+ /**
+ * No-arg ctor.
+ *
+ * @since 4.3
+ */
+ AdminException() {
+ super();
+ }
+
+ /**
+ * Construct with a message.
+ * @param msg the error message.
+ * @since 4.3
+ */
+ AdminException(String msg) {
+ super(msg);
+ }
+
+ AdminException(Throwable cause) {
+ this(cause.getMessage(), cause);
+ }
+
+ /**
+ * Construct with an optional error code and a message.
+ * @param code an optional error code
+ * @param msg the error message.
+ * @since 4.3
+ */
+ AdminException(int code, String msg) {
+ super(Integer.toString(code), msg);
+ }
+
+ AdminException(String msg, Throwable cause) {
+ super(cause, msg);
+ }
+
+ AdminException(int code, String msg, Throwable cause) {
+ super(cause, Integer.toString(code),msg);
+ }
+
+ /**
+ * Determine whether this exception is representing
+ * mutliple component failures.
+ * @return <code>true</code> iff this exception contains multiple
+ * component failure exceptions.
+ * @since 4.3
+ */
+ public boolean hasMultiple() {
+ return (children != null && children.size() > 0);
+ }
+
+ /**
+ * Returns a non-null list of failures (<code>AdminException</code>s), one for each
+ * component that failed.
+ *
+ * <p>The list will have members when {@link #hasMultiple()} returns <code>true</code>.</p>
+ * @return The non-null list of failures.
+ * @since 4.3
+ */
+ public List getChildren() {
+ return (children != null ? children : Collections.EMPTY_LIST);
+ }
+
+ /**
+ * Add a child <code>AdminException</code> for a particular failure
+ * if and action resulted in multiple failures.
+ *
+ * @param child a specific failure
+ * @since 4.3
+ */
+ public void addChild(AdminException child) {
+ if ( children == null ) {
+ children = new ArrayList();
+ }
+ children.add(child);
+ }
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/AdminObject.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/AdminObject.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/AdminObject.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/AdminObject.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,116 @@
+/*
+ * 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.Properties;
+
+/**
+ * Base interface of client side admin objects. Specifies behaviors and properties common to all administrative objects.
+ * <p>
+ * Unique identifiers are available for all <code>AdminObject</code>s and their forms are specific to each object. See
+ * the javadoc on the individual object for its particular identifier pattern required.
+ * </p>
+ * <p>
+ * This interface need not be used directly by clients except when coding to constants.
+ * </p>
+ *
+ * @since 4.3
+ */
+public interface AdminObject {
+
+ /**
+ * The character that delimits the atomic components of the identifier.
+ * @see #DELIMITER
+ */
+ public static final char DELIMITER_CHAR = '|';
+
+ /**
+ * The character (as a <code>String</code>) that delimits the atomic components of the identifier.
+ *
+ * <p>It is <emph>strongly</emph> advisable to write admin client code using this <code>DELIMITER</code>
+ * rather than hard-coding a delimiter character in admin code. Doing this eliminates the possibility
+ * of admin client code breaking if/when the delimiter character must be changed.</p>
+ */
+ public static final String DELIMITER = new String(new char[] {DELIMITER_CHAR});
+
+ /**
+ * The delimiter character as a <code>String</code> escaped.
+ * @see #DELIMITER
+ */
+ public static final String ESCAPED_DELIMITER = "\\" + DELIMITER; //$NON-NLS-1$
+
+ /**
+ * The wildcard character (as a <code>String</code>) that can be used in may identifier patterns
+ * to indicate <i>"anything"</i> or, more specifically, replace <i>"zero or more"</i>
+ * identifier components.
+ *
+ * <p>It is <emph>strongly</emph> advisable to write admin client code using this <code>WILDCARD</code>
+ * rather than hard-coding a wildcard character in admin code. Doing this eliminates the possibility
+ * of admin client code breaking if/when the wildcard character must be changed.</p>
+ */
+ public static final String WILDCARD = "*"; //$NON-NLS-1$
+
+ /**
+ * The wildcard character as a <code>String</code> escaped.
+ * @see #WILDCARD
+ */
+ public static final String ESCAPED_WILDCARD = "\\" + WILDCARD; //$NON-NLS-1$
+
+
+ /**
+ * Get the Full Name for this AdminObject. This identifier will uniquely identify this object in the Teiid
+ * system.
+ *
+ * @return String the unique Identifier
+ * @since 4.3
+ */
+ String getIdentifier();
+
+ /**
+ * Get the name for this AdminObject, usually the last component of the identifier.
+ *
+ * @return String Name
+ * @since 4.3
+ */
+ String getName();
+
+ /**
+ * Get the Configuration Properties that defines this process
+ *
+ * @return Properties
+ * @since 4.3
+ */
+ Properties getProperties();
+
+ /**
+ * Searches for the property with the specified key in this Admin Object. If the key is not found the method returns
+ * <code>null</code>.
+ *
+ * @param name
+ * the property key.
+ * @return the value in this Admin Object with the specified key value.
+ * @since 4.3
+ */
+
+ String getPropertyValue(String name);
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/AdminOptions.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/AdminOptions.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/AdminOptions.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/AdminOptions.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,194 @@
+/*
+ * 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 com.metamatrix.admin.AdminPlugin;
+
+
+/**
+ * Creates, collects and stores option values for evaluation when
+ * executing methods where decisions should be made based on user preferences.
+ * <p>
+ * Method of use is to create with an option and use the method {@link #addOption(int)}
+ * when more than one option is wished or required.</p>
+ * <p>
+ * <b>Example:</b>
+ * <pre>
+ * AdminOptions options = new AdminOptions(AdminOptions.OnConflict.OVERWRITE);
+ * options.addOption(BINDINGS_IGNORE_DECRYPT_ERROR);
+ * </pre></p>
+ * @since 4.3
+ */
+public class AdminOptions implements Serializable {
+
+ // *************************************************************************
+ // When adding an option to this interface, don't forget to
+ // add the corresponding string to the toString() method
+ // and to the ALLOWABLE_OPTIONS bitmask below.
+ // *************************************************************************
+
+ /**
+ * In the case when adding resource to the system, if the resource already
+ * exists in the system, these modes define how to handle the situation.
+ */
+ public interface OnConflict {
+
+ /**
+ * Add all bindings in this file and overwrite any
+ * bindings that already exist in the system.
+ * <p><b>NOTE</b>: This will result in a {@link VDB} with
+ * a status of {@link VDB#INACTIVE} or
+ * {@link VDB#ACTIVE}.</p>
+ */
+ public static final int OVERWRITE= 1;
+
+ /**
+ * Don't add any existing bindings contained in this file
+ * (don't update/replace ones that already exist). This
+ * will <i>not</i> keep any new bindings specified from being
+ * added.
+ * <p><b>NOTE</b>: This will result in a {@link VDB} with
+ * a status of {@link VDB#INACTIVE} or
+ * {@link VDB#ACTIVE}.</p>
+ */
+ public static final int IGNORE = 2;
+
+ /**
+ * If there is conflict in the bindings then return with
+ * an exception
+ * <p><b>NOTE</b>: This will result in a {@link VDB} with
+ * a status of {@link VDB#INCOMPLETE} if all models in
+ * the VDB are not bound.</p>
+ */
+ public static final int EXCEPTION = 4;
+ }
+
+ /**
+ * Connector bindings have encrypted passwords as connection
+ * properties. If the password property cannot be decrypted,
+ * the connector binding will not start until the connector
+ * binding password property is changed.
+ * <p>Adding a VDB with this option allows the VDB and its
+ * connector bindings to be added and persisted to the system
+ * configuration, even if the connector binding properties
+ * cannot be decrypted. Users should set the password property
+ * on all connectors added after using this option.</p>
+ * <p><b>NOTE</b>: This will result in a {@link VDB} with
+ * a status of {@link VDB#INACTIVE}.</p>
+ */
+ public static final int BINDINGS_IGNORE_DECRYPT_ERROR = 8;
+
+// =======================================================================================
+// End Options Interface
+// =======================================================================================
+
+ private static final int ALLOWABLEOPTIONS = OnConflict.OVERWRITE |
+ OnConflict.IGNORE |
+ OnConflict.EXCEPTION |
+ BINDINGS_IGNORE_DECRYPT_ERROR;
+
+ // A bitmask for multiple options
+ private int optionsMask;
+
+ /**
+ * Construct with an option. For available options, see
+ * {@link AdminOptions}.
+ * <p>
+ * <b>Note</b>: A RutimeException is thrown for any option given
+ * that is not found in the interface.</p>
+ *
+ * @param option One of the available options in {@link AdminOptions}.
+ * @throws RuntimeException for any option given that is not
+ * found in the interface.
+ * @since 4.3
+ */
+ public AdminOptions(int option) throws RuntimeException {
+ super();
+
+ addOption(option);
+ }
+
+ /**
+ * Add an option to this object if multiple options are required.
+ * <p>
+ * <b>Note</b>: A RutimeException is thrown for any option given
+ * that is not found in the interface.</p>
+ *
+ * @param anOption the option to add.
+ * @throws RuntimeException for any option given that is not
+ * found in the interface.
+ * @since 4.3
+ */
+ public void addOption(int anOption) {
+ if (anOption != 0 && (ALLOWABLEOPTIONS & anOption) == anOption) {
+ this.optionsMask |= anOption;
+ } else {
+ throw new RuntimeException(AdminPlugin.Util.getString("AdminOptions.Unknown_option", new Object[] {"" + anOption})); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ }
+
+ /**
+ * Check if the given option was specified.
+ *
+ * @param anOption the option to check.
+ * @return <code>true</true> iff this opject contains the
+ * geven option.
+ * @since 4.3
+ */
+ public boolean containsOption(int anOption) {
+ return (this.optionsMask & anOption) == anOption;
+ }
+
+ /**
+ * @see java.lang.Object#toString()
+ * @since 4.3
+ */
+ public String toString() {
+ StringBuffer optionString = new StringBuffer("["); //$NON-NLS-1$
+
+ if ( (optionsMask & OnConflict.OVERWRITE) == OnConflict.OVERWRITE ) {
+ optionString.append("OnConflict_OVERWRITE, "); //$NON-NLS-1$
+ }
+ if ( (optionsMask & OnConflict.IGNORE) == OnConflict.IGNORE ) {
+ optionString.append("OnConflict_IGNORE, "); //$NON-NLS-1$
+ }
+ if ( (optionsMask & OnConflict.EXCEPTION) == OnConflict.EXCEPTION ) {
+ optionString.append("OnConflict_EXCEPTION, "); //$NON-NLS-1$
+ }
+ if ( (optionsMask & BINDINGS_IGNORE_DECRYPT_ERROR) == BINDINGS_IGNORE_DECRYPT_ERROR ) {
+ optionString.append("BINDINGS_IGNORE_DECRYPT_ERROR, "); //$NON-NLS-1$
+ }
+
+ if ( optionString.length() == 1 ) {
+ optionString.append("UNKNOWN"); //$NON-NLS-1$
+ } else if (optionString.length() > 2 && optionString.charAt(optionString.length() - 2) == ',' ) {
+ optionString.setLength(optionString.length() - 2);
+ }
+
+ optionString.append(']');
+ return optionString.toString();
+ }
+
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/AdminProcessingException.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminProcessingException.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/AdminProcessingException.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/AdminProcessingException.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,76 @@
+/*
+ * 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;
+
+
+/**
+ * An <code>AdminProcessingException</code> indicates that an error occured during processing as a result
+ * of user input. This exception is the result of handling an invalid user
+ * request, not the result of an internal error.</p>
+ *
+ * <p>This exception class is capable of containing multiple exceptions. See
+ * {@link AdminException} for details.
+ */
+public final class AdminProcessingException extends AdminException {
+
+ /**
+ * No-arg ctor.
+ *
+ * @since 4.3
+ */
+ public AdminProcessingException() {
+ super();
+ }
+
+ /**
+ * Construct with a message.
+ * @param msg the error message.
+ * @since 4.3
+ */
+ public AdminProcessingException(String msg) {
+ super(msg);
+ }
+
+ public AdminProcessingException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Construct with an optional error code and a message.
+ * @param code an optional error code
+ * @param msg the error message.
+ * @since 4.3
+ */
+ public AdminProcessingException(int code, String msg) {
+ super(code, msg);
+ }
+
+ public AdminProcessingException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+
+ public AdminProcessingException(int code, String msg, Throwable cause) {
+ super(code, msg, cause);
+ }
+
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/AdminRoles.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/server/AdminRoles.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/AdminRoles.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/AdminRoles.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,79 @@
+/*
+ * 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.HashSet;
+import java.util.Set;
+
+/**
+ * Static class that lists the roles allowable in the MetaMatrix system.
+ *
+ * <p>This class can be used to get a list of all allowable administrative role
+ * names or the name of one role to assign to a principal.</p>
+ * @since 4.3
+ */
+public class AdminRoles {
+ private static final Set roleSet;
+
+ static {
+ roleSet = new HashSet();
+ roleSet.add(RoleName.ADMIN_SYSTEM);
+ roleSet.add(RoleName.ADMIN_PRODUCT);
+ roleSet.add(RoleName.ADMIN_READONLY);
+ }
+
+ /**
+ * Get the set of static MetaMatrix administrative roles known to the system.
+ * @return the <code>Set</code> of <code>String</code> role names.
+ * @since 4.3
+ */
+ public static Set getAllRoleNames() {
+ return roleSet;
+ }
+
+ /**
+ * Determine whether an admin role exists by the given <code>roleName</code>.
+ * @param roleName the name for which to validate.
+ * @return <code>true</code> iff an admin role exists with the given role name.
+ * @since 4.3
+ */
+ public static boolean containsRole(String roleName) {
+ return roleSet.contains(roleName);
+ }
+
+ /**
+ * Static class that defines defines the allowed administrative roles
+ * for the MetaMatrix system.
+ * @since 4.3
+ */
+ public static class RoleName {
+ /** System admin role name */
+ public static final String ADMIN_SYSTEM = "Admin.SystemAdmin"; //$NON-NLS-1$
+ /** Product admin role name */
+ public static final String ADMIN_PRODUCT = "Admin.ProductAdmin"; //$NON-NLS-1$
+ /** Read-only admin role name */
+ public static final String ADMIN_READONLY = "Admin.ReadOnlyAdmin"; //$NON-NLS-1$
+
+ public static final String ANONYMOUS = "Anonymous"; //$NON-NLS-1$
+ }
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/AdminStatus.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/AdminStatus.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/AdminStatus.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/AdminStatus.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -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 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();
+
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/Cache.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/Cache.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/Cache.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/Cache.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,54 @@
+/*
+ * 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 cache in the MetaMatrix system.
+ *
+ * <p>An idetiifer for cache is specifically represented by a name. All the
+ * different kinds of available cache are listed as enumerations on this interface.
+ * </p>
+ * @since 4.3
+ */
+public interface Cache extends
+ AdminObject {
+
+ /**
+ *
+ */
+ public static final String CODE_TABLE_CACHE = "CodeTableCache"; //$NON-NLS-1$
+ /**
+ *
+ */
+ public static final String PREPARED_PLAN_CACHE = "PreparedPlanCache"; //$NON-NLS-1$
+ /**
+ *
+ */
+ public static final String QUERY_SERVICE_RESULT_SET_CACHE = "QueryServiceResultSetCache"; //$NON-NLS-1$
+ /**
+ *
+ */
+ public static final String CONNECTOR_RESULT_SET_CACHE = "ConnectorResultSetCache"; //$NON-NLS-1$
+
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/ConfigurationAdmin.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreConfigAdmin.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/ConfigurationAdmin.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/ConfigurationAdmin.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,395 @@
+/*
+ * 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.Properties;
+
+import com.metamatrix.admin.RolesAllowed;
+
+
+/**
+ * This interface describes the methods to configure MetaMatrix.
+ *
+ * <p>As a <i>core</i> interface,
+ * this administration is common to both the MetaMatrix server and MM Query.</p>
+ * @since 4.3
+ */
+ at 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
+ * Name of the ConnectorBinding
+ * @param vdbName
+ * Name of the VDB
+ * @param vdbVersion
+ * Version of the VDB
+ * @param modelName
+ * Name of the Model to map Connector Binding
+ * @throws AdminException
+ * if there's a system error or if there's a user input error.
+ * @since 4.3
+ */
+ void assignBindingToModel(String connectorBindingName,
+ String vdbName,
+ String vdbVersion,
+ String modelName) throws AdminException;
+
+ void assignBindingsToModel(String[] connectorBindingName,
+ String vdbName,
+ String vdbVersion,
+ 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".
+ * @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;
+
+
+ /**
+ * 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
+ * of the Connector Type to add
+ * @param cdkFile
+ * contents of File from Client
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void addConnectorType(String name, char[] cdkFile) throws AdminException;
+
+ /**
+ * Add Connector Type and all the required extension modules required by the
+ * this connector type into the system from the given file byte stream which is
+ * encoded inthe Connector Archive format.
+ *
+ * @param archiveContents contents of File
+ * @param options resolution option in case of conflict in the connector type
+ * @throws AdminException if there's a system error.
+ * @since 4.3.2
+ */
+ void addConnectorArchive(byte[] archiveContents, AdminOptions options ) throws AdminException;
+
+ /**
+ * Delete Connector Type from Next Configuration
+ *
+ * @param name String name of the Connector Type to delete
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void deleteConnectorType(String name) throws AdminException;
+
+ /**
+ * Deploy a {@link ConnectorBinding} to Configuration
+ *
+ * @param name
+ * is the Connector Binding name that will be added to Configuration
+ * @param connectorTypeIdentifier
+ * Name of the Connector Type
+ * @param properties
+ * Name & Value pair need to deploy the Connector Binding
+ * @param options The perferred options when executing this method. There are choices about
+ * what to do when a connector binding with the given identifier already exists in the system.
+ * See the interface {@link AdminOptions.OnConflict} for details.
+ * <p>
+ * Another option is to ignore a binding connection password decrypt error, when adding a connector
+ * binding whose password was encrypted with a different keystore, so that the new password property
+ * can be set after the connector binding has been added.</p>
+ * @throws AdminException
+ * if there's a system error.
+ * @return the {@link ConnectorBinding} representing the current property values and runtime state.
+ * Note that if this is a system with multiple Processes, this method may actually create multiple deployed
+ * Connector Bindings (one for each process). This method will return one of them, arbitrarily.
+ * @since 4.3
+ */
+ ConnectorBinding addConnectorBinding(String name,
+ String connectorTypeIdentifier,
+ Properties properties, AdminOptions options) throws AdminException;
+
+ /**
+ * Import a {@link ConnectorBinding} into the Configuration.
+ *
+ * @param name
+ * is the Connector Binding name that will be added to Configuration
+ * @param xmlFile
+ * contents of XML file that will be sent to the server.
+ * @param options The perferred options when executing this method. There are choices about
+ * what to do when a connector binding with the given identifier already exists in the system.
+ * See the interface {@link AdminOptions.OnConflict} for details.
+ * <p>
+ * Another option is to ignore a binding connection password decrypt error, when adding a connector
+ * binding whose password was encrypted with a different keystore, so that the new password property
+ * can be set after the connector binding has been added.</p>
+ * @throws AdminException
+ * if there's a system error.
+ * @return the {@link ConnectorBinding} representing the current property values and runtime state.
+ * Note that if this is a system with multiple Processes, this method may actually create multiple deployed
+ * Connector Bindings (one for each process). This method will return one of them, arbitrarily.
+ * @since 4.3
+ */
+ ConnectorBinding addConnectorBinding(String name,
+ char[] xmlFile, AdminOptions options) throws AdminException;
+
+ /**
+ * Delete the {@link ConnectorBinding} from the Configuration
+ *
+ * @param connectorBindingIdentifier
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void deleteConnectorBinding(String connectorBindingIdentifier) throws AdminException;
+
+ /**
+ * Import a {@link VDB} file.
+ * <br>A VDB file with internal definitions. Thise is the default VDB export configuration
+ * begining with MetaMatrix version 4.3.</br>
+ *
+ * @param name
+ * VDB Name
+ * @param vdbFile
+ * byte array of the VDB Archive
+ * @param options The perferred options when executing this method. There are choices about
+ * what to do when a connector binding with the given identifier already exists in the system.
+ * @throws AdminException
+ * if there's a system error.
+ * @return the {@link VDB} representing the current property values and runtime state.
+ * @since 4.3
+ */
+ VDB addVDB(String name,
+ byte[] vdbFile, AdminOptions options) throws AdminException;
+
+ /**
+ * Get the {@link LogConfiguration}
+ *
+ * @return LogConfiguration object
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ @RolesAllowed(value=AdminRoles.RoleName.ADMIN_READONLY)
+ LogConfiguration getLogConfiguration() throws AdminException;
+
+ /**
+ * Set the {@link LogConfiguration} in the MetaMatrix Server
+ *
+ * @param config
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void setLogConfiguration(LogConfiguration config) throws AdminException;
+
+ /**
+ * Adds an {@link ExtensionModule} to the end of the list of modules.
+ * <br><i>All caches (of Class objects) are cleared.</i></br>
+ *
+ * @param type
+ * one of the known types of extension file
+ * @param sourceName
+ * name (e.g. filename) of extension module
+ * @param source
+ * actual contents of module
+ * @param description
+ * (optional) description of the extension module - may be null
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void addExtensionModule(String type,
+ String sourceName,
+ byte[] source,
+ String description) throws AdminException;
+
+ /**
+ * Deletes an {@link ExtensionModule} from the list of modules.
+ * <br><i>All caches (of Class objects) are cleared.</i></br>
+ *
+ * @param sourceName
+ * name (e.g. filename) of extension module
+ * @throws AdminException
+ * if there's a system error.
+ */
+ void deleteExtensionModule(String sourceName) throws AdminException;
+
+ /**
+ * Export an {@link ExtensionModule} to byte array
+ *
+ * @param sourceName unique identifier for the {@link ExtensionModule}.
+ * @return byte array of the extension module
+ * @throws AdminException
+ * @since 4.3
+ */
+ byte[] exportExtensionModule(String sourceName) throws AdminException;
+
+ /**
+ * Export Configuration to character Array in XML format
+ *
+ * @return character array of Configuration
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ char[] exportConfiguration() throws AdminException;
+
+ /**
+ * Export a {@link ConnectorBinding} to character Array in XML format
+ *
+ * @param connectorBindingIdentifier the unique identifier for a {@link ConnectorBinding}.
+ * @return character Array in XML format
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ char[] exportConnectorBinding(String connectorBindingIdentifier) throws AdminException;
+
+ /**
+ * Export Connector Type to character array
+ *
+ * @param connectorTypeIdentifier the unique identifier for for a {@link ConnectorType}
+ * @return character Array in XML format
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ char[] exportConnectorType(String connectorTypeIdentifier) throws AdminException;
+
+ /**
+ * Export Connector Archive, which is bundled connector type with its xml
+ * properties file and all the extension modules required by the this connector type
+ *
+ * @param connectorTypeIdentifier the unique identifier for for a {@link ConnectorType}
+ * @return byte array of the connector archive.
+ * @throws AdminException if there's a system error.
+ * @since 4.3.2
+ */
+ byte[] exportConnectorArchive(String connectorTypeIdentifier) throws AdminException;
+
+ /**
+ * Export VDB to byte array
+ *
+ * @param name identifier of the {@link VDB}
+ * @param version {@link VDB} version
+ * @return byte array of the MetaMatrix VDB Archive
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ byte[] exportVDB(String name, String version) throws AdminException;
+
+
+ /**
+ * Add User Defined Function model to the system. If one is already deployed before this
+ * will replace the previous, otherwise add this as the new UDF model. Once the UDF is added
+ * the new UDF model is loaded.
+ * @param modelFileContents - UDF contents
+ * @param classpath - classpath for the UDF
+ * @throws AdminException
+ */
+ void addUDF(byte[] modelFileContents, String classpath) throws AdminException;
+
+ /**
+ * Delete the User Defined Function model. Note that this will not delete any supporting
+ * extension jar files added, those need to be deleted separately.
+ * @throws AdminException
+ */
+ void deleteUDF() throws AdminException;
+
+ /**
+ * Indicates that an extension module has changed
+ * @throws AdminException
+ * @since 6.1.0
+ */
+ void extensionModuleModified(String name) throws AdminException;
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/ConnectionPool.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/ConnectionPool.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/ConnectionPool.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/ConnectionPool.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,69 @@
+/*
+ * 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;
+
+
+/**
+ * This object holds the statisics for a ConnectionPool that is being utilized by a Connector.
+ * As per how many available connections
+ * processed etc.
+ * <p>An identifier for QueueWorkerPool, is nothing but the modules it self, like "DQP",
+ * "QueryService" or Connector Binding names etc.</p>
+ *
+ * @since 4.3
+ */
+public interface ConnectionPool extends AdminObject {
+ /**
+ * @return Returns total number of current connections in the Connection Pool
+ * @since 6.1
+ */
+ public int getTotalConnections();
+
+ /**
+ * @return Returns the number of connections waiting for use in the connection pool.
+ * @since 6.1
+ */
+ public int getConnectionsWaiting();
+
+ /**
+ * @return Returns the number of Connections currently in use by clients.
+ *
+ * @since 6.1
+ */
+ public int getConnectionsInuse();
+
+ /**
+ * @return Returns the number of Connections created since the Connection Pool was created.
+ * @since 6.1
+ */
+ long getConnectionsCreated();
+
+
+ /**
+ * @return The number of Connections destroyed since the Connection Pool was created.
+ */
+ long getConnectionsDestroyed();
+
+
+
+}
Property changes on: trunk/client/src/main/java/org/teiid/adminapi/ConnectionPool.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/client/src/main/java/org/teiid/adminapi/ConnectorBinding.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/ConnectorBinding.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/ConnectorBinding.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/ConnectorBinding.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,110 @@
+/*
+ * 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 connector binding (the instance of a connector type) in the MetaMatrix system.
+ *
+ * <p>The unique identifier pattern is [host]<{@link #DELIMITER}>[process]<{@link #DELIMITER}>[Connector Binding Name]
+ * when running against a MetaMatrix server. The [Connector Binding Name] can itself have spaces in the name.
+ * In the case of the MM Query, the [host] and [process] do not apply as MM Query is always local.</p>
+ *
+ * @since 4.3
+ */
+public interface ConnectorBinding 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;
+
+ /** Password connector property name */
+ 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}.
+ * @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 identifier for this connector binding's {@link ConnectorType}.
+ * @return the Connector Type identifier which can be used to
+ * find the ConnectorType.
+ * @since 4.3
+ */
+ String getConnectorTypeName();
+
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/ConnectorType.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/ConnectorType.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/ConnectorType.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/ConnectorType.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,40 @@
+/*
+ * 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 connector type in the MetaMatrix system.
+ *
+ * <p>{@link ConnectorBinding}s are instances of a connector type.</p>
+ *
+ * <p>The identifier pattern for a connector type is simply the name
+ * of the connector type. Usally name consistes of multiple words with spaces in between
+ * for example: "Loopback Connector"
+ * </p>
+ *
+ * @since 4.3
+ */
+public interface ConnectorType extends AdminObject {
+
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/DQP.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/DQP.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/DQP.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/DQP.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,88 @@
+/*
+ * 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();
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/EmbeddedLogger.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedLogger.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/EmbeddedLogger.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/EmbeddedLogger.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,83 @@
+/*
+ * 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;
+
+
+/**
+ * Custom logging interface that provides a hook for custom implementations to log messages
+ * produced by MM Query.
+ * @since 4.3
+ */
+public interface EmbeddedLogger {
+
+ /**
+ * Message level value that specifies that no messages are to be recorded.
+ */
+ public static final int NONE = 0;
+
+ /**
+ * Message level value that specifies that critical messages are to be recorded.
+ */
+ public static final int CRITICAL = 1;
+
+ /**
+ * Message level value that specifies that error messages and critical
+ * messages are to be recorded.
+ */
+ public static final int ERROR = 2;
+
+ /**
+ * Message level value that specifies that warning, error and critical
+ * messages are to be recorded.
+ */
+ public static final int WARNING = 3;
+
+ /**
+ * Message level value that specifies that information, warning, error and critical
+ * messages are to be recorded.
+ */
+ public static final int INFO = 4;
+
+ /**
+ * Message level value that specifies that detailed, information, warning, error and critical
+ * messages are to be recorded.
+ */
+ public static final int DETAIL = 5;
+
+ /**
+ * Message level value that specifies that all messages are to be recorded.
+ */
+ public static final int TRACE = 6;
+
+ /**
+ * Logs the given message if the current logging level is >= the logLevel parameter.
+ * @param logLevel logging level for this message
+ * @param timestamp timestamp at which this log message was generated
+ * @param componentName name of the component that generated this message
+ * @param threadName name of the thread that generated this message
+ * @param message message body. May be null.
+ * @param throwable exception thrown. May be null.
+ * @since 4.3
+ */
+ void log(int logLevel, long timestamp, String componentName, String threadName, String message, Throwable throwable);
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/Entitlement.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/Entitlement.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/Entitlement.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/Entitlement.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package org.teiid.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);
+
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/ExtensionModule.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/ExtensionModule.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/ExtensionModule.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/ExtensionModule.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,103 @@
+/*
+ * 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;
+
+
+/**
+ * An extension module is a library (usually in jar format) that extends
+ * the MetaMatrix system in some way. Classes of a custom connector can
+ * be added as an extension module.
+ *
+ * <p> The unique identifier pattern for the extension module is generally
+ * the name of the jar file since it applies system wide. Example: <code>MJjdbc.jar</code>
+ * @since 4.3
+ */
+public interface ExtensionModule extends AdminObject {
+
+ /**
+ * The name of the JAR file type of extension
+ * module - this is the only type of
+ * extension module that can be searched
+ * for Class objects
+ */
+ public static final String JAR_FILE_TYPE = "JAR File"; //$NON-NLS-1$
+
+ /**
+ * The name of the Metadata Keyword type of
+ * extension module.
+ */
+ public static final String METADATA_KEYWORD_TYPE = "Metadata Keyword"; //$NON-NLS-1$
+
+ /**
+ * The name of the Metamodel Extension type of
+ * extension module.
+ */
+ public static final String METAMODEL_EXTENSION_TYPE = "Metamodel Extension"; //$NON-NLS-1$
+
+ /**
+ * The name of the Function Definition type of
+ * extension module.
+ */
+ public static final String FUNCTION_DEFINITION_TYPE = "Function Definition"; //$NON-NLS-1$
+
+ /**
+ * The name of the Configuration Model type of
+ * extension module.
+ */
+ public static final String CONFIGURATION_MODEL_TYPE = "Configuration Model"; //$NON-NLS-1$
+
+ /**
+ * The name of the VDB File type of extension module.
+ */
+ public static final String VDB_FILE_TYPE = "VDB File"; //$NON-NLS-1$
+
+ /**
+ * The name of the Keystore File of extension module.
+ */
+ public static final String KEYSTORE_FILE_TYPE = "Keystore File"; //$NON-NLS-1$
+
+ /**
+ * The name of the Miscellaneous File type of extension module.
+ */
+ public static final String MISC_FILE_TYPE = "Miscellaneous Type"; //$NON-NLS-1$
+
+
+ /**
+ * @return description
+ */
+ public String getDescription();
+
+ /**
+ * @return byte array of file contents
+ */
+ public byte[] getFileContents();
+
+ /**
+ * @return String of the Module Type for this Extension Module
+ */
+ public String getModuleType();
+
+
+
+
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/Group.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/Group.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/Group.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/Group.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,39 @@
+/*
+ * 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 Group is a MetaMatrix principal that can contain other Principals
+ * as members. A Group can contain {@link User}s and other Groups.
+ *
+ * <p>See {@link Principal} for identity pattern.</p>
+ * @since 4.3
+ */
+public interface Group extends Principal {
+
+ /**
+ * Optional property for a group
+ */
+ /** The group description */
+ static final String DESCRIPTION = "description"; //$NON-NLS-1$
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/Host.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/Host.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/Host.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,75 @@
+/*
+ * 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.
+ *
+ * <p>The identifier pattern for a host is <code>"hostName"</code>.
+ * A hostName is considered to be unique across the system.</p>
+ * @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/client/src/main/java/org/teiid/adminapi/LogConfiguration.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/LogConfiguration.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/LogConfiguration.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/LogConfiguration.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,106 @@
+/*
+ * 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.Set;
+
+import com.metamatrix.core.log.MessageLevel;
+
+
+/**
+ * The LogConfiguration describes the current configuration of the
+ * system logger.
+ *
+ * <p>The log configuration is used to filter on log contexts (components)
+ * and log levels (severity).</p>
+ *
+ * @since 4.3
+ */
+public interface LogConfiguration extends AdminObject {
+
+ /**
+ * Message level value that specifies that no messages are to be recorded.
+ */
+ public static final int NONE = MessageLevel.NONE;
+
+ /**
+ * Message level value that specifies that critical messages are to be recorded.
+ */
+ public static final int CRITICAL = MessageLevel.CRITICAL;
+
+ /**
+ * Message level value that specifies that error messages and critical
+ * messages are to be recorded.
+ */
+ public static final int ERROR = MessageLevel.ERROR;
+
+ /**
+ * Message level value that specifies that warning, error and critical
+ * messages are to be recorded.
+ */
+ public static final int WARNING = MessageLevel.WARNING;
+
+ /**
+ * Message level value that specifies that information, warning, error and critical
+ * messages are to be recorded.
+ */
+ public static final int INFO = MessageLevel.INFO;
+
+ /**
+ * Message level value that specifies that detailed, information, warning, error and critical
+ * messages are to be recorded.
+ */
+ public static final int DETAIL = MessageLevel.DETAIL;
+
+ /**
+ * Message level value that specifies that all messages are to be recorded.
+ */
+ public static final int TRACE = MessageLevel.TRACE;
+
+
+ /**
+ * Get the current configured Log Level for supplied context
+ * @param context
+ * @return int value
+ * @see com.metamatrix.core.log.MessageLevel
+ * @since 4.3
+ */
+ int getLogLevel(String context);
+
+ /**
+ * Obtain the set of message contexts that are currently used.
+ * @return the unmodifiable set of context Strings; never null
+ */
+ Set<String> getContexts();
+
+ /**
+ * Set the Log Level
+ *
+ * Note: Must call setLogConfiguration(LogConfiguration) for log level to take
+ * affect on the server.
+ *
+ * @param context log context name
+ * @param logLevel The logLevel to set.
+ */
+ public void setLogLevel(String context, int logLevel);
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/Model.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/Model.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/Model.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/Model.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,85 @@
+/*
+ * 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.List;
+
+/**
+ * Represents a metadata model in the MetaMatrix system.
+ *
+ * @since 4.3
+ */
+public interface Model extends AdminObject {
+
+ /**
+ * Return the connector binding names for this Virtual Databse.
+ * @return connector bindings bound to this model.
+ */
+ List getConnectorBindingNames();
+
+ /**
+ * Determine if this model is a physical type.
+ *
+ * @return <code>true</code> iff it contains physical group(s).
+ */
+ boolean isPhysical();
+
+ /**
+ * Determine whether this model is exposed for querying.
+ *
+ * @return <code>true</code> iff the model is visible
+ * for querying.
+ */
+ boolean isVisible();
+
+ /**
+ * Retrieve the model type.
+ * TODO: one of ...
+ * @return model type
+ */
+ String getModelType();
+
+ /**
+ * Retrive the model URI.
+ *
+ * @return model URI
+ */
+ String getModelURI();
+
+ /**
+ * Determine whether this model can support more than one connector binding.
+ *
+ * @return <code>true</code> iff this model supports multi-source bindings
+ */
+ boolean supportsMultiSourceBindings();
+
+ /**
+ * Determine whether this model is a Materialization Model
+ *
+ * @return isMaterialization whether the model is a Materialization Model.
+ * @since 4.3
+ */
+
+ boolean isMaterialization();
+
+}
\ No newline at end of file
Copied: trunk/client/src/main/java/org/teiid/adminapi/MonitoringAdmin.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreMonitoringAdmin.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/MonitoringAdmin.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/MonitoringAdmin.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,264 @@
+/*
+ * 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;
+
+import com.metamatrix.admin.RolesAllowed;
+
+
+
+/**
+ * Used to access the monitorable components of the MetaMatrix system.
+ *
+ * <p>As a <i>core</i> interface,
+ * this administration is common to both the MetaMatrix server and MM Query.</p>
+ *
+ * <p>See the particular admin object in question for an example of
+ * allowed identifier patterns.</p>
+ *
+ * @since 4.3
+ */
+ at RolesAllowed(value=AdminRoles.RoleName.ADMIN_READONLY)
+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}
+ * <ul>
+ * <li> <code>"*"</code> - for all connector types in the system
+ * <li> <code>"name*"</code> - for all the connector types that begin with given name
+ * <li> <code>"name"</code> - for the single connector type identified by name
+ * </ul>
+ * @return Collection of {@link ConnectorType}
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ Collection getConnectorTypes(String connectorTypeIdentifier) throws AdminException;
+
+ /**
+ * Get the VDBs that correspond to the specified identifier pattern.
+ *
+ * @param vdbIdentifier the unique identifier for for a {@link VDB} in the system
+ * <ul>
+ * <li> <code>"*"</code> - for all VDBs in the system
+ * <li> <code>"name"</code> or <code>"name*"</code> - for all the VDBs that begin with given name
+ * <li><code>"name<{@link AdminObject#DELIMITER_CHAR}>version"</code> - for single VDB
+ * </ul>
+ * @return Collection of {@link VDB}s. There could be multiple VDBs with the
+ * same name in the Collection but they will differ by VDB version.
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ @RolesAllowed(value=AdminRoles.RoleName.ANONYMOUS)
+ Collection getVDBs(String vdbIdentifier) throws AdminException;
+
+ /**
+ * Get the Connector Bindings that correspond to the specified identifier pattern.
+ *
+ * @param connectorBindingIdentifier the unique identifier pattern of {@link ConnectorBinding}
+ * <ul>
+ * <li> <code>"*"</code> - for all connector bindings in the system
+ * <li> <code>"name*"</code> - for all connector bindings that begin with given name
+ * <li><code>"name"</code> - for single connector binding by the given name
+ * </ul>
+ * @return Collection of {@link ConnectorBinding}
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ Collection getConnectorBindings(String connectorBindingIdentifier) throws AdminException;
+
+ /**
+ * Get all the Connector Bindings for the given VDB identifier pattern
+ * @param identifier - the unique identifier for a {@link VDB}
+ * <ul>
+ * <li> <code>"*"</code> - for all Connector Bindings in the system
+ * <li> <code>"name or name*"</code> - for all the bindings in the VDBs that begin with given name
+ * <li><code>"name<{@link AdminObject#DELIMITER_CHAR}>version"</code> - for all the bindings in a given single VDB
+ * </ul>
+ * @return Collection of {@link ConnectorBinding}
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ Collection getConnectorBindingsInVDB(String identifier) throws AdminException;
+
+ /**
+ * Get the Extension Modules that correspond to the specified identifier pattern
+ * @param extensionModuleIdentifier - the unique identifier for {@link ExtensionModule}
+ * <ul>
+ * <li> <code>"*"</code> - for all extension modules in the system
+ * <li> <code>"name*"</code> - for all the extension modules in that begin with given name
+ * <li><code>"name"</code> - for a single extension module identified by given name
+ * </ul>
+ * @return Collection of {@link ExtensionModule}
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ Collection<ExtensionModule> getExtensionModules(String extensionModuleIdentifier) throws AdminException;
+
+ /**
+ * Get the Queue Worker Pools that correspond to the specified identifier pattern.
+ *
+ * @param identifier - an identfier for the queues {@link QueueWorkerPool}
+ * <ul>
+ * <li> <code>"*"</code> - for all Queue workers in the system
+ * <li> <code>"name*"</code> - for all the Queue workers in that begin with given name
+ * <li><code>"name"</code> - for a single queue in the system
+ * </ul>
+ * for example, In MM Query - "dqp" will return the Stats for MM Query Worker Pool. Also any Connector Binding
+ * name will return the stats for that connector binding.
+ * @return Collection of {@link QueueWorkerPool}
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ Collection getQueueWorkerPools(String identifier) throws AdminException;
+
+
+ /**
+ * Get the Connection Pool Stats that correspond to the specified identifier pattern.
+ * If the {@link ConnectionPool ConnectionPool} represents an XA connection, there
+ * will be 2 {@link ConnectionPool ConnectionPool}s.
+ *
+ * @param identifier - an identfier that corresponds to the ConnectorBinding that is
+ * running in a process {@link ConnectionPool}
+ * <ul>
+ * <li> <code>"*"</code> - for all Connection Pools in the system
+ * <li> <code>"name*"</code> - for all the Connection Pools that begin with given name
+ * <li><code>"name"</code> - for a single Connection Pool in the system
+ * </ul>
+ * @return Collection of {@link ConnectionPool}
+ * @throws AdminException if there's a system error.
+ * @since 6.1
+ */
+ Collection getConnectionPoolStats(String identifier) throws AdminException;
+
+
+ /**
+ * Get the Caches that correspond to the specified identifier pattern
+ * @param identifier - an identifier for the cache in {@link Cache}
+ * <ul>
+ * <li> <code>"*"</code> - for all different caches in the system
+ * <li> <code>"name*"</code> - for all the caches that begin with given name
+ * <li><code>"name"</code> - for a single cache in the system
+ * </ul>
+ * @return Collection of {@link Cache}
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ Collection getCaches(String identifier) throws AdminException;
+
+ /**
+ * Get the Sessions that correspond to the specified identifier pattern
+ * @param identifier - an unique identifier for {@link Session}
+ * <ul>
+ * <li> <code>"*"</code> - for all current sessions of the system
+ * <li> <code>"number*"</code> - for all the sessions that begin with given number
+ * <li><code>"number"</code> - for a single current session in the system
+ * </ul>
+ * @return Collection of {@link Session}
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ Collection<Session> getSessions(String identifier) throws AdminException;
+
+ /**
+ * Get the Requests that correspond to the specified identifier pattern
+ * @param identifier - An Identifier for {@link Request}
+ * <ul>
+ * <li> <code>"*"</code> - for all current in process requests of the system
+ * <li> <code>"number* or number<{@link AdminObject#DELIMITER_CHAR}>*"</code> - for all the sessions
+ * that begin with given number, or all the requests for particular session etc.
+ * <li><code>"number<{@link AdminObject#DELIMITER_CHAR}>number"</code> - for a single request in the system
+ * </ul>
+ * @return Collection of {@link Request}
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+
+ Collection<Request> getRequests(String identifier) throws AdminException;
+
+ /**
+ * Get the Source Request that correspond to the specified identifier pattern
+ * @param identifier An Identifier for {@link Request}
+ * <ul>
+ * <li> <code>"*"</code> - for all current in process requests of the system
+ * <li> <code>"number* or number<{@link AdminObject#DELIMITER_CHAR}>* or number.number.*"</code> - for all the sessions
+ * that begin with given number, or all the requests for particular session etc.
+ * <li><code>"number<{@link AdminObject#DELIMITER_CHAR}>number<{@link AdminObject#DELIMITER_CHAR}>number"</code> - for a single source request in the system
+ * </ul>
+ * @return Collection of {@link Request}
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ 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
+ */
+ Collection getPropertyDefinitions(String identifier,
+ String className) throws AdminException;
+
+
+ /**
+ * Get all transaction matching the identifier.
+ * @return
+ * @throws AdminException
+ */
+ Collection<Transaction> getTransactions() throws AdminException;
+
+ /**
+ * Get the processes that correspond to the specified identifier pattern.
+ *
+ * @param processIdentifier the unique identifier for for a {@link org.teiid.adminapi.ProcessObject ProcessObject}
+ * in the system or "{@link org.teiid.adminapi.AdminObject#WILDCARD WILDCARD}"
+ * if all Processes are desired.
+ * @return Collection of {@link org.teiid.adminapi.ProcessObject ProcessObject}
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ @RolesAllowed(value=AdminRoles.RoleName.ANONYMOUS)
+ Collection<ProcessObject> getProcesses(String processIdentifier) throws AdminException;
+
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/Principal.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/Principal.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/Principal.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/Principal.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -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 org.teiid.adminapi;
+
+
+/**
+ * A Principal may participate in entitlements (authorization). A Principal
+ * may also posess administrative roles for the system.
+ *
+ * <p>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.</p>
+ * @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/client/src/main/java/org/teiid/adminapi/ProcessObject.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/ProcessObject.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/ProcessObject.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/ProcessObject.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,168 @@
+/*
+ * 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.net.InetAddress;
+
+
+
+/**
+ * A Process in the MetaMatrix system.
+ *
+ * <p>The identifier pattern for a Process is <code>"hostName.processName"</code>.
+ * This Process identifier is concidered to be unique across the system.</p>
+ * @since 4.3
+ */
+public interface ProcessObject extends
+ AdminObject {
+
+ /**
+ * Process Min Heap Size Property Name
+ */
+ 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
+ *
+ * @return String A unique identifier for the Host of this Process.
+ * @since 4.3
+ */
+ public String getHostIdentifier();
+
+
+ /**
+ * Get the port number for this MetaMatrix Process
+ *
+ * @return listener port for this host
+ * @since 4.3
+ */
+ public int getPort();
+
+ /**
+ * Get the IP address for the MetaMatrix Process
+ * @return the IP address for the MetaMatrix Process
+ * @since 4.3
+ */
+ public InetAddress getInetAddress();
+
+ /**
+ * Is this process enabled in Configuration
+ *
+ * @return whether this process is enabled.
+ * @since 4.3
+ */
+ public boolean isEnabled();
+
+ /**
+ * @return amount of free memory for this Java process.
+ */
+ public long getFreeMemory();
+
+
+ /**
+ * @return thread count for this Java process.
+ */
+ public int getThreadCount();
+
+ /**
+ * @return total memory allocated for this Java process.
+ */
+ public long getTotalMemory();
+
+
+ /**
+ * @return whether this process is running.
+ * @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 sockets.
+ * @since 4.3
+ */
+ public int getSockets();
+ /**
+ * @return Returns the virtualSockets.
+ * @since 4.3
+ */
+ public int getVirtualSockets();
+
+
+ /**
+ * @return Returns the queueWorkerPool.
+ * @since 4.3
+ */
+ public QueueWorkerPool getQueueWorkerPool();
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/PropertyDefinition.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/PropertyDefinition.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/PropertyDefinition.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/PropertyDefinition.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,152 @@
+/*
+ * 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;
+
+/**
+ * Information about a property of an AdminObject
+ */
+public interface PropertyDefinition extends AdminObject {
+
+ public enum RestartType {
+ NONE,
+ SERVICE,
+ PROCESS,
+ ALL_PROCESSES,
+ CLUSTER
+ }
+ /**
+ * The value of the maximum multiplicity if the multiplicity is considered unbounded.
+ */
+ public static final int UNBOUNDED_VALUE = Integer.MAX_VALUE;
+
+
+
+ /**
+ * Get the current value of this property.
+ * @return the current value of this property.
+ */
+ String getValue();
+
+ /**
+ * Get the localized display name of this property.
+ * @return the displayable name for this property
+ */
+ String getDisplayName();
+
+ /**
+ * Get the description of this property.
+ * @return the description for this property
+ */
+ String getDescription();
+
+
+
+ /**
+ * Get the type for values of this property.
+ * @return the type that best describes the values of this property.
+ */
+ String getPropertyType();
+
+
+ /**
+ * Get the name of the java class that best represents the property type.
+ * @return the name of the java class that best represents the property type.
+ */
+ String getPropertyTypeClassName();
+
+
+ /**
+ * Get the default value for values of this property, or an empty String if
+ * there is no default value.
+ * @return the default value for this property, or an empty String
+ * if there is no default value.
+ */
+ Object getDefaultValue();
+
+ /**
+ * Get the allowed values for this property.
+ * @return the list of allowed values for this property, or an empty
+ * set if the values do not have to conform to a fixed set.
+ */
+ Collection getAllowedValues();
+
+ /**
+ * Get whether this property requires the system to be restarted before it takes effect.
+ * @return true if this property requires the system to be restarted before it takes effect.
+ */
+ public RestartType getRequiresRestart();
+
+ /**
+ * The modifiable flag is used to identify features that may not be changed once
+ * they are set.
+ * @return true if this property is marked with the modifyable
+ * flag, or false otherwise.
+ */
+ boolean isModifiable();
+
+ /**
+ * Return whether the value or values for this property are constrained to be only
+ * those in the AllowedValues list.
+ * @see #getAllowedValues
+ * @return true if this property's value must be with the list of AllowedValues.
+ */
+ boolean isConstrainedToAllowedValues();
+
+ /**
+ * The "expert" flag is used to distinguish between features that are
+ * intended for expert users from those that are intended for normal users.
+ * @return true if this property is to be marked with the expert flag,
+ * or false otherwise.
+ */
+ boolean isExpert();
+ /**
+ * The "required" flag is used to identify features that require at least
+ * one value (possibly a default value) by the consumer of the property. Whether
+ * a property definition is required or not can be determined entirely from the
+ * multiplicity: if the multiplicity includes '0', then the property is
+ * not required.
+ * <p>
+ * Whether a property is required by the consumer is unrelated to whether
+ * there is a default value, which only simplifies the task of the property
+ * provider. A property may be required, meaning it must have at least one
+ * value, but that same property definition may or may not have a default.
+ * The combination of required and whether it has a default will determine
+ * whether the user must supply a value.
+ * @return true if this property requires at least one value.
+ */
+ boolean isRequired();
+ /**
+ * The "masked" flag is used to tell whether the value should be masked
+ * when displayed to users.
+ * @return true if this property value is to be masked,
+ * or false otherwise.
+ */
+ boolean isMasked();
+
+
+
+}
+
+
Copied: trunk/client/src/main/java/org/teiid/adminapi/QueueWorkerPool.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/QueueWorkerPool.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/QueueWorkerPool.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/QueueWorkerPool.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,88 @@
+/*
+ * 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;
+
+
+/**
+ * All server modules use queue based processing inside them. This
+ * object holds the statistics of those queues, as per how many of them queued, dequeued,
+ * processed etc.
+ * <p>An identifier for QueueWorkerPool, is nothing but the modules it self, like "DQP",
+ * "QueryService" or Connector Binding names etc.</p>
+ *
+ * @since 4.3
+ */
+public interface QueueWorkerPool extends AdminObject {
+ /**
+ * @return Returns the number of requests queued.
+ * @since 4.3
+ */
+ public int getQueued();
+
+ /**
+ * @return Returns the number of threads.
+ * @since 4.3
+ */
+ public int getThreads();
+
+ /**
+ * @return Returns the highest number of active threads
+ */
+ public int getHighestThreads();
+
+ /**
+ * @return Returns the number of totalDequeues.
+ * @since 4.3
+ * @deprecated see {@link #getTotalCompleted()}
+ */
+ public long getTotalDequeues();
+
+ /**
+ * @return The number of completed tasks
+ */
+ long getTotalCompleted();
+
+ /**
+ * @return Returns the number of totalEnqueues.
+ * @since 4.3
+ * @deprecated see {@link #getTotalSubmitted()}
+ */
+ public long getTotalEnqueues();
+
+ /**
+ * @return The number of submitted tasks
+ */
+ long getTotalSubmitted();
+
+ /**
+ * @return Returns the totalHighwaterMark.
+ * @since 4.3
+ * @deprecated see {@link #getHighestQueued()}
+ */
+ public int getTotalHighwaterMark();
+
+ /**
+ * @return Returns the highest queue size
+ */
+ public int getHighestQueued();
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/Request.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/Request.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/Request.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/Request.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,105 @@
+/*
+ * 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;
+
+
+/**
+ * When a user submits a SQL command to the system for processing, usually that represents
+ * a single request. A single request might have one or more source
+ * requests (the requests that are being processed on the physical data sources) as part
+ * of original request.
+ *
+ * <p>A request is identified by a numbers separated by '|'. usually in they are arranged
+ * in the pattern [session]|[request] or [session]|[request]|[source request] </p>
+ * @since 4.3
+ */
+public interface Request extends AdminObject {
+ /**
+ * @return Date the request was created
+ * @since 4.3
+ */
+ public Date getCreated();
+
+ /**
+ * Get the RequestID for a Request
+ * @return RequestID
+ */
+ public String getRequestID();
+
+ /**
+ * Get the SessionID for a Request
+ *
+ * @return long SessionID
+ */
+ public String getSessionID();
+
+ /**
+ * Get the SQL Command sent to the Server for a Request
+ *
+ * @return MetaMatrix SQL Command
+ */
+ public String getSqlCommand();
+
+ /**
+ * Get the Date processing began for the Request
+ * @return Date processing began
+ */
+ public Date getProcessingDate();
+
+ /**
+ * Get the TransactionID of the Request
+ *
+ * @return String of TransactionID if in a transaction
+ */
+ public String getTransactionID();
+
+
+ /**
+ * Get the UserName of the Request
+ *
+ * @return String username for the Request
+ */
+ public String getUserName();
+
+
+ /**
+ * @return Returns the connectorBindingName.
+ * @since 4.3
+ */
+ public String getConnectorBindingName();
+
+ /**
+ * @return Returns whether this is a Source Request.
+ * @since 4.3
+ */
+ public boolean isSource();
+
+ /**
+ * @return In the case that this is a source request this represents the node id. Otherwise blank
+ * @since 4.3
+ */
+ public String getNodeID();
+
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/Resource.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/Resource.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/Resource.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/Resource.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,36 @@
+/*
+ * 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$
+
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/Role.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/Role.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/Role.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/Role.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,39 @@
+/*
+ * 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 Role extends AdminObject {
+
+ /** System admin role name */
+ public static final String ADMIN_SYSTEM = AdminRoles.RoleName.ADMIN_SYSTEM;
+ /** Product admin role name */
+ public static final String ADMIN_PRODUCT = AdminRoles.RoleName.ADMIN_PRODUCT;
+ /** Read-only admin role name */
+ public static final String ADMIN_READONLY = AdminRoles.RoleName.ADMIN_READONLY;
+
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/RuntimeStateAdmin.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreRuntimeStateAdmin.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/RuntimeStateAdmin.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/RuntimeStateAdmin.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,165 @@
+/*
+ * 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 javax.transaction.xa.Xid;
+
+import com.metamatrix.admin.RolesAllowed;
+
+
+/**
+ * This interface defines the methods to interact with the MetaMatrix system
+ * during runtime.
+ *
+ * <p>As a <i>core</i> interface,
+ * this administration is common to both the MetaMatrix server and MM Query.</p>
+ *
+ * @since 4.3
+ */
+ at RolesAllowed(value=AdminRoles.RoleName.ADMIN_PRODUCT)
+public interface RuntimeStateAdmin {
+
+ /**
+ * Start Connector Binding
+ *
+ * @param connectorBindingIdentifier identifier for {@link org.teiid.adminapi.ConnectorBinding}
+ * <ul>
+ * <li> <code>"*"</code> - for all connector bindings in the system
+ * <li> <code>"name*"</code> - for all connector bindings that begin with given name
+ * <li><code>"name"</code> - for single connector binding by the given name
+ * </ul>
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ void startConnectorBinding(String connectorBindingIdentifier) throws AdminException;
+
+ /**
+ * Stop Connector Binding
+ *
+ * @param connectorBindingIdentifier identifier for {@link org.teiid.adminapi.ConnectorBinding}
+ * <ul>
+ * <li> <code>"*"</code> - for all connector bindings in the system
+ * <li> <code>"name*"</code> - for all connector bindings that begin with given name
+ * <li><code>"name"</code> - for single connector binding by the given name
+ * </ul>
+ * @param stopNow If true, stop the process forcefully. If false, wait until any pending work is done.
+ * @throws AdminException - if there's a system error.
+ * @since 4.3
+ */
+ void stopConnectorBinding(String connectorBindingIdentifier,
+ boolean stopNow) throws AdminException;
+
+ /**
+ * Clear the cache or caches specified by the cacheIdentifier.
+ * @param cacheIdentifier Cache name identifier {@link org.teiid.adminapi.Cache}.
+ * No wild cards currently supported, must be explicit
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ @RolesAllowed(value=AdminRoles.RoleName.ADMIN_SYSTEM)
+ void clearCache(String cacheIdentifier) throws AdminException;
+
+ /**
+ * Terminate the Session
+ *
+ * @param identifier Session Identifier {@link org.teiid.adminapi.Session}.
+ * No wild cards currently supported, must be explicit
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ void terminateSession(String identifier) throws AdminException;
+
+ /**
+ * Cancel Request
+ *
+ * @param identifier The request identifier defined by {@link org.teiid.adminapi.Request}
+ * No wild cards currently supported, must be explicit
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ void cancelRequest(String identifier) throws AdminException;
+
+ /**
+ * Cancel Source Request
+ *
+ * @param identifier The request identifier defined by {@link org.teiid.adminapi.Request}
+ * No wild cards currently supported, must be explicit
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ void cancelSourceRequest(String identifier) throws AdminException;
+
+ /**
+ * Change the status of a Deployed VDB
+ *
+ * @param name Name of the Virtual Database
+ * @param version Version of the Virtual Database
+ * @param status Active, InActive, Delete
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ public void changeVDBStatus(String name, String version, int status)
+ throws AdminException;
+
+ /**
+ * Mark the given global transaction as rollback only.
+ * @param transactionId
+ * @throws AdminException
+ */
+ void terminateTransaction(Xid transactionId) throws AdminException;
+
+ /**
+ * Mark the given transaction as rollback only.
+ * @param identifier
+ * The exact identifier of the transaction. Wild card is not supported.
+ * @param the session the transaction is associated with.
+ * @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
+ * @throws AdminException
+ * @since 4.3
+ */
+ void shutdown(int millisToWait) throws AdminException;
+
+ /**
+ * Restart System
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ void restart() throws AdminException;
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/ScriptsContainer.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/ScriptsContainer.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/ScriptsContainer.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/ScriptsContainer.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -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 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.
+ * <p>
+ * 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})</p>
+ * <p>
+ * @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/client/src/main/java/org/teiid/adminapi/SecurityAdmin.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreSecurityAdmin.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/SecurityAdmin.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/SecurityAdmin.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,163 @@
+/*
+ * 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;
+import java.util.List;
+
+import com.metamatrix.admin.RolesAllowed;
+
+
+/**
+ * This interface defines the methods available for security administration
+ * in the Teiid system.
+ *
+ * @since 4.3
+ */
+ at RolesAllowed(value=AdminRoles.RoleName.ADMIN_SYSTEM)
+public interface SecurityAdmin {
+ /**
+ * 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.
+ * The {@link AdminObject#WILDCARD WILDCARD} cannot be used here.
+ * @return The Collection of {@link Role}s.
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ Collection<Role> getRolesForGroup(String groupIdentifier) throws AdminException;
+
+ /**
+ * 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 {@link AdminObject#WILDCARD WILDCARD} cannot be used here.
+ * @return The collection of groups in which the given user has membership.
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ Collection<Group> getGroupsForUser(String userIdentifier) throws AdminException;
+
+
+ /**
+ * 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. <br>
+ * Note that by supplying the {@link AdminObject#WILDCARD WILDCARD} identifier, all all users in the system will
+ * retrieved.</br>
+ * @return The Collection of groups.
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ Collection<Group> getGroups(String groupIdentifier) throws AdminException;
+
+ /**
+ * Assign to the given {@link Group} the given Administrative Role.
+ *
+ * @param roleIdentifier
+ * one of {@link AdminRoles}.
+ * @param groupIdentifier
+ * the unique identifier for the Principal. The {@link AdminObject#WILDCARD WILDCARD} cannot be used here.
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void assignRoleToGroup(String roleIdentifier,
+ String groupIdentifier) throws AdminException;
+
+ /**
+ * Remove an administrative role from the given {@link Group}.
+ *
+ * @param roleIdentifier
+ * one of {@link AdminRoles}
+ * @param groupIdentifier
+ * the unique identifier for the Principal. The {@link AdminObject#WILDCARD WILDCARD} cannot be used here.
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void removeRoleFromGroup(String roleIdentifier,
+ String groupIdentifier) throws AdminException;
+
+ /**
+ * Import the data Roles for given vdb and version into the connected server
+ * @param vdbName - target name of the VDB, the roles to be imported under
+ * @param vdbVersion - target version of the vdb, the roles to be imported under
+ * @param data - character data array containing the XML file which defines the roles
+ * @param options - options to overwrite in case the matching roles already exist.
+ * @return a report of the import
+ * @throws AdminException
+ */
+ String importDataRoles(String vdbName, String vdbVersion, char[] data, AdminOptions options)
+ throws AdminException;
+
+ /**
+ * Export the data roles defined for the given vdb from the current system
+ * @param vdbName - Name of the vdb
+ * @param vdbVersion - version of the vdb
+ * @return - char[] stream containing the XML contents of the roles.
+ * @throws AdminException
+ */
+ char[] exportDataRoles(String vdbName, String vdbVersion) throws AdminException;
+
+ /**
+ * Authenticate a user with the specified user name and credentials
+ * for use with the specified application. The application name may also
+ * be used by the Membership Service to determine the appropriate authentication
+ * mechanism.
+ * @param username the user name that is to be authenticated
+ * @param credential
+ * @param trustePayload
+ * @param applicationName the name of the application for which the user
+ * is authenticating
+ * @return true if the authentication is successful
+ * @throws AdminException
+ */
+ boolean authenticateUser(String username, char[] credentials, Serializable trustePayload, String applicationName) throws AdminException;
+
+ /**
+ * Returns the active authorization provider domain names, in authentication order.
+ * @return List<String>
+ * @throws AdminException
+ */
+ List<String> getDomainNames( ) throws AdminException;
+
+ /**
+ * Return the {@link Group}s for a given domain. The domain name must be an specified
+ * exactly. See {@link #getActiveDomainNames()} for possible domain names.
+ * @param domainName
+ * @return
+ * @throws AdminException
+ */
+ Collection<Group> getGroupsForDomain(String domainName) throws AdminException;
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/Service.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/Service.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/Service.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/Service.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ *
+ * <p>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.</p>
+ *
+ * @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/client/src/main/java/org/teiid/adminapi/Service.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/client/src/main/java/org/teiid/adminapi/Session.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/Session.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/Session.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/Session.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,186 @@
+/*
+ * 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;
+
+/**
+ * A Session is a lasting connection between a client and a MetaMatrix System.
+ *
+ * A user may be allowed to have multiple sessions active simultaneously.
+ *
+ * <p>a Session identifier gets automatically assigned
+ * to a connection when user logs into the system</p>
+ *
+ * @since 4.3
+ */
+public interface Session extends
+ AdminObject {
+
+
+ /**
+ * The session is open (active).
+ */
+ public static final int STATE_ACTIVE = 1;
+
+ /**
+ * The ejb server has passivated the session - it may become
+ *open again in the future
+ */
+ public static final int STATE_PASSIVATED = 2;
+
+ /**
+ * The session is closed - this state cannot change once it
+ *is reached.
+ */
+ public static final int STATE_CLOSED = 3;
+
+ /**
+ * The session has expired - this state cannot change once it
+ *is reached.
+ */
+ public static final int STATE_EXPIRED = 4;
+
+ /**
+ * The session is terminated - this state cannot change once it
+ *is reached.
+ */
+ public static final int STATE_TERMINATED = 5;
+
+ /**
+ * The description when the session has expired - this state cannot change once it
+ * is reached.
+ */
+ public static final String EXPIRED_STATE_DESC = "Expired"; //$NON-NLS-1$
+
+ /**
+ * The description when the session is open (active).
+ */
+ public static final String ACTIVE_STATE_DESC = "Active";//$NON-NLS-1$
+
+ /**
+ * The description when the session is closed - this state cannot change once it
+ * is reached.
+ */
+ public static final String CLOSED_STATE_DESC = "Closed";//$NON-NLS-1$
+
+ /**
+ * The description when the session is terminated - this state cannot change once it
+ *is reached.
+ */
+ public static final String TERMINATED_STATE_DESC = "Terminated";//$NON-NLS-1$
+
+ /**
+ * The description when the ejb server has passivated the session - it may become
+ * open again in the future
+ */
+ public static final String PASSIVATED_STATE_DESC = "Passivated";//$NON-NLS-1$
+
+ /**
+ * The description when the state of the session is not known.
+ */
+ public static final String UNKNOWN_STATE_DESC = "Unknown";//$NON-NLS-1$
+
+
+
+
+ /**
+ * Get the Last time Client has check to see if the server is still available
+ *
+ * @return Date of the last ping to the server.
+ */
+ public Date getLastPingTime();
+
+
+ /**
+ * Get the Session State as a String.
+ *
+ * @return SessionState
+ */
+ public String getStateAsString();
+
+ /**
+ * Get the Application Name
+ *
+ * @return String of the Application Name
+ */
+ public String getApplicationName();
+
+ /**
+ * Get the unique MetaMatrix session
+ * within a given MetaMatrix System
+ *
+ * @return String of the Session ID
+ */
+ public String getSessionID();
+
+ /**
+ * Get the State of the Session
+ *
+ * @return int of the Session's state
+ */
+ public int getState();
+
+ /**
+ * Get User Name for this Session
+ *
+ * @return String of UserName
+ */
+ public String getUserName();
+
+ /**
+ * Get the VDB Name for this Session
+ *
+ * @return String name of the VDB
+ */
+ public String getVDBName();
+
+ /**
+ * Get the VDB Version for this Session
+ *
+ * @return String name/number of the VDB Version
+ */
+ public String getVDBVersion();
+
+ /**
+ * Get the IPAddress for this Session
+ * @return
+ */
+ public String getIPAddress();
+
+
+ /**
+ * Get the host name of the machine the client is
+ * accessing from
+ * @return
+ */
+ public String getHostName() ;
+
+ /**
+ * Get the time the {@link Session} was created.
+ * @return
+ */
+ public Date getCreatedDate();
+
+
+}
\ No newline at end of file
Copied: trunk/client/src/main/java/org/teiid/adminapi/SystemObject.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/SystemObject.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/SystemObject.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/SystemObject.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,50 @@
+/*
+ * 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();
+
+
+
+
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/Transaction.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/Transaction.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/Transaction.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/Transaction.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,63 @@
+/*
+ * 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;
+
+import javax.transaction.xa.Xid;
+
+public interface Transaction extends AdminObject {
+
+ /**
+ * Get the session associated with the this transaction.
+ * May be null for an unassociated Global transaction.
+ * @return
+ */
+ String getAssociatedSession();
+
+ /**
+ * Get the scope for the transaction. Will be one of GLOBAL, LOCAL, or REQUEST
+ * @return
+ */
+ String getScope();
+
+ /**
+ * Return the Xid of the Global transaction. Will be null for non-Global transactions.
+ * @return
+ */
+ Xid getXid();
+
+ /**
+ * Get the current status. See {@link javax.transaction.Status} for
+ * possible values.
+ * @return
+ */
+ String getStatus();
+
+ /**
+ * Get the date the transaction was created.
+ * @return
+ */
+ Date getCreated();
+
+}
Property changes on: trunk/client/src/main/java/org/teiid/adminapi/Transaction.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/client/src/main/java/org/teiid/adminapi/User.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/User.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/User.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/User.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -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 org.teiid.adminapi;
+
+/**
+ * A user of the MetaMatrix system may a participant or an
+ * administrator of the MetaMatrix system.
+ * <p>
+ * A User is an actor in the MetaMatrix system. A User
+ * can log in (authenticate) and perform actions on the system.</p>
+ *
+ * <p>See {@link Principal} for identity pattern and other
+ * abilities.</p>
+ * @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$
+
+}
Copied: trunk/client/src/main/java/org/teiid/adminapi/VDB.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/objects/VDB.java)
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/VDB.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/adminapi/VDB.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,122 @@
+/*
+ * 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;
+import java.util.Date;
+
+/**
+ * Represents a Virtual Database in the MetaMatrix system.
+ * <br>A VDB has a name and a version.</br>
+ *
+ * <p>The identifier pattern for a VDB is <CODE>"name<{@link #DELIMITER_CHAR}>version"</CODE>,
+ * where the name of the VDB and its version represent its unique identifier in the MetaMatrix system.
+ * There are no spaces allowed in a given VDB name, and VDB name must start with a letter.
+ * A version number is automatically assigned to a VDB when it is deployed into
+ * a system. A VDB is uniquely identified by <CODE>"name<{@link #DELIMITER_CHAR}>version"</CODE>.
+ * For example: <CODE>"Accounts<{@link #DELIMITER_CHAR}>1"</CODE>, <CODE>"UnifiedSales<{@link #DELIMITER_CHAR}>4</CODE>" etc.
+ * </p>
+ *
+ * @since 4.3
+ */
+public interface VDB extends
+ AdminObject {
+
+ /**
+ * Constant to denote the latest version of a VDB located
+ * at a given repository location. Used when deploying a
+ * VDB to the MetaMatrix Server from the server repository.
+ */
+ public static final String SERVER_REPOSITORY_LATEST_VERSION = "LATEST"; //$NON-NLS-1$
+
+ /**
+ * Incomplete (if import does not have all the connector bindings)
+ *
+ * @since 4.3
+ */
+ public static final int INCOMPLETE = 1;
+ /**
+ * Inactive VDB (can edit connector binding)
+ *
+ * @since 4.3
+ */
+ public static final int INACTIVE = 2;
+ /**
+ * Active VDB
+ *
+ * @since 4.3
+ */
+ public static final int ACTIVE = 3;
+ /**
+ * Mark VDB for Deletion
+ *
+ * @since 4.3
+ */
+ public static final int DELETED = 4;
+
+ /**
+ * @return date the VDB was versioned
+ */
+ public Date getVersionedDate();
+
+ /**
+ * @return user that versioned the VDB
+ */
+ public String getVersionedBy();
+
+ /**
+ * @return Collection of MMModels
+ */
+ public Collection getModels();
+
+ /**
+ * @return the status
+ */
+ public int getState();
+
+ /**
+ * @return the status
+ */
+ public String getStateAsString();
+
+ /**
+ * @return the VDB version
+ */
+ public String getVDBVersion();
+
+ /**
+ * Check to see if this VDB has any Materialized Models
+ *
+ * @return true or false
+ * @since 4.3
+ */
+ public boolean hasMaterializedViews();
+
+ /**
+ * Check to see if this VDB contains a WSDL.
+ * @return true if it contains a WSDL.
+ * @since 5.5.3
+ */
+ public boolean hasWSDL();
+
+}
Modified: trunk/client/src/test/java/com/metamatrix/admin/api/objects/TestAdminOptions.java
===================================================================
--- trunk/client/src/test/java/com/metamatrix/admin/api/objects/TestAdminOptions.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/test/java/com/metamatrix/admin/api/objects/TestAdminOptions.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -22,9 +22,10 @@
package com.metamatrix.admin.api.objects;
+import org.teiid.adminapi.AdminOptions;
+
import junit.framework.TestCase;
-import com.metamatrix.admin.api.objects.AdminOptions;
/**
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-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/client/TestSeverAdminFactory.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -22,13 +22,19 @@
package com.metamatrix.common.comm.platform.client;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.stub;
+import static org.mockito.Mockito.stubVoid;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
import java.util.Properties;
import org.junit.Test;
-import static org.mockito.Mockito.*;
+import org.teiid.adminapi.Admin;
+import org.teiid.adminapi.AdminComponentException;
-import com.metamatrix.admin.api.exception.AdminComponentException;
-import com.metamatrix.admin.api.server.ServerAdmin;
import com.metamatrix.common.comm.api.ServerConnection;
import com.metamatrix.common.comm.api.ServerConnectionFactory;
import com.metamatrix.common.comm.exception.SingleInstanceCommunicationException;
@@ -38,17 +44,17 @@
@Test public void testBounce() throws Exception {
ServerConnectionFactory scf = mock(ServerConnectionFactory.class);
ServerConnection sc = mock(ServerConnection.class);
- ServerAdmin sa = mock(ServerAdmin.class);
- stubVoid(sa).toThrow(new AdminComponentException(new SingleInstanceCommunicationException())).on().bounceSystem(true);
- stub(sc.getService(ServerAdmin.class)).toReturn(sa);
+ Admin sa = mock(Admin.class);
+ stubVoid(sa).toThrow(new AdminComponentException(new SingleInstanceCommunicationException())).on().restart();
+ stub(sc.getService(Admin.class)).toReturn(sa);
stub(scf.createConnection((Properties)anyObject())).toReturn(sc);
ServerAdminFactory saf = new ServerAdminFactory(scf, 1);
- ServerAdmin admin = saf.createAdmin("foo", "bar".toCharArray(), "mm://test:1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- admin.bounceSystem(true);
+ Admin admin = saf.createAdmin("foo", "bar".toCharArray(), "mm://test:1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ admin.restart();
//verify that the actual bounce was called
- verify(sa, times(1)).bounceSystem(true);
+ 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();
Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestAdminApiServerDiscovery.java
===================================================================
--- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestAdminApiServerDiscovery.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestAdminApiServerDiscovery.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -30,9 +30,9 @@
import junit.framework.TestCase;
import org.mockito.Mockito;
+import org.teiid.adminapi.Admin;
+import org.teiid.adminapi.ProcessObject;
-import com.metamatrix.admin.api.objects.ProcessObject;
-import com.metamatrix.admin.api.server.ServerAdmin;
import com.metamatrix.common.api.HostInfo;
import com.metamatrix.common.api.MMURL;
import com.metamatrix.platform.security.api.LogonResult;
@@ -50,7 +50,7 @@
assertEquals(1, discovery.getKnownHosts(null, null).size());
SocketServerInstance instance = Mockito.mock(SocketServerInstance.class);
- ServerAdmin serverAdmin = Mockito.mock(ServerAdmin.class);
+ Admin serverAdmin = Mockito.mock(Admin.class);
List<ProcessObject> processes = new ArrayList<ProcessObject>();
ProcessObject p1 = Mockito.mock(ProcessObject.class);
@@ -63,7 +63,7 @@
Mockito.stub(p2.getInetAddress()).toReturn(InetAddress.getByName("0.0.0.0")); //$NON-NLS-1$
processes.add(p2);
Mockito.stub(serverAdmin.getProcesses("*")).toReturn(processes); //$NON-NLS-1$
- Mockito.stub(instance.getService(ServerAdmin.class)).toReturn(serverAdmin);
+ Mockito.stub(instance.getService(Admin.class)).toReturn(serverAdmin);
Mockito.stub(instance.getHostInfo()).toReturn(knownHost);
discovery.connectionSuccessful(knownHost);
Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServiceRegistry.java
===================================================================
--- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServiceRegistry.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServiceRegistry.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -26,8 +26,9 @@
import junit.framework.TestCase;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.server.ServerAdmin;
+import org.teiid.adminapi.Admin;
+import org.teiid.adminapi.AdminException;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.client.ExceptionUtil;
import com.metamatrix.common.xa.XATransactionException;
@@ -38,7 +39,7 @@
public void testExceptionConversionNoException() throws Exception {
- Method m = ServerAdmin.class.getMethod("close", new Class[] {});
+ Method m = Admin.class.getMethod("close", new Class[] {});
Throwable t = ExceptionUtil.convertException(m, new MetaMatrixComponentException());
@@ -47,7 +48,7 @@
public void testAdminExceptionConversion() throws Exception {
- Method m = ServerAdmin.class.getMethod("getHosts", new Class[] {String.class});
+ Method m = Admin.class.getMethod("getProcesses", new Class[] {String.class});
Throwable t = ExceptionUtil.convertException(m, new MetaMatrixComponentException());
Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java
===================================================================
--- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -446,7 +446,7 @@
* Shutdown the current transport
*/
void shutdown() {
- this.connectionFactory.shutdown();
+ this.connectionFactory.shutdown(false);
}
/**
Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java
===================================================================
--- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -57,10 +57,10 @@
import javax.transaction.xa.Xid;
+import org.teiid.adminapi.Admin;
+import org.teiid.adminapi.AdminException;
import org.teiid.jdbc.TeiidDriver;
-import com.metamatrix.admin.api.core.Admin;
-import com.metamatrix.admin.api.exception.AdminException;
import com.metamatrix.common.api.MMURL;
import com.metamatrix.common.comm.api.ServerConnection;
import com.metamatrix.common.comm.api.ServerConnectionFactory;
Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/Connection.java
===================================================================
--- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/Connection.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/Connection.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,9 +24,10 @@
import java.sql.SQLException;
-import com.metamatrix.admin.api.core.Admin;
+import org.teiid.adminapi.Admin;
+
/**
* MetaMatrix extensions to the standard JDBC Connection interface.
*/
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-06-27 05:22:45 UTC (rev 1089)
+++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQueryTestCase.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -41,8 +41,8 @@
import junit.framework.Assert;
import org.junit.After;
+import org.teiid.adminapi.Admin;
-import com.metamatrix.admin.api.core.Admin;
import com.metamatrix.core.util.UnitTestUtil;
import com.metamatrix.jdbc.EmbeddedDriver;
import com.metamatrix.script.io.MetadataReader;
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ComponentTypePropDefn.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ComponentTypePropDefn.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ComponentTypePropDefn.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -25,7 +25,8 @@
import java.io.Serializable;
import java.util.List;
-import com.metamatrix.admin.api.objects.PropertyDefinition.RestartType;
+import org.teiid.adminapi.PropertyDefinition.RestartType;
+
import com.metamatrix.common.object.PropertyDefinition;
import com.metamatrix.common.object.PropertyDefinitionImpl;
import com.metamatrix.common.object.PropertyType;
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-06-27 05:22:45 UTC (rev 1089)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/HostType.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -30,25 +30,25 @@
public static final String COMPONENT_TYPE_NAME = "Host"; //$NON-NLS-1$
- public static final String INSTALL_DIR = com.metamatrix.admin.api.objects.Host.INSTALL_DIR;
+ public static final String INSTALL_DIR = org.teiid.adminapi.Host.INSTALL_DIR;
- public static final String LOG_DIRECTORY = com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY;
+ public static final String LOG_DIRECTORY = org.teiid.adminapi.Host.LOG_DIRECTORY;
- public static final String HOST_DIRECTORY = com.metamatrix.admin.api.objects.Host.HOST_DIRECTORY;
+ public static final String HOST_DIRECTORY = org.teiid.adminapi.Host.HOST_DIRECTORY;
- public static final String HOST_ENABLED = com.metamatrix.admin.api.objects.Host.HOST_ENABLED;
+ public static final String HOST_ENABLED = org.teiid.adminapi.Host.HOST_ENABLED;
/**
* 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 = com.metamatrix.admin.api.objects.Host.HOST_BIND_ADDRESS;
+ public static final String HOST_BIND_ADDRESS = org.teiid.adminapi.Host.HOST_BIND_ADDRESS;
/**
* 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 = com.metamatrix.admin.api.objects.Host.HOST_PHYSICAL_ADDRESS;
+ public static final String HOST_PHYSICAL_ADDRESS = org.teiid.adminapi.Host.HOST_PHYSICAL_ADDRESS;
}
\ 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-06-27 05:22:45 UTC (rev 1089)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VMComponentDefnType.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -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 = com.metamatrix.admin.api.objects.ProcessObject.VM_MINIMUM_HEAP_SIZE_PROPERTY_NAME;
- public static final String VM_MAXIMUM_HEAP_SIZE_PROPERTY_NAME = com.metamatrix.admin.api.objects.ProcessObject.VM_MAXIMUM_HEAP_SIZE_PROPERTY_NAME;
+ 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;
// Socket VM related properties
/**
* @see SocketVMController
*/
public static final String CLUSTER_PORT = "vm.unicast.port"; //$NON-NLS-1$
- public static final String SERVER_PORT = com.metamatrix.admin.api.objects.ProcessObject.SERVER_PORT;
- public static final String MAX_THREADS = com.metamatrix.admin.api.objects.ProcessObject.MAX_THREADS;
- public static final String TIMETOLIVE = com.metamatrix.admin.api.objects.ProcessObject.TIMETOLIVE;
+ 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 INPUT_BUFFER_SIZE = com.metamatrix.admin.api.objects.ProcessObject.INPUT_BUFFER_SIZE;
- public static final String OUTPUT_BUFFER_SIZE = com.metamatrix.admin.api.objects.ProcessObject.OUTPUT_BUFFER_SIZE;
- public static final String FORCED_SHUTDOWN_TIME = com.metamatrix.admin.api.objects.ProcessObject.FORCED_SHUTDOWN_TIME;
- public static final String ENABLED_FLAG = com.metamatrix.admin.api.objects.ProcessObject.ENABLED_FLAG;
+ 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;
/**
* When specified, indicates what address the vm will be bound to. If this is not
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLHelperImpl.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLHelperImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLHelperImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -34,8 +34,8 @@
import java.util.Properties;
import org.jdom.Element;
+import org.teiid.adminapi.PropertyDefinition.RestartType;
-import com.metamatrix.admin.api.objects.PropertyDefinition.RestartType;
import com.metamatrix.common.CommonPlugin;
import com.metamatrix.common.config.api.AuthenticationProvider;
import com.metamatrix.common.config.api.ComponentDefn;
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/PropertyDefinition.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/object/PropertyDefinition.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/object/PropertyDefinition.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,8 +24,9 @@
import java.util.List;
-import com.metamatrix.admin.api.objects.PropertyDefinition.RestartType;
+import org.teiid.adminapi.PropertyDefinition.RestartType;
+
/**
* Defines the type of property that will be placed in a detail panel or table
*/
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/PropertyDefinitionImpl.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/object/PropertyDefinitionImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/object/PropertyDefinitionImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -26,7 +26,8 @@
import java.util.Collections;
import java.util.List;
-import com.metamatrix.admin.api.objects.PropertyDefinition.RestartType;
+import org.teiid.adminapi.PropertyDefinition.RestartType;
+
import com.metamatrix.common.CommonPlugin;
import com.metamatrix.common.util.ErrorMessageKeys;
Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicModelInfo.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicModelInfo.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicModelInfo.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -163,7 +163,7 @@
* if the model has been flagged so that the user can
* actually assign multi connector bindngs.
*
- * @see com.metamatrix.metadata.runtime.api.Model#supportsMultiSourceBindings()
+ * @see org.teiid.adminapi.Model#supportsMultiSourceBindings()
* @since 4.2
*/
public boolean supportsMultiSourceBindings() {
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnection.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnection.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnection.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -23,6 +23,7 @@
package com.metamatrix.connector.object;
+import org.teiid.adminapi.AdminException;
import org.teiid.connector.api.ConnectorEnvironment;
import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.api.ConnectorLogger;
@@ -32,7 +33,6 @@
import org.teiid.connector.language.IProcedure;
import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import com.metamatrix.admin.api.exception.AdminException;
import com.metamatrix.connector.object.extension.IObjectSource;
import com.metamatrix.connector.object.extension.ISourceTranslator;
import com.metamatrix.connector.object.util.ObjectConnectorUtil;
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -32,16 +32,17 @@
import java.util.Properties;
import java.util.Set;
+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.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.api.exception.AdminComponentException;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
-import com.metamatrix.admin.api.objects.AdminObject;
-import com.metamatrix.admin.api.objects.Cache;
-import com.metamatrix.admin.api.objects.ExtensionModule;
-import com.metamatrix.admin.api.objects.Session;
-import com.metamatrix.admin.api.objects.SystemObject;
import com.metamatrix.admin.objects.MMAdminObject;
import com.metamatrix.admin.objects.MMConnectorBinding;
import com.metamatrix.admin.objects.MMConnectorType;
@@ -64,12 +65,15 @@
import com.metamatrix.common.util.crypto.CryptoUtil;
import com.metamatrix.common.vdb.api.VDBArchive;
import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin;
+import com.metamatrix.dqp.service.AuthorizationService;
import com.metamatrix.dqp.service.ConfigurationService;
import com.metamatrix.dqp.service.DQPServiceNames;
import com.metamatrix.dqp.service.DataService;
import com.metamatrix.dqp.service.TransactionService;
import com.metamatrix.dqp.service.VDBService;
import com.metamatrix.jdbc.EmbeddedConnectionFactoryImpl;
+import com.metamatrix.platform.security.api.SessionToken;
+import com.metamatrix.platform.security.api.service.MembershipServiceInterface;
import com.metamatrix.platform.util.ProductInfoConstants;
import com.metamatrix.server.serverapi.RequestInfo;
@@ -152,7 +156,15 @@
TransactionService getTransactionService() {
return (TransactionService)getManager().findService(DQPServiceNames.TRANSACTION_SERVICE);
}
+
+ MembershipServiceInterface getMembershipService() {
+ return (MembershipServiceInterface)getManager().findService(DQPServiceNames.MEMBERSHIP_SERVICE);
+ }
+ AuthorizationService getAuthorizationService() {
+ return (AuthorizationService)getManager().findService(DQPServiceNames.AUTHORIZATION_SERVICE);
+ }
+
ConfigurationService getConfigurationService() {
return (ConfigurationService)getManager().findService(DQPServiceNames.CONFIGURATION_SERVICE);
}
@@ -245,8 +257,8 @@
}
Object convertToNativeObjects(Object src) {
- if (src instanceof com.metamatrix.admin.api.objects.LogConfiguration) {
- com.metamatrix.admin.api.objects.LogConfiguration config = (com.metamatrix.admin.api.objects.LogConfiguration)src;
+ if (src instanceof org.teiid.adminapi.LogConfiguration) {
+ org.teiid.adminapi.LogConfiguration config = (org.teiid.adminapi.LogConfiguration)src;
return covertToNativeLogConfiguration(config);
}
throw new UnsupportedOperationException(DQPEmbeddedPlugin.Util.getString("UnSupported_object_conversion")); //$NON-NLS-1$
@@ -271,7 +283,7 @@
/**
* Convert LogConfiguration to Admin Object
*/
- private com.metamatrix.admin.api.objects.LogConfiguration covertLogConfiguration(final com.metamatrix.common.log.LogConfiguration src) {
+ private org.teiid.adminapi.LogConfiguration covertLogConfiguration(final com.metamatrix.common.log.LogConfiguration src) {
Map<String, Integer> contextMap = new HashMap<String, Integer>();
for(String context:src.getContexts()) {
contextMap.put(context, src.getLogLevel(context));
@@ -282,7 +294,7 @@
/**
* Convert LogConfiguration to Admin Object
*/
- private com.metamatrix.common.log.LogConfiguration covertToNativeLogConfiguration(final com.metamatrix.admin.api.objects.LogConfiguration src) {
+ private com.metamatrix.common.log.LogConfiguration covertToNativeLogConfiguration(final org.teiid.adminapi.LogConfiguration src) {
Map<String, Integer> contextMap = new HashMap<String, Integer>();
for(String context:src.getContexts()) {
contextMap.put(context, src.getLogLevel(context));
@@ -295,7 +307,7 @@
* @return
* @since 4.3
*/
- private com.metamatrix.admin.api.objects.ConnectorBinding convertConnectorType(final com.metamatrix.common.config.api.ConnectorBinding src, final Object parent) {
+ private org.teiid.adminapi.ConnectorBinding convertConnectorType(final com.metamatrix.common.config.api.ConnectorBinding src, final Object parent) {
MMConnectorBinding binding = new MMConnectorBinding(new String[] {src.getDeployedName()});
binding.setConnectorTypeName(src.getComponentTypeID().getFullName());
@@ -315,13 +327,13 @@
try {
Boolean status = getDataService().getConnectorBindingState(src.getDeployedName());
if (status == Boolean.TRUE) {
- binding.setState(com.metamatrix.admin.api.objects.ConnectorBinding.STATE_OPEN);
+ binding.setState(org.teiid.adminapi.ConnectorBinding.STATE_OPEN);
}
else if (status == Boolean.FALSE) {
- binding.setState(com.metamatrix.admin.api.objects.ConnectorBinding.STATE_DATA_SOURCE_UNAVAILABLE);
+ binding.setState(org.teiid.adminapi.ConnectorBinding.STATE_DATA_SOURCE_UNAVAILABLE);
}
else {
- binding.setState(com.metamatrix.admin.api.objects.ConnectorBinding.STATE_DATA_SOURCE_UNAVAILABLE);
+ binding.setState(org.teiid.adminapi.ConnectorBinding.STATE_DATA_SOURCE_UNAVAILABLE);
}
}catch(Exception e) {
binding.setState(MMConnectorBinding.STATE_DATA_SOURCE_UNAVAILABLE);
@@ -335,7 +347,7 @@
* @return
* @since 4.3
*/
- private com.metamatrix.admin.api.objects.ConnectorType convertConnectorType(final com.metamatrix.common.config.api.ConnectorBindingType src, final Object parent) {
+ private org.teiid.adminapi.ConnectorType convertConnectorType(final com.metamatrix.common.config.api.ConnectorBindingType src, final Object parent) {
MMConnectorType type = new MMConnectorType(new String[] {src.getName()});
type.setCreated(src.getCreatedDate());
type.setCreatedBy(src.getCreatedBy());
@@ -351,7 +363,7 @@
* @return
* @since 4.3
*/
- private com.metamatrix.admin.api.objects.VDB convertVDB(final com.metamatrix.common.vdb.api.VDBDefn src, final Object parent) {
+ private org.teiid.adminapi.VDB convertVDB(final com.metamatrix.common.vdb.api.VDBDefn src, final Object parent) {
MMVDB vdb = new MMVDB(new String[] {src.getName(), src.getVersion()});
vdb.setCreated(src.getDateCreated());
@@ -372,7 +384,7 @@
return vdb;
}
- private com.metamatrix.admin.api.objects.Model convertModel(final com.metamatrix.common.vdb.api.ModelInfo src, final Object parent) {
+ private org.teiid.adminapi.Model convertModel(final com.metamatrix.common.vdb.api.ModelInfo src, final Object parent) {
final com.metamatrix.common.vdb.api.VDBDefn vdb = (com.metamatrix.common.vdb.api.VDBDefn)parent;
MMModel model = new MMModel(new String[] {src.getName()});
model.setCreated(vdb.getDateCreated());
@@ -400,7 +412,7 @@
return model;
}
- private com.metamatrix.admin.api.objects.Request convertRequest(final RequestInfo src) {
+ private org.teiid.adminapi.Request convertRequest(final RequestInfo src) {
String connId = src.getRequestID().getConnectionID();
@@ -630,4 +642,9 @@
}
}
+
+ protected SessionToken validateSession() {
+ return DQPWorkContext.getWorkContext().getSessionToken();
+ }
+
}
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -30,15 +30,16 @@
import java.util.Properties;
import java.util.StringTokenizer;
-import com.metamatrix.admin.api.embedded.EmbeddedConfigAdmin;
-import com.metamatrix.admin.api.exception.AdminComponentException;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
-import com.metamatrix.admin.api.objects.AdminObject;
-import com.metamatrix.admin.api.objects.AdminOptions;
-import com.metamatrix.admin.api.objects.AdminStatus;
-import com.metamatrix.admin.api.objects.LogConfiguration;
-import com.metamatrix.admin.api.objects.VDB;
+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.LogConfiguration;
+import org.teiid.adminapi.VDB;
+
import com.metamatrix.admin.objects.MMAdminObject;
import com.metamatrix.admin.objects.MMAdminStatus;
import com.metamatrix.api.exception.MetaMatrixComponentException;
@@ -73,14 +74,14 @@
* DQP implementation of the Config Admin API
* @since 4.3
*/
-public class DQPConfigAdminImpl extends BaseAdmin implements EmbeddedConfigAdmin {
+public class DQPConfigAdminImpl extends BaseAdmin implements ConfigurationAdmin {
public DQPConfigAdminImpl(EmbeddedConnectionFactoryImpl manager) {
super(manager);
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#setSystemProperty(java.lang.String, java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#setSystemProperty(java.lang.String, java.lang.String)
* @since 4.3
*/
public void setSystemProperty(String propertyName,String propertyValue)
@@ -97,7 +98,7 @@
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#updateSystemProperties(java.util.Properties)
+ * @see org.teiid.adminapi.ConfigurationAdmin#updateSystemProperties(java.util.Properties)
* @since 4.3
*/
public void updateSystemProperties(Properties properties) throws AdminException {
@@ -112,7 +113,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#setProperty(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+ * @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)
@@ -126,7 +127,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#updateProperties(java.lang.String, java.lang.String, java.util.Properties)
+ * @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 {
@@ -186,7 +187,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#addConnectorType(java.lang.String, char[])
+ * @see org.teiid.adminapi.ConfigurationAdmin#addConnectorType(java.lang.String, char[])
* @since 4.3
*/
public void addConnectorType(String deployName, char[] cdkFile)
@@ -216,7 +217,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#deleteConnectorType(java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#deleteConnectorType(java.lang.String)
* @since 4.3
*/
public void deleteConnectorType(String deployName)
@@ -232,10 +233,10 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#addConnectorBinding(java.lang.String, java.lang.String, java.util.Properties, AdminOptions)
+ * @see org.teiid.adminapi.ConfigurationAdmin#addConnectorBinding(java.lang.String, java.lang.String, java.util.Properties, AdminOptions)
* @since 4.3
*/
- public com.metamatrix.admin.api.objects.ConnectorBinding addConnectorBinding(String deployName, String type, Properties properties, AdminOptions options)
+ public org.teiid.adminapi.ConnectorBinding addConnectorBinding(String deployName, String type, Properties properties, AdminOptions options)
throws AdminException {
// if the options object is null treat as if it is IGNORE as default
if (options == null) {
@@ -261,7 +262,7 @@
}
else if (options.containsOption(AdminOptions.OnConflict.IGNORE)) {
binding = getDataService().getConnectorBinding(deployName);
- return (com.metamatrix.admin.api.objects.ConnectorBinding) convertToAdminObjects(binding);
+ return (org.teiid.adminapi.ConnectorBinding) convertToAdminObjects(binding);
}
}
@@ -287,7 +288,7 @@
} catch (MetaMatrixComponentException e) {
throw new AdminComponentException(e);
}
- return (com.metamatrix.admin.api.objects.ConnectorBinding) convertToAdminObjects(binding);
+ return (org.teiid.adminapi.ConnectorBinding) convertToAdminObjects(binding);
}
boolean bindingExists(String name) throws MetaMatrixComponentException {
@@ -301,10 +302,10 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#addConnectorBinding(java.lang.String, char[], AdminOptions)
+ * @see org.teiid.adminapi.ConfigurationAdmin#addConnectorBinding(java.lang.String, char[], AdminOptions)
* @since 4.3
*/
- public com.metamatrix.admin.api.objects.ConnectorBinding addConnectorBinding(String deployName, char[] xmlFile, AdminOptions options)
+ public org.teiid.adminapi.ConnectorBinding addConnectorBinding(String deployName, char[] xmlFile, AdminOptions options)
throws AdminException {
// if the options object is null treat as if it is IGNORE as default
@@ -330,7 +331,7 @@
}
else if (options.containsOption(AdminOptions.OnConflict.IGNORE)) {
binding = getDataService().getConnectorBinding(deployName);
- return (com.metamatrix.admin.api.objects.ConnectorBinding) convertToAdminObjects(binding);
+ return (org.teiid.adminapi.ConnectorBinding) convertToAdminObjects(binding);
}
}
@@ -363,7 +364,7 @@
throw new AdminComponentException(e);
}
- return (com.metamatrix.admin.api.objects.ConnectorBinding) convertToAdminObjects(binding);
+ return (org.teiid.adminapi.ConnectorBinding) convertToAdminObjects(binding);
}
/**
@@ -398,7 +399,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#deleteConnectorBinding(java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#deleteConnectorBinding(java.lang.String)
* @since 4.3
*/
public void deleteConnectorBinding(String identifier)
@@ -414,7 +415,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#addVDB(java.lang.String, byte[], char[], AdminOptions)
+ * @see org.teiid.adminapi.ConfigurationAdmin#addVDB(java.lang.String, byte[], char[], AdminOptions)
* @since 4.3
*/
private VDB addVDB(String deployName, byte[] vdbFile, char[] defFile, AdminOptions options)
@@ -585,7 +586,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#addVDB(java.lang.String, byte[], AdminOptions)
+ * @see org.teiid.adminapi.ConfigurationAdmin#addVDB(java.lang.String, byte[], AdminOptions)
* @since 4.3
*/
public VDB addVDB(String deployName, byte[] vdbFile, AdminOptions options)
@@ -595,7 +596,7 @@
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#addExtensionModule(java.lang.String, java.lang.String, byte[], java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#addExtensionModule(java.lang.String, java.lang.String, byte[], java.lang.String)
* @since 4.3
*/
public void addExtensionModule(String type, String sourceName, byte[] source, String description)
@@ -632,7 +633,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#deleteExtensionModule(java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#deleteExtensionModule(java.lang.String)
* @since 4.3
*/
public void deleteExtensionModule(String sourceName)
@@ -648,7 +649,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#assignBindingToModel(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#assignBindingToModel(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
* @since 4.3
*/
public void assignBindingToModel(String deployedConnectorBindingName, String vdbName, String vdbVersion, String modelName)
@@ -682,9 +683,45 @@
throw new AdminComponentException(e);
}
}
+
+ public void assignBindingsToModel(String[] deployedConnectorBindingName, String vdbName, String vdbVersion, String modelName) throws AdminException {
+ if (deployedConnectorBindingName == null || deployedConnectorBindingName.length == 0) {
+ throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.Invalid_cb_name")); //$NON-NLS-1$
+ }
+
+ if (vdbName == null || vdbVersion == null || !vdbName.matches(SINGLE_WORD_REGEX)) {
+ throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.Invalid_vdb_name")); //$NON-NLS-1$
+ }
+ if (modelName == null || !modelName.matches(MULTIPLE_WORDS_REGEX)) {
+ throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.Invalid_model_name")); //$NON-NLS-1$
+ }
+
+ // find the connector binding if found in the configuration service
+ // add to the vdb binding.
+ try {
+ List list = new ArrayList();
+ for (int i = 0; i < deployedConnectorBindingName.length; i++) {
+ ConnectorBinding binding = getDataService().getConnectorBinding(deployedConnectorBindingName[i]);
+ if (binding != null) {
+ list.add(binding);
+ }
+ }
+
+ if (!list.isEmpty()) {
+ getConfigurationService().assignConnectorBinding(vdbName, vdbVersion, modelName, (ConnectorBinding[])list.toArray(new ConnectorBinding[list.size()]));
+ }
+ else {
+ throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("Admin.Vdb_or_Model_notfound")); //$NON-NLS-1$
+ }
+ } catch (MetaMatrixComponentException e) {
+ throw new AdminComponentException(e);
+ }
+
+ }
+
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#getLogConfiguration()
+ * @see org.teiid.adminapi.ConfigurationAdmin#getLogConfiguration()
* @since 4.3
*/
public LogConfiguration getLogConfiguration()
@@ -693,7 +730,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#setLogConfiguration(com.metamatrix.admin.api.objects.LogConfiguration)
+ * @see org.teiid.adminapi.ConfigurationAdmin#setLogConfiguration(org.teiid.adminapi.LogConfiguration)
* @since 4.3
*/
public void setLogConfiguration(LogConfiguration config)
@@ -702,7 +739,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportExtensionModule(java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportExtensionModule(java.lang.String)
* @since 4.3
*/
public byte[] exportExtensionModule(String sourceName) throws AdminException {
@@ -719,7 +756,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportConfiguration()
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportConfiguration()
* @since 4.3
*/
public char[] exportConfiguration() throws AdminException {
@@ -732,7 +769,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportConnectorBinding(java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportConnectorBinding(java.lang.String)
* @since 4.3
*/
public char[] exportConnectorBinding(String identifier)
@@ -767,7 +804,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportConnectorType(java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportConnectorType(java.lang.String)
* @since 4.3
*/
public char[] exportConnectorType(String identifier)
@@ -797,7 +834,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportVDB(java.lang.String, java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportVDB(java.lang.String, java.lang.String)
* @since 4.3
*/
public byte[] exportVDB(String name, String version)
@@ -819,7 +856,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#addConnectorArchive(byte[], com.metamatrix.admin.api.objects.AdminOptions)
+ * @see org.teiid.adminapi.ConfigurationAdmin#addConnectorArchive(byte[], org.teiid.adminapi.AdminOptions)
* @since 4.3.2
*/
public void addConnectorArchive(byte[] contents, AdminOptions options) throws AdminException {
@@ -938,7 +975,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportConnectorArchive(java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportConnectorArchive(java.lang.String)
* @since 4.3
*/
public byte[] exportConnectorArchive(String identifier) throws AdminException {
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPLogListener.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPLogListener.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPLogListener.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -22,7 +22,8 @@
package com.metamatrix.dqp.embedded.admin;
-import com.metamatrix.admin.api.embedded.EmbeddedLogger;
+import org.teiid.adminapi.EmbeddedLogger;
+
import com.metamatrix.core.log.LogListener;
import com.metamatrix.core.log.LogMessage;
import com.metamatrix.core.log.MessageLevel;
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -22,6 +22,8 @@
package com.metamatrix.dqp.embedded.admin;
+import static org.teiid.dqp.internal.process.Util.convertStats;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -32,22 +34,29 @@
import java.util.Properties;
import java.util.Set;
-import com.metamatrix.admin.api.embedded.EmbeddedMonitoringAdmin;
-import com.metamatrix.admin.api.exception.AdminComponentException;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
-import com.metamatrix.admin.api.objects.AdminObject;
-import com.metamatrix.admin.api.objects.ConnectorBinding;
-import com.metamatrix.admin.api.objects.SystemObject;
-import com.metamatrix.admin.api.objects.Transaction;
+import org.teiid.adminapi.AdminComponentException;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.AdminObject;
+import org.teiid.adminapi.AdminProcessingException;
+import org.teiid.adminapi.ConnectorBinding;
+import org.teiid.adminapi.MonitoringAdmin;
+import org.teiid.adminapi.ProcessObject;
+import org.teiid.adminapi.SystemObject;
+import org.teiid.adminapi.Transaction;
+
import com.metamatrix.admin.objects.MMAdminObject;
+import com.metamatrix.admin.objects.MMProcess;
+import com.metamatrix.admin.objects.MMQueueWorkerPool;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.common.comm.api.ServerConnection;
import com.metamatrix.common.config.api.ComponentType;
+import com.metamatrix.common.queue.WorkerPoolStats;
import com.metamatrix.common.vdb.api.VDBArchive;
import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin;
import com.metamatrix.dqp.service.TransactionService;
import com.metamatrix.jdbc.EmbeddedConnectionFactoryImpl;
+import com.metamatrix.platform.vm.controller.ProcessStatistics;
+import com.metamatrix.platform.vm.controller.SocketListenerStats;
import com.metamatrix.server.serverapi.RequestInfo;
@@ -55,14 +64,14 @@
* DQP implementation of the Monitoring API
* @since 4.3
*/
-public class DQPMonitoringAdminImpl extends BaseAdmin implements EmbeddedMonitoringAdmin {
+public class DQPMonitoringAdminImpl extends BaseAdmin implements MonitoringAdmin {
public DQPMonitoringAdminImpl(EmbeddedConnectionFactoryImpl manager) {
super(manager);
}
/**
- * @see com.metamatrix.admin.api.core.CoreMonitoringAdmin#getConnectorTypes(java.lang.String)
+ * @see org.teiid.adminapi.MonitoringAdmin#getConnectorTypes(java.lang.String)
* @since 4.3
*/
public Collection getConnectorTypes(String identifier)
@@ -76,7 +85,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreMonitoringAdmin#getVDBs(java.lang.String)
+ * @see org.teiid.adminapi.MonitoringAdmin#getVDBs(java.lang.String)
* @since 4.3
*/
public Collection getVDBs(String identifier)
@@ -107,7 +116,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreMonitoringAdmin#getConnectorBindings(java.lang.String)
+ * @see org.teiid.adminapi.MonitoringAdmin#getConnectorBindings(java.lang.String)
* @since 4.3
*/
public Collection getConnectorBindings(String identifier)
@@ -121,7 +130,7 @@
/**
- * @see com.metamatrix.admin.api.core.CoreMonitoringAdmin#getConnectorBindingsInVDB(java.lang.String)
+ * @see org.teiid.adminapi.MonitoringAdmin#getConnectorBindingsInVDB(java.lang.String)
* @since 4.3
*/
public Collection getConnectorBindingsInVDB(String identifier) throws AdminException{
@@ -154,7 +163,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreMonitoringAdmin#getExtensionModules(java.lang.String)
+ * @see org.teiid.adminapi.MonitoringAdmin#getExtensionModules(java.lang.String)
* @since 4.3
*/
public Collection getExtensionModules(String identifier)
@@ -174,7 +183,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreMonitoringAdmin#getQueueWorkerPools(java.lang.String)
+ * @see org.teiid.adminapi.MonitoringAdmin#getQueueWorkerPools(java.lang.String)
* @since 4.3
*/
public Collection getQueueWorkerPools(String identifier)
@@ -214,7 +223,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreMonitoringAdmin#getCaches(java.lang.String)
+ * @see org.teiid.adminapi.MonitoringAdmin#getCaches(java.lang.String)
* @since 4.3
*/
public Collection getCaches(String identifier)
@@ -234,7 +243,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreMonitoringAdmin#getSessions(java.lang.String)
+ * @see org.teiid.adminapi.MonitoringAdmin#getSessions(java.lang.String)
* @since 4.3
*/
public Collection getSessions(String identifier)
@@ -256,7 +265,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreMonitoringAdmin#getRequests(java.lang.String)
+ * @see org.teiid.adminapi.MonitoringAdmin#getRequests(java.lang.String)
* @since 4.3
*/
public Collection getRequests(String identifier)
@@ -278,7 +287,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreMonitoringAdmin#getSourceRequests(java.lang.String)
+ * @see org.teiid.adminapi.MonitoringAdmin#getSourceRequests(java.lang.String)
* @since 4.3
*/
public Collection getSourceRequests(String identifier)
@@ -300,7 +309,7 @@
/**
- * @see com.metamatrix.admin.api.core.CoreMonitoringAdmin#getSystem()
+ * @see org.teiid.adminapi.MonitoringAdmin#getSystem()
* @since 4.3
*/
public SystemObject getSystem(){
@@ -308,7 +317,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreMonitoringAdmin#getPropertyDefinitions(java.lang.String, java.lang.String)
+ * @see org.teiid.adminapi.MonitoringAdmin#getPropertyDefinitions(java.lang.String, java.lang.String)
* @since 4.3
*/
public Collection getPropertyDefinitions(String identifier, String className) throws AdminException {
@@ -378,7 +387,11 @@
}
}
-
-
-
+
+ @Override
+ public Collection<ProcessObject> getProcesses(String processIdentifier) throws AdminException {
+ ArrayList<ProcessObject> list = new ArrayList<ProcessObject>();
+ list.add(this.manager.getProcess());
+ return list;
+ }
}
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPRuntimeStateAdminImpl.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPRuntimeStateAdminImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPRuntimeStateAdminImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -29,15 +29,16 @@
import javax.transaction.xa.Xid;
-import com.metamatrix.admin.api.embedded.EmbeddedLogger;
-import com.metamatrix.admin.api.embedded.EmbeddedRuntimeStateAdmin;
-import com.metamatrix.admin.api.exception.AdminComponentException;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
-import com.metamatrix.admin.api.objects.AdminObject;
-import com.metamatrix.admin.api.objects.Cache;
-import com.metamatrix.admin.api.objects.ConnectorBinding;
-import com.metamatrix.admin.api.objects.Request;
+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.ConnectorBinding;
+import org.teiid.adminapi.EmbeddedLogger;
+import org.teiid.adminapi.Request;
+import org.teiid.adminapi.RuntimeStateAdmin;
+
import com.metamatrix.admin.objects.MMRequest;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.common.application.exception.ApplicationLifecycleException;
@@ -53,7 +54,7 @@
/**
* @since 4.3
*/
-public class DQPRuntimeStateAdminImpl extends BaseAdmin implements EmbeddedRuntimeStateAdmin {
+public class DQPRuntimeStateAdminImpl extends BaseAdmin implements RuntimeStateAdmin {
public DQPRuntimeStateAdminImpl(EmbeddedConnectionFactoryImpl manager) {
super(manager);
@@ -63,12 +64,12 @@
* @see com.metamatrix.admin.api.embedded.EmbeddedRuntimeStateAdmin#stop(int)
* @since 4.3
*/
- public void stop(int millisToWait) throws AdminException {
+ public void shutdown(int millisToWait) throws AdminException {
// TODO: rreddy need to implement the time to wait.
// First terminate all the sessions to the DQP currently have
terminateSession(AdminObject.WILDCARD);
- getManager().shutdown();
+ getManager().shutdown(false);
}
/**
@@ -81,11 +82,11 @@
// Now shutdown the DQP, it will automatically start next timea new connection is
// requested.
- getManager().shutdown();
+ getManager().shutdown(true);
}
/**
- * @see com.metamatrix.admin.api.core.CoreRuntimeStateAdmin#startConnectorBinding(java.lang.String)
+ * @see org.teiid.adminapi.RuntimeStateAdmin#startConnectorBinding(java.lang.String)
* @since 4.3
*/
public void startConnectorBinding(String identifier)
@@ -121,7 +122,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreRuntimeStateAdmin#stopConnectorBinding(java.lang.String, boolean)
+ * @see org.teiid.adminapi.RuntimeStateAdmin#stopConnectorBinding(java.lang.String, boolean)
* @since 4.3
*/
public void stopConnectorBinding(String identifier, boolean stopNow)
@@ -157,7 +158,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreRuntimeStateAdmin#clearCache(java.lang.String)
+ * @see org.teiid.adminapi.RuntimeStateAdmin#clearCache(java.lang.String)
* @since 4.3
*/
public void clearCache(String identifier)
@@ -201,7 +202,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreRuntimeStateAdmin#terminateSession(java.lang.String)
+ * @see org.teiid.adminapi.RuntimeStateAdmin#terminateSession(java.lang.String)
* @since 4.3
*/
public void terminateSession(String identifier)
@@ -233,7 +234,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreRuntimeStateAdmin#cancelRequest(java.lang.String)
+ * @see org.teiid.adminapi.RuntimeStateAdmin#cancelRequest(java.lang.String)
* @since 4.3
*/
public void cancelRequest(String identifier)
@@ -258,7 +259,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreRuntimeStateAdmin#cancelSourceRequest(java.lang.String)
+ * @see org.teiid.adminapi.RuntimeStateAdmin#cancelSourceRequest(java.lang.String)
* @since 4.3
*/
public void cancelSourceRequest(String identifier)
@@ -284,7 +285,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreRuntimeStateAdmin#changeVDBStatus(java.lang.String, java.lang.String, int)
+ * @see org.teiid.adminapi.RuntimeStateAdmin#changeVDBStatus(java.lang.String, java.lang.String, int)
* @since 4.3
*/
public void changeVDBStatus(String name, String version, int status)
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPSecurityAdminImpl.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPSecurityAdminImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPSecurityAdminImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -22,16 +22,266 @@
package com.metamatrix.dqp.embedded.admin;
-import com.metamatrix.admin.api.embedded.EmbeddedSecurityAdmin;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+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.Group;
+import org.teiid.adminapi.Principal;
+import org.teiid.adminapi.SecurityAdmin;
+import org.xml.sax.SAXException;
+
+import com.metamatrix.admin.api.exception.security.InvalidSessionException;
+import com.metamatrix.admin.api.exception.security.MetaMatrixSecurityException;
+import com.metamatrix.admin.objects.MMGroup;
+import com.metamatrix.admin.objects.MMRole;
+import com.metamatrix.api.exception.security.AuthorizationException;
+import com.metamatrix.api.exception.security.AuthorizationMgmtException;
+import com.metamatrix.api.exception.security.MembershipServiceException;
+import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin;
import com.metamatrix.jdbc.EmbeddedConnectionFactoryImpl;
+import com.metamatrix.platform.admin.api.EntitlementMigrationReport;
+import com.metamatrix.platform.security.api.AuthorizationPolicy;
+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.MetaMatrixPrincipalName;
+import com.metamatrix.platform.security.api.SessionToken;
/**
* @since 4.3
*/
-public class DQPSecurityAdminImpl extends BaseAdmin implements EmbeddedSecurityAdmin {
+public class DQPSecurityAdminImpl extends BaseAdmin implements SecurityAdmin {
public DQPSecurityAdminImpl(EmbeddedConnectionFactoryImpl manager) {
super(manager);
}
+
+ /**
+ * @see com.metamatrix.admin.api.server.ServerSecurityAdmin#addRoleToGroup(java.lang.String, java.lang.String)
+ * @since 4.3
+ */
+ public void assignRoleToGroup(String roleIdentifier, String groupIdentifier) throws AdminException {
+ throw new AdminComponentException(DQPEmbeddedPlugin.Util.getString("ServerSecurityAdminImpl.not_implemented")); //$NON-NLS-1$
+ }
+
+ /**
+ * @see com.metamatrix.admin.api.server.ServerSecurityAdmin#removeRoleFromGroup(java.lang.String, java.lang.String)
+ * @since 4.3
+ */
+ public void removeRoleFromGroup(String roleIdentifier, String groupIdentifier) throws AdminException {
+ throw new AdminComponentException(DQPEmbeddedPlugin.Util.getString("ServerSecurityAdminImpl.not_implemented")); //$NON-NLS-1$
+ }
+
+ public boolean authenticateUser(String username, char[] credentials, Serializable trustePayload, String applicationName) throws AdminException {
+ try {
+ return getMembershipService().authenticateUser(username, new Credentials(credentials), trustePayload, applicationName).isAuthenticated();
+ } catch (MembershipServiceException e) {
+ throw new AdminComponentException(e);
+ }
+ }
+
+
+ /**
+ * @see com.metamatrix.admin.api.server.ServerSecurityAdmin#getGroupsForUser(java.lang.String, boolean)
+ * @since 4.3
+ */
+ public Collection getGroupsForUser(String userIdentifier) throws AdminException {
+ if (userIdentifier == null) {
+ throwProcessingException("AdminImpl.requiredparameter", new Object[] {}); //$NON-NLS-1$
+ }
+
+ if ( userIdentifier.equals(AdminObject.WILDCARD) ) {
+ throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("ServerSecurityAdminImpl.Cant_use_wildcard")); //$NON-NLS-1$
+ }
+ Collection groups = new ArrayList();
+ // Get all memberships - explicit and implicit
+ Set allMemberships = null;
+ try {
+ allMemberships = getMembershipService().getGroupsForUser(userIdentifier);
+ } catch (MetaMatrixSecurityException e) {
+ throw new AdminComponentException(e);
+ }
+ Iterator allMembershipsItr = allMemberships.iterator();
+ while ( allMembershipsItr.hasNext() ) {
+ groups.add(new MMGroup(new String[] {(String)allMembershipsItr.next()}));
+ }
+ return groups;
+ }
+
+ /**
+ * @see com.metamatrix.admin.api.server.ServerSecurityAdmin#getGroups(java.lang.String)
+ * @since 4.3
+ */
+ public Collection<Group> getGroups(String groupIdentifier) throws AdminException {
+ if (groupIdentifier == null) {
+ throwProcessingException("AdminImpl.requiredparameter", new Object[] {}); //$NON-NLS-1$
+ }
+
+ Collection<Group> groups = new ArrayList<Group>();
+ Collection allGroups = null;
+ // Add all groups from internal membership domain
+ try {
+ allGroups = getMembershipService().getGroupNames();
+ } catch (MetaMatrixSecurityException e) {
+ throw new AdminComponentException(e);
+ }
+
+ Iterator groupItr = allGroups.iterator();
+ while ( groupItr.hasNext() ) {
+ String groupName = (String) groupItr.next();
+
+ if (!groupIdentifier.equals(AdminObject.WILDCARD) && !groupName.equals(groupIdentifier)) {
+ continue;
+ }
+
+ groups.add(new MMGroup(new String[] {groupName}));
+ }
+ return groups;
+ }
+
+
+ /**
+ * @see com.metamatrix.admin.api.server.ServerSecurityAdmin#getRolesForGroup(java.lang.String)
+ * @since 4.3
+ */
+ public Collection getRolesForGroup(String groupIdentifier) throws AdminException {
+ if (groupIdentifier == null) {
+ throwProcessingException("AdminImpl.requiredparameter", new Object[] {}); //$NON-NLS-1$
+ }
+
+ if ( groupIdentifier.equals(AdminObject.WILDCARD) ) {
+ throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("ServerSecurityAdminImpl.Cant_use_wildcard")); //$NON-NLS-1$
+ }
+ Collection roleNames = null;
+ try {
+ roleNames = getAuthorizationService().getRoleNamesForPrincipal(new MetaMatrixPrincipalName(groupIdentifier, Principal.TYPE_GROUP));
+ } catch (InvalidSessionException e) {
+ throw new AdminComponentException(e);
+ } catch (AuthorizationMgmtException e) {
+ throw new AdminComponentException(e);
+ } catch (AuthorizationException e) {
+ throw new AdminComponentException(e);
+ }
+ Collection roles = new ArrayList();
+ Iterator roleNameItr = roleNames.iterator();
+ while ( roleNameItr.hasNext() ) {
+ String roleName = (String)roleNameItr.next();
+ roles.add(new MMRole(new String[] {roleName}));
+ }
+ return roles;
+ }
+
+ /**
+ * @see com.metamatrix.admin.api.server.ServerSecurityAdmin#importDataRoles(java.lang.String, java.lang.String, char[], org.teiid.adminapi.AdminOptions)
+ */
+ public String importDataRoles(String vdbName, String vdbVersion, char[] xmlContents, AdminOptions options)
+ throws AdminException{
+
+ if (vdbName == null) {
+ throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("ServerSecurityAdminImpl.vdbName_can_not_be_null")); //$NON-NLS-1$
+ }
+
+ if (vdbVersion == null) {
+ throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("ServerSecurityAdminImpl.vdbVersion_can_not_be_null")); //$NON-NLS-1$
+ }
+
+ if (options == null) {
+
+ options = new AdminOptions(AdminOptions.OnConflict.IGNORE);
+ }
+
+ try {
+ EntitlementMigrationReport rpt = new EntitlementMigrationReport("from file", vdbName + " " + vdbVersion); //$NON-NLS-1$ //$NON-NLS-2$
+
+ Collection<AuthorizationPolicy> roles = AuthorizationPolicyFactory.buildPolicies(vdbName, vdbVersion, xmlContents);
+
+ AuthorizationRealm realm = new AuthorizationRealm(vdbName, vdbVersion);
+
+ getAuthorizationService().updatePoliciesInRealm(realm, roles);
+
+ return rpt.toString();
+ } catch (AuthorizationMgmtException e) {
+ throw new AdminProcessingException(e);
+ } catch (SAXException e) {
+ throw new AdminComponentException(e);
+ } catch (IOException e) {
+ throw new AdminComponentException(e);
+ } catch (ParserConfigurationException e) {
+ throw new AdminComponentException(e);
+ }
+ }
+
+ /**
+ * @see com.metamatrix.admin.api.server.ServerSecurityAdmin#exportDataRoles(java.lang.String, java.lang.String)
+ */
+ public char[] exportDataRoles(String vdbName, String vdbVersion) throws AdminException {
+
+ if (vdbName == null) {
+ throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("ServerSecurityAdminImpl.vdbName_can_not_be_null")); //$NON-NLS-1$
+ }
+
+ if (vdbVersion == null) {
+ throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString("ServerSecurityAdminImpl.vdbVersion_can_not_be_null")); //$NON-NLS-1$
+ }
+
+ Collection roles = null;
+ try {
+ roles = getAuthorizationService().getPoliciesInRealm(new AuthorizationRealm(vdbName, vdbVersion));
+ if (roles != null && !roles.isEmpty()) {
+ return AuthorizationPolicyFactory.exportPolicies(roles);
+ }
+ return null;
+ } catch (AuthorizationMgmtException e) {
+ throw new AdminProcessingException(e);
+ } catch (AuthorizationException e) {
+ throw new AdminProcessingException(e);
+ } catch (IOException e) {
+ throw new AdminComponentException(e);
+ }
+ }
+
+ @Override
+ public List<String> getDomainNames() throws AdminException {
+ try {
+ return this.getMembershipService().getDomainNames();
+ } catch (MembershipServiceException e) {
+ throw new AdminComponentException(e);
+ }
+ }
+
+ @Override
+ public Collection<Group> getGroupsForDomain(String domainName)
+ throws AdminException {
+ if (domainName == null) {
+ throwProcessingException("AdminImpl.requiredparameter", new Object[] {}); //$NON-NLS-1$
+ }
+ try {
+ Collection<String> groupNames = this.getMembershipService().getGroupsForDomain(domainName);
+ List<Group> result = new ArrayList<Group>(groupNames.size());
+ for (String groupName : groupNames) {
+ result.add(new MMGroup(new String[] {groupName}));
+ }
+ return result;
+ } catch (MembershipServiceException e) {
+ throw new AdminComponentException(e);
+ }
+ }
+
+ void throwProcessingException(String key, Object[] objects) throws AdminException {
+ throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getString(key, objects));
+ }
+
}
Modified: trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -22,21 +22,23 @@
package com.metamatrix.jdbc;
+import static org.teiid.dqp.internal.process.Util.convertStats;
+
import java.io.File;
-import java.io.FileReader;
import java.io.IOException;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
+import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.URL;
-import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Date;
-import java.util.List;
import java.util.Properties;
-import java.util.concurrent.atomic.AtomicInteger;
+import org.teiid.adminapi.Admin;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.AdminProcessingException;
import org.teiid.dqp.internal.process.DQPCore;
import org.teiid.transport.AdminAuthorizationInterceptor;
import org.teiid.transport.LocalServerConnection;
@@ -45,11 +47,8 @@
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.metamatrix.admin.api.core.Admin;
-import com.metamatrix.admin.api.embedded.EmbeddedAdmin;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
-import com.metamatrix.api.exception.MetaMatrixComponentException;
+import com.metamatrix.admin.objects.MMProcess;
+import com.metamatrix.admin.objects.MMQueueWorkerPool;
import com.metamatrix.common.application.ApplicationService;
import com.metamatrix.common.application.exception.ApplicationInitializationException;
import com.metamatrix.common.application.exception.ApplicationLifecycleException;
@@ -61,9 +60,9 @@
import com.metamatrix.common.comm.exception.ConnectionException;
import com.metamatrix.common.log.LogManager;
import com.metamatrix.common.protocol.URLHelper;
+import com.metamatrix.common.queue.WorkerPoolStats;
import com.metamatrix.common.util.JMXUtil;
import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.common.vdb.api.VDBArchive;
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.core.util.MixinProxy;
import com.metamatrix.dqp.ResourceFinder;
@@ -77,11 +76,11 @@
import com.metamatrix.dqp.service.AuthorizationService;
import com.metamatrix.dqp.service.ConfigurationService;
import com.metamatrix.dqp.service.DQPServiceNames;
-import com.metamatrix.dqp.service.VDBService;
import com.metamatrix.dqp.util.LogConstants;
import com.metamatrix.platform.security.api.ILogon;
-import com.metamatrix.platform.security.api.MetaMatrixSessionID;
import com.metamatrix.platform.security.api.service.SessionServiceInterface;
+import com.metamatrix.platform.vm.controller.ProcessStatistics;
+import com.metamatrix.platform.vm.controller.SocketListenerStats;
/**
@@ -100,6 +99,7 @@
private ConnectionListenerList listenerList = new ConnectionListenerList();
private SocketTransport socketTransport;
private JMXUtil jmxServer;
+ private boolean restart = false;
private final class ConnectionListenerList extends ArrayList<ServerConnectionListener> implements ServerConnectionListener{
@@ -205,8 +205,8 @@
services.registerClientService(ILogon.class, new LogonImpl(sessionService, configService.getClusterName()), com.metamatrix.common.util.LogConstants.CTX_SERVER);
try {
- EmbeddedAdmin roleCheckedServerAdmin = wrapAdminService(EmbeddedAdmin.class, (EmbeddedAdmin)getAdminAPI(null));
- services.registerClientService(EmbeddedAdmin.class, roleCheckedServerAdmin, com.metamatrix.common.util.LogConstants.CTX_ADMIN);
+ Admin roleCheckedServerAdmin = wrapAdminService(Admin.class, getAdminAPI(null));
+ services.registerClientService(Admin.class, roleCheckedServerAdmin, com.metamatrix.common.util.LogConstants.CTX_ADMIN);
} catch (AdminException e) {
// ignore; exception is not thrown in this case.
}
@@ -299,7 +299,7 @@
@Override
public void run() {
- shutdown(false);
+ shutdown(false, false);
}
}
@@ -336,11 +336,11 @@
*
* @see com.metamatrix.jdbc.EmbeddedConnectionFactory#shutdown()
*/
- public void shutdown() {
- shutdown(true);
+ public void shutdown(boolean restart) {
+ shutdown(true, restart);
}
- private synchronized void shutdown(boolean undoShutdownHook) {
+ private synchronized void shutdown(boolean undoShutdownHook, boolean restart) {
if (!isAlive()) {
return;
@@ -356,7 +356,7 @@
if (!this.shutdownInProgress) {
// this will by pass, and only let shutdown called once.
- shutdownInProgress = true;
+ this.shutdownInProgress = true;
try {
this.dqp.stop();
@@ -383,9 +383,11 @@
// shutdown the cache.
ResourceFinder.getCacheFactory().destroy();
- shutdownInProgress = false;
+ this.shutdownInProgress = false;
- init = false;
+ this.init = false;
+
+ this.restart = restart;
}
}
@@ -416,10 +418,54 @@
}
}
};
- return (EmbeddedAdmin) Proxy.newProxyInstance(this.getClass().getClassLoader(),new Class[] {EmbeddedAdmin.class}, handler);
+ return (Admin) Proxy.newProxyInstance(this.getClass().getClassLoader(),new Class[] {Admin.class}, handler);
}
public JMXUtil getJMXServer() {
return this.jmxServer;
}
+
+ public MMProcess getProcess() {
+
+ Properties props = getProperties();
+
+ String hostName = ((InetAddress)props.get(DQPEmbeddedProperties.HOST_ADDRESS)).getHostName();
+ String processName = props.getProperty(DQPEmbeddedProperties.PROCESSNAME);
+
+ String[] identifierParts = new String[] {hostName, processName};
+ MMProcess process = new MMProcess(identifierParts);
+
+ Runtime rt = Runtime.getRuntime();
+
+ process.setEnabled(true);
+ process.setCreated(new Date(getStartTime()));
+ process.setInetAddress((InetAddress)props.get(DQPEmbeddedProperties.HOST_ADDRESS));
+ process.setFreeMemory(rt.freeMemory());
+ process.setTotalMemory(rt.totalMemory());
+ process.setProperties(PropertiesUtils.clone(props));
+
+ if (this.socketTransport != null) {
+ SocketListenerStats socketStats = this.socketTransport.getStats();
+ if (socketStats != null) {
+ process.setSockets(socketStats.sockets);
+ process.setMaxSockets(socketStats.maxSockets);
+ process.setObjectsRead(socketStats.objectsRead);
+ process.setObjectsWritten(socketStats.objectsWritten);
+ }
+
+ WorkerPoolStats workerStats = this.socketTransport.getProcessPoolStats();
+ if (workerStats != null) {
+ MMQueueWorkerPool workerPool = convertStats(workerStats, hostName, processName, workerStats.name);
+
+ process.setQueueWorkerPool(workerPool);
+ }
+
+ process.setPort(this.socketTransport.getPort());
+ }
+ return process;
+ }
+
+ public boolean shouldRestart(){
+ return this.restart;
+ }
}
Modified: trunk/embedded/src/main/java/com/metamatrix/platform/security/authorization/service/AuthorizationServiceImpl.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/platform/security/authorization/service/AuthorizationServiceImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/embedded/src/main/java/com/metamatrix/platform/security/authorization/service/AuthorizationServiceImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -29,19 +29,21 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import java.util.Set;
import javax.xml.parsers.ParserConfigurationException;
+import org.teiid.adminapi.AdminRoles;
import org.teiid.dqp.internal.process.DQPWorkContext;
import org.xml.sax.SAXException;
import com.google.inject.Inject;
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
import com.metamatrix.admin.api.exception.security.MetaMatrixSecurityException;
-import com.metamatrix.admin.api.server.AdminRoles;
import com.metamatrix.api.exception.MetaMatrixComponentException;
+import com.metamatrix.api.exception.security.AuthorizationException;
import com.metamatrix.api.exception.security.AuthorizationMgmtException;
import com.metamatrix.api.exception.security.InvalidPrincipalException;
import com.metamatrix.api.exception.security.MembershipServiceException;
@@ -125,14 +127,13 @@
*/
public Collection getInaccessibleResources(String connectionID, int action, Collection resources, int context)
throws MetaMatrixComponentException {
- SessionToken token = DQPWorkContext.getWorkContext().getSessionToken();
AuthorizationRealm realm = getRealm(DQPWorkContext.getWorkContext());
AuthorizationActions actions = getActions(action);
Collection permissions = createPermissions(realm, resources, actions);
String auditContext = getAuditContext(context);
Collection inaccessableResources = Collections.EMPTY_LIST;
try {
- inaccessableResources = getInaccessibleResources(token, auditContext, permissions);
+ inaccessableResources = getInaccessibleResources(getSession(), auditContext, permissions);
} catch (AuthorizationMgmtException e) {
throw new MetaMatrixComponentException(e);
}
@@ -152,7 +153,7 @@
/**
* Of those resources specified, return the subset for which the specified account
* does <emph>NOT</emph> have authorization to access.
- * @param sessionToken the session token of the principal that is calling this method
+ * @param caller the session token of the principal that is calling this method
* @param contextName the name of the context for the caller (@see AuditContext)
* @param requests the permissions that detail the resources and the desired form of access
* @return the subset of <code>requests</code> that the account does <i>not</i> have access to
@@ -160,9 +161,9 @@
* @throws AuthorizationMgmtException if this service is unable to locate resources required
* for this operation
*/
- public Collection getInaccessibleResources(SessionToken sessionToken, String contextName, Collection requests)
+ private Collection getInaccessibleResources(SessionToken caller, String contextName, Collection requests)
throws AuthorizationMgmtException {
- LogManager.logDetail(com.metamatrix.common.util.LogConstants.CTX_AUTHORIZATION, new Object[]{"getInaccessibleResources(", sessionToken, ", ", contextName, ", ", requests, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ LogManager.logDetail(com.metamatrix.common.util.LogConstants.CTX_AUTHORIZATION, new Object[]{"getInaccessibleResources(", caller, ", ", contextName, ", ", requests, ")"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
List resources = new ArrayList();
if (requests != null && ! requests.isEmpty()) {
@@ -173,16 +174,16 @@
}
// Audit - request
- AuditMessage msg = new AuditMessage( contextName, "getInaccessibleResources-request", sessionToken.getUsername(), resources.toArray()); //$NON-NLS-1$
+ AuditMessage msg = new AuditMessage( contextName, "getInaccessibleResources-request", caller.getUsername(), resources.toArray()); //$NON-NLS-1$
LogManager.log(MessageLevel.INFO, LogConstants.CTX_AUDITLOGGING, msg);
- if (isEntitled(sessionToken.getUsername())) {
+ if (isEntitled(caller.getUsername())) {
return Collections.EMPTY_LIST;
}
Collection results = new HashSet(requests);
try {
- Collection policies = this.getPoliciesForPrincipal(new MetaMatrixPrincipalName(sessionToken.getUsername(), MetaMatrixPrincipal.TYPE_USER), sessionToken, getRequestedRealm(requests));
+ Collection policies = this.getPoliciesForPrincipal(new MetaMatrixPrincipalName(caller.getUsername(), MetaMatrixPrincipal.TYPE_USER), getRequestedRealm(requests));
Iterator policyIter = policies.iterator();
@@ -202,10 +203,10 @@
}
if (results.isEmpty()) {
- msg = new AuditMessage( contextName, "getInaccessibleResources-granted all", sessionToken.getUsername(), resources.toArray()); //$NON-NLS-1$
+ msg = new AuditMessage( contextName, "getInaccessibleResources-granted all", caller.getUsername(), resources.toArray()); //$NON-NLS-1$
LogManager.log(MessageLevel.INFO, LogConstants.CTX_AUDITLOGGING, msg);
} else {
- msg = new AuditMessage( contextName, "getInaccessibleResources-denied", sessionToken.getUsername(), resources.toArray()); //$NON-NLS-1$
+ msg = new AuditMessage( contextName, "getInaccessibleResources-denied", caller.getUsername(), resources.toArray()); //$NON-NLS-1$
LogManager.log(MessageLevel.INFO, LogConstants.CTX_AUDITLOGGING, msg);
}
return results;
@@ -243,7 +244,6 @@
}
public boolean hasRole(String connectionID, String roleType, String roleName) throws MetaMatrixComponentException {
- SessionToken token = DQPWorkContext.getWorkContext().getSessionToken();
AuthorizationRealm realm = null;
@@ -256,7 +256,7 @@
}
try {
- return hasPolicy(token, realm, roleName);
+ return hasPolicy(getSession(), realm, roleName);
} catch (AuthorizationMgmtException err) {
throw new MetaMatrixComponentException(err);
}
@@ -272,18 +272,15 @@
return false;
}
- public boolean hasPolicy(SessionToken caller, AuthorizationRealm realm,
- String policyName) throws AuthorizationMgmtException {
+ private boolean hasPolicy(SessionToken session, AuthorizationRealm realm, String policyName) throws AuthorizationMgmtException {
- if (isEntitled(caller.getUsername())) {
+ if (isEntitled(session.getUsername())) {
return true;
}
Collection policies;
try {
- policies = getPoliciesForPrincipal(new MetaMatrixPrincipalName(
- caller.getUsername(), MetaMatrixPrincipal.TYPE_USER),
- caller, realm);
+ policies = getPoliciesForPrincipal(new MetaMatrixPrincipalName(session.getUsername(), MetaMatrixPrincipal.TYPE_USER), realm);
} catch (InvalidPrincipalException e) {
throw new AuthorizationMgmtException(e);
}
@@ -311,6 +308,24 @@
return false;
}
+ public Collection<String> getRoleNamesForPrincipal(MetaMatrixPrincipalName principal) throws AuthorizationMgmtException {
+ Collection policies;
+ try {
+ policies = getPoliciesForPrincipal(principal, RolePermissionFactory.getRealm());
+ } catch (InvalidPrincipalException e) {
+ throw new AuthorizationMgmtException(e);
+ }
+
+ Collection<String> results = new HashSet<String>();
+
+ for (Iterator i = policies.iterator(); i.hasNext();) {
+ AuthorizationPolicy policy = (AuthorizationPolicy) i.next();
+ results.add(policy.getAuthorizationPolicyID().getDisplayName());
+ }
+
+ return results;
+ }
+
/**
* Return a collection of all policies for which this principal has authorization, caching as needed.
* Policies are returned for the principal and all groups in which the principal has membership.
@@ -323,7 +338,7 @@
* @throws InvalidPrincipalException if the principal is invalid.
* @throws MetaMatrixComponentException
*/
- private Collection<AuthorizationPolicy> getPoliciesForPrincipal(MetaMatrixPrincipalName user, SessionToken session, AuthorizationRealm realm)
+ private Collection<AuthorizationPolicy> getPoliciesForPrincipal(MetaMatrixPrincipalName user, AuthorizationRealm realm)
throws AuthorizationMgmtException, InvalidPrincipalException {
Set<AuthorizationPolicy> result = new HashSet<AuthorizationPolicy>();
@@ -335,8 +350,27 @@
}
if (realm.getSubRealmName() != null) {
+ Collection<AuthorizationPolicy> policies = getPoliciesInRealm(realm);
+ for (AuthorizationPolicy policy : policies) {
+ if (matchesPrincipal(principals, policy)) {
+ result.add(policy);
+ continue;
+ }
+ }
+ } else {
+ //TODO: looking for admin roles
+ }
+
+ return result;
+ }
+
+ @Override
+ public Collection<AuthorizationPolicy> getPoliciesInRealm(AuthorizationRealm realm) throws AuthorizationMgmtException {
+
+ Collection<AuthorizationPolicy> policies = null;
+
+ if (realm.getSubRealmName() != null) {
VDBKey key = new VDBKey(realm.getSuperRealmName(), realm.getSubRealmName());
- Collection<AuthorizationPolicy> policies = null;
synchronized (this.policyCache) {
policies = this.policyCache.get(key);
if (policies == null) {
@@ -360,17 +394,32 @@
this.policyCache.put(key, policies);
}
}
- for (AuthorizationPolicy policy : policies) {
- if (matchesPrincipal(principals, policy)) {
- result.add(policy);
- continue;
+ }
+
+ return policies;
+ }
+
+ public void updatePoliciesInRealm(AuthorizationRealm realm, Collection<AuthorizationPolicy> policies) throws AuthorizationMgmtException {
+
+ if (realm.getSubRealmName() != null) {
+ VDBKey key = new VDBKey(realm.getSuperRealmName(), realm.getSubRealmName());
+ synchronized (this.policyCache) {
+ policies = this.policyCache.get(key);
+ if (policies != null) {
+ this.policyCache.remove(key);
}
- }
- } else {
- //TODO: looking for admin roles
+ try {
+ VDBArchive vdb = vdbService.getVDB(realm.getSuperRealmName(), realm.getSubRealmName());
+ char[] dataRoles = AuthorizationPolicyFactory.exportPolicies(policies);
+ vdb.updateRoles(dataRoles);
+ } catch (IOException e) {
+ throw new AuthorizationMgmtException(e);
+ } catch (MetaMatrixComponentException e) {
+ throw new AuthorizationMgmtException(e);
+ }
+ this.policyCache.put(key, policies);
+ }
}
-
- return result;
}
/**
@@ -443,10 +492,7 @@
* @return Realm to use (based on vdb name and version)
*/
private AuthorizationRealm getRealm(DQPWorkContext context) {
- return
- new AuthorizationRealm(
- context.getVdbName(),
- context.getVdbVersion());
+ return new AuthorizationRealm(context.getVdbName(),context.getVdbVersion());
}
private AuthorizationActions getActions(int actionCode) {
@@ -507,8 +553,14 @@
}
@Override
- public boolean isCallerInRole(SessionToken caller, String roleName) throws AuthorizationMgmtException {
- LogManager.logTrace(com.metamatrix.common.util.LogConstants.CTX_AUTHORIZATION, new Object[]{"isCallerInRole(", caller, roleName, ")"}); //$NON-NLS-1$ //$NON-NLS-2$
- return hasPolicy(caller, RolePermissionFactory.getRealm(), roleName);
+ public boolean isCallerInRole(SessionToken session, String roleName) throws AuthorizationMgmtException {
+ LogManager.logTrace(com.metamatrix.common.util.LogConstants.CTX_AUTHORIZATION, new Object[]{"isCallerInRole(", session, roleName, ")"}); //$NON-NLS-1$ //$NON-NLS-2$
+
+ return hasPolicy(session, RolePermissionFactory.getRealm(), roleName);
}
+
+
+ SessionToken getSession() {
+ return DQPWorkContext.getWorkContext().getSessionToken();
+ }
}
Modified: trunk/embedded/src/main/java/org/teiid/Server.java
===================================================================
--- trunk/embedded/src/main/java/org/teiid/Server.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/embedded/src/main/java/org/teiid/Server.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -26,7 +26,6 @@
import java.io.FileReader;
import java.io.IOException;
import java.io.RandomAccessFile;
-import java.net.InetAddress;
import java.nio.channels.FileChannel;
import java.util.Properties;
@@ -36,10 +35,9 @@
import com.metamatrix.dqp.embedded.DQPEmbeddedProperties;
import com.metamatrix.jdbc.EmbeddedConnectionFactoryImpl;
-public class Server implements ServerMBean{
+public class Server extends EmbeddedConnectionFactoryImpl implements ServerMBean {
private Properties props;
- private EmbeddedConnectionFactoryImpl engine;
public Server(Properties props) {
this.props = props;
@@ -48,10 +46,9 @@
private void start() {
try {
// start the engine.
- this.engine = new EmbeddedConnectionFactoryImpl();
- this.engine.initialize(this.props);
+ initialize(this.props);
- this.engine.getJMXServer().register(TYPE, NAME, this);
+ getJMXServer().register(TYPE, NAME, this);
} catch (ApplicationInitializationException e) {
throw new MetaMatrixRuntimeException(e);
@@ -60,13 +57,13 @@
}
}
- private void stopS() {
- if (engine.isAlive()) {
- engine.shutdown();
+ private void stopS(boolean restart) {
+ if (isAlive()) {
+ shutdown(restart);
}
try {
- this.engine.getJMXServer().unregister(TYPE, NAME);
+ getJMXServer().unregister(TYPE, NAME);
} catch (FailedToRegisterException e) {
// ignore
}
@@ -111,16 +108,11 @@
}
@Override
- public boolean isAlive() {
- return engine.isAlive();
- }
-
- @Override
public void shutdown() {
new Thread(){
public void run(){
System.out.println("Server being shutdown..."); //$NON-NLS-1$
- stopS();
+ stopS(false);
}
}.start();
}
@@ -133,7 +125,18 @@
Runtime.getRuntime().halt(-4);
}
}.start();
- }
+ }
+
+ @Override
+ public void restart() {
+ new Thread(){
+ public void run(){
+ System.out.println("Server being shutdown..."); //$NON-NLS-1$
+ stopS(true);
+ }
+ }.start();
+
+ }
/**
* Start the Server Mode
* @param args
@@ -162,7 +165,7 @@
String port = props.getProperty(DQPEmbeddedProperties.SERVER_PORT);
long time = System.currentTimeMillis() - startTime;
- System.out.println("Teiid Server started on port = "+port + "in "+time/1000+" Secs"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ System.out.println("Teiid Server started on port = "+ port + " in "+time/1000+" Secs"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
// wait.
while(s.isAlive()) {
@@ -175,7 +178,12 @@
// if for some reason engine is still alive kill it.
if (s.isAlive()) {
- s.stopS();
+ s.stopS(false);
}
+
+ // exit code to restart the process.
+ if (s.shouldRestart()) {
+ System.exit(10);
+ }
}
}
Modified: trunk/embedded/src/main/java/org/teiid/ServerMBean.java
===================================================================
--- trunk/embedded/src/main/java/org/teiid/ServerMBean.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/embedded/src/main/java/org/teiid/ServerMBean.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -34,4 +34,6 @@
void shutdown();
void halt();
+
+ void restart();
}
Modified: trunk/embedded/src/main/java/org/teiid/transport/AdminAuthorizationInterceptor.java
===================================================================
--- trunk/embedded/src/main/java/org/teiid/transport/AdminAuthorizationInterceptor.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/embedded/src/main/java/org/teiid/transport/AdminAuthorizationInterceptor.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -27,10 +27,10 @@
import java.lang.reflect.Method;
import java.util.Arrays;
+import org.teiid.adminapi.AdminRoles;
import org.teiid.dqp.internal.process.DQPWorkContext;
import com.metamatrix.admin.RolesAllowed;
-import com.metamatrix.admin.api.server.AdminRoles;
import com.metamatrix.api.exception.MetaMatrixProcessingException;
import com.metamatrix.api.exception.security.AuthorizationException;
import com.metamatrix.client.ExceptionUtil;
Modified: trunk/embedded/src/main/java/org/teiid/transport/ServerWorkItem.java
===================================================================
--- trunk/embedded/src/main/java/org/teiid/transport/ServerWorkItem.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/embedded/src/main/java/org/teiid/transport/ServerWorkItem.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -32,9 +32,9 @@
import javax.crypto.SealedObject;
+import org.teiid.adminapi.AdminProcessingException;
import org.teiid.dqp.internal.process.DQPWorkContext;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
import com.metamatrix.api.exception.ComponentNotFoundException;
import com.metamatrix.api.exception.ExceptionHolder;
import com.metamatrix.api.exception.MetaMatrixProcessingException;
Modified: trunk/embedded/src/main/java/org/teiid/transport/SocketTransport.java
===================================================================
--- trunk/embedded/src/main/java/org/teiid/transport/SocketTransport.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/embedded/src/main/java/org/teiid/transport/SocketTransport.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -23,18 +23,22 @@
import java.io.IOException;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.security.GeneralSecurityException;
import java.util.Properties;
import com.metamatrix.common.comm.ClientServiceRegistry;
import com.metamatrix.common.log.LogManager;
+import com.metamatrix.common.queue.WorkerPoolStats;
+import com.metamatrix.common.util.ApplicationInfo;
import com.metamatrix.common.util.LogConstants;
import com.metamatrix.common.util.PropertiesUtils;
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.dqp.embedded.DQPEmbeddedProperties;
import com.metamatrix.platform.PlatformPlugin;
import com.metamatrix.platform.security.api.service.SessionServiceInterface;
+import com.metamatrix.platform.vm.controller.SocketListenerStats;
/**
* This class starts a Socket for DQP connections and listens on the port and hands out the connections to the
@@ -85,4 +89,16 @@
public void stop() {
this.listener.stop();
}
+
+ public WorkerPoolStats getProcessPoolStats() {
+ return listener.getProcessPoolStats();
+ }
+
+ public int getPort() {
+ return this.listener.getPort();
+ }
+
+ public SocketListenerStats getStats() {
+ return this.listener.getStats();
+ }
}
Modified: trunk/embedded/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties
===================================================================
--- trunk/embedded/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/embedded/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties 2009-06-30 21:19:01 UTC (rev 1090)
@@ -193,4 +193,18 @@
Admin.bindings_exceeded_limit=You have reached the MetaMatrix license limit of connector bindings, Failed to add connector bindings.
DQPEmbeddedManager.start_dqp=DQP is started at time = {0}
-DQPEmbeddedManager.shutdown_dqp=DQP is shutdown at time = {0}
\ No newline at end of file
+DQPEmbeddedManager.shutdown_dqp=DQP is shutdown at time = {0}
+
+ServerSecurityAdminImpl.User_name_too_long=The user name may not be null and cannot be longer than {0} charachters
+ServerSecurityAdminImpl.neither_User_nor_Group=Parameter memberType is neither a User nor a Group.
+ServerSecurityAdminImpl.Unable_to_aquire_MembershipObjectEditor=Unable to aquire MembershipObjectEditor.
+ServerSecurityAdminImpl.Cant_use_wildcard=The wildcard cannot be used here.
+ServerSecurityAdminImpl.Non_existant_role=No administrative role exists with the identifier [{0}].
+ServerSecurityAdminImpl.Unknown_principal=Unknown principal: {0}
+ServerSecurityAdminImpl.Empty_props=No properties to set.
+ServerSecurityAdminImpl.Invalid_prop=Property [{0}] is not a valid User property and will not be set.
+ServerSecurityAdminImpl.Invalid_props=One or more properties were not set because they are no valid for a User:
+ServerSecurityAdminImpl.vdbName_can_not_be_null=Supplied VDB name is null
+ServerSecurityAdminImpl.vdbVersion_can_not_be_null=Supplied VDB version is null
+ServerSecurityAdminImpl.no_vdb_exists=No VDB with name {0}.{1} deployed in the system.
+ServerSecurityAdminImpl.not_implemented=This feature not available.
\ No newline at end of file
Modified: trunk/embedded/src/test/java/com/metamatrix/platform/security/TestAdminAuthInterceptor.java
===================================================================
--- trunk/embedded/src/test/java/com/metamatrix/platform/security/TestAdminAuthInterceptor.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/embedded/src/test/java/com/metamatrix/platform/security/TestAdminAuthInterceptor.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -32,18 +32,16 @@
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
+import org.teiid.adminapi.Admin;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.AdminProcessingException;
+import org.teiid.adminapi.AdminRoles;
import org.teiid.dqp.internal.process.DQPWorkContext;
import org.teiid.transport.AdminAuthorizationInterceptor;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
-import com.metamatrix.admin.api.server.AdminRoles;
-import com.metamatrix.admin.api.server.ServerAdmin;
-import com.metamatrix.api.exception.security.AuthorizationException;
import com.metamatrix.api.exception.security.AuthorizationMgmtException;
import com.metamatrix.core.util.SimpleMock;
import com.metamatrix.dqp.service.AuthorizationService;
-import com.metamatrix.platform.admin.api.ExtensionSourceAdminAPI;
import com.metamatrix.platform.security.api.MetaMatrixSessionID;
import com.metamatrix.platform.security.api.SessionToken;
@@ -63,7 +61,7 @@
@Test(expected=AdminProcessingException.class) public void testAddUserUDF_fail() throws AdminException {
Set<String> userRoles = new HashSet<String>();
- ServerAdmin serverAdmin = getTestServerAdmin(userRoles, ServerAdmin.class);
+ Admin serverAdmin = getTestServerAdmin(userRoles, Admin.class);
serverAdmin.addUDF(null, null);
}
@@ -96,27 +94,27 @@
@Test public void testAddUDF_succeed() throws Exception {
Set<String> userRoles = new HashSet<String>();
userRoles.add(AdminRoles.RoleName.ADMIN_SYSTEM);
- ServerAdmin serverAdmin = getTestServerAdmin(userRoles, ServerAdmin.class);
+ Admin serverAdmin = getTestServerAdmin(userRoles, Admin.class);
serverAdmin.addUDF(null, null);
}
@Test public void testGetVDBs() throws Exception {
Set<String> userRoles = new HashSet<String>();
- ServerAdmin serverAdmin = getTestServerAdmin(userRoles, ServerAdmin.class);
+ Admin serverAdmin = getTestServerAdmin(userRoles, Admin.class);
serverAdmin.getVDBs("*"); //$NON-NLS-1$
}
@Test(expected=AdminProcessingException.class) public void testReadOnlyFails() throws Exception {
Set<String> userRoles = new HashSet<String>();
- ServerAdmin serverAdmin = getTestServerAdmin(userRoles, ServerAdmin.class);
+ Admin serverAdmin = getTestServerAdmin(userRoles, Admin.class);
serverAdmin.getSessions("*"); //$NON-NLS-1$
}
@Test public void testBounce_succeed() throws Exception {
Set<String> userRoles = new HashSet<String>();
userRoles.add(AdminRoles.RoleName.ADMIN_PRODUCT);
- ServerAdmin serverAdmin = getTestServerAdmin(userRoles, ServerAdmin.class);
- serverAdmin.bounceSystem(false);
+ Admin serverAdmin = getTestServerAdmin(userRoles, Admin.class);
+ serverAdmin.restart();
}
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationService.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationService.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationService.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,10 +24,17 @@
import java.util.Collection;
+import com.metamatrix.admin.api.exception.security.InvalidSessionException;
+import com.metamatrix.admin.api.exception.security.MetaMatrixSecurityException;
+import com.metamatrix.api.exception.ComponentNotFoundException;
import com.metamatrix.api.exception.MetaMatrixComponentException;
+import com.metamatrix.api.exception.security.AuthorizationException;
import com.metamatrix.api.exception.security.AuthorizationMgmtException;
import com.metamatrix.common.application.ApplicationService;
import com.metamatrix.core.CoreConstants;
+import com.metamatrix.platform.security.api.AuthorizationPolicy;
+import com.metamatrix.platform.security.api.AuthorizationRealm;
+import com.metamatrix.platform.security.api.MetaMatrixPrincipalName;
import com.metamatrix.platform.security.api.SessionToken;
import com.metamatrix.query.eval.SecurityFunctionEvaluator;
@@ -70,6 +77,39 @@
*/
boolean checkingEntitlements();
- boolean isCallerInRole( SessionToken caller, String roleName ) throws AuthorizationMgmtException;
+ boolean isCallerInRole(SessionToken session, String roleName ) throws AuthorizationMgmtException;
+
+ /**
+ * Returns a Collection of String names of MetaMatrix roles to which the
+ * given principal is assigned.
+ * @param caller the session token of the principal that is attempting to access the roles.
+ * @param principal <code>MetaMatrixPrincipalName</code> for which roles are sought
+ * @return The <code>Collection</code> of role names the principal is assigned.
+ * @throws InvalidSessionException if the administrative session is invalid
+ * @throws MetaMatrixSecurityException if there is a problem internally with the MembershipService
+ * @throws AuthorizationException if administrator does not have the authority to see the requested information
+ * @throws ComponentNotFoundException if a component required by this method could not be found within the server
+ */
+ Collection<String> getRoleNamesForPrincipal(MetaMatrixPrincipalName principal)
+ throws InvalidSessionException, AuthorizationException, AuthorizationMgmtException;
+
+ /**
+ * Returns a <code>Collection</code> of <code>AuthorizationPolicy</code>s
+ * that have <code>AuthorizationPermission</code>s in the given <code>AuthorizationRealm</code>.<br>
+ * <strong>NOTE:</strong> It is the responsibility of the caller to determine
+ * which of the <code>AuthorizationPolicy</code>'s <code>AuthorizationPermission</code>s
+ * are actually in the given <code>AuthorizationRealm</code>. The <code>AuthorizationPolicy</code>
+ * may span <code>AuthorizationRealm</code>s.
+ * @param caller The session token of the principal that is attempting to retrieve the policies.
+ * @param realm The realm in which to search for <code>AuthorizationPermission</code>s.
+ * @return The collection of <code>AuthorizationPolicy</code>s that have permissions
+ * in the given realm - possibly empty but never null.
+ * @throws AuthorizationException if administrator does not have the authority to perform the action.
+ * @throws AuthorizationMgmtException if an error occurs in the Authorization store.
+ */
+ Collection<AuthorizationPolicy> getPoliciesInRealm(AuthorizationRealm realm)
+ throws AuthorizationException, AuthorizationMgmtException;
+
+ void updatePoliciesInRealm(AuthorizationRealm realm, Collection<AuthorizationPolicy> policies) throws AuthorizationMgmtException;
}
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/TransactionService.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/service/TransactionService.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/service/TransactionService.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -31,11 +31,11 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.Transaction;
import org.teiid.connector.xa.api.TransactionContext;
import org.teiid.dqp.internal.transaction.TransactionProvider.XAConnectionSource;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.objects.Transaction;
import com.metamatrix.common.application.ApplicationService;
import com.metamatrix.common.xa.MMXid;
import com.metamatrix.common.xa.XATransactionException;
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/transaction/TransactionServerImpl.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/transaction/TransactionServerImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/transaction/TransactionServerImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -46,12 +46,12 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import org.teiid.adminapi.AdminComponentException;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.AdminProcessingException;
import org.teiid.connector.xa.api.TransactionContext;
import org.teiid.dqp.internal.transaction.TransactionProvider.XAConnectionSource;
-import com.metamatrix.admin.api.exception.AdminComponentException;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
import com.metamatrix.admin.objects.MMAdminObject;
import com.metamatrix.admin.objects.TransactionImpl;
import com.metamatrix.common.application.ApplicationEnvironment;
@@ -630,13 +630,13 @@
}
@Override
- public Collection<com.metamatrix.admin.api.objects.Transaction> getTransactions() {
+ public Collection<org.teiid.adminapi.Transaction> getTransactions() {
Set<TransactionContextImpl> txnSet = Collections.newSetFromMap(new IdentityHashMap<TransactionContextImpl, Boolean>());
synchronized (this.transactions) {
txnSet.addAll(this.transactions.threadToTransactionContext.values());
txnSet.addAll(this.transactions.xidToTransactionContext.values());
}
- Collection<com.metamatrix.admin.api.objects.Transaction> result = new ArrayList<com.metamatrix.admin.api.objects.Transaction>(txnSet.size());
+ Collection<org.teiid.adminapi.Transaction> result = new ArrayList<org.teiid.adminapi.Transaction>(txnSet.size());
for (TransactionContextImpl transactionContextImpl : txnSet) {
if (transactionContextImpl.getTxnID() == null) {
continue;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/service/FakeAuthorizationService.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/service/FakeAuthorizationService.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/service/FakeAuthorizationService.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,11 +24,16 @@
import java.util.*;
+import com.metamatrix.admin.api.exception.security.InvalidSessionException;
import com.metamatrix.api.exception.MetaMatrixComponentException;
+import com.metamatrix.api.exception.security.AuthorizationException;
import com.metamatrix.api.exception.security.AuthorizationMgmtException;
import com.metamatrix.common.application.ApplicationEnvironment;
import com.metamatrix.common.application.exception.ApplicationInitializationException;
import com.metamatrix.common.application.exception.ApplicationLifecycleException;
+import com.metamatrix.platform.security.api.AuthorizationPolicy;
+import com.metamatrix.platform.security.api.AuthorizationRealm;
+import com.metamatrix.platform.security.api.MetaMatrixPrincipalName;
import com.metamatrix.platform.security.api.SessionToken;
/**
@@ -158,9 +163,28 @@
}
@Override
- public boolean isCallerInRole(SessionToken caller, String roleName)
+ public boolean isCallerInRole(SessionToken session, String roleName)
throws AuthorizationMgmtException {
- // rameshTODO Auto-generated method stub
return false;
}
+
+ @Override
+ public Collection<AuthorizationPolicy> getPoliciesInRealm(
+ AuthorizationRealm realm)
+ throws AuthorizationException, AuthorizationMgmtException {
+ return null;
+ }
+
+ @Override
+ public Collection<String> getRoleNamesForPrincipal(MetaMatrixPrincipalName principal) throws InvalidSessionException,
+ AuthorizationException, AuthorizationMgmtException {
+ return null;
+ }
+
+ @Override
+ public void updatePoliciesInRealm(AuthorizationRealm realm,
+ Collection<AuthorizationPolicy> policies)
+ throws AuthorizationMgmtException {
+
+ }
}
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/transaction/TestTransactionServer.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/transaction/TestTransactionServer.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/transaction/TestTransactionServer.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,9 +24,10 @@
import javax.transaction.xa.XAResource;
+import org.teiid.adminapi.Transaction;
+
import junit.framework.TestCase;
-import com.metamatrix.admin.api.objects.Transaction;
import com.metamatrix.common.xa.MMXid;
import com.metamatrix.common.xa.XATransactionException;
import com.metamatrix.core.util.SimpleMock;
Copied: trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerAdmin.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerAdmin.java)
===================================================================
--- trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerAdmin.java (rev 0)
+++ trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerAdmin.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,55 @@
+/*
+ * 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.server;
+
+import org.teiid.adminapi.AdminObject;
+import org.teiid.adminapi.AdminRoles;
+
+import com.metamatrix.admin.RolesAllowed;
+
+/**
+ * <p>This is the primary facade interface to MetaMatrix server administrative functionality. The
+ * general design is to provide getters to retrieve lightweight data transfer
+ * objects ({@link AdminObject}) which are not "live" and do not communicate back
+ * to the server.</p>
+ *
+ * <p>Generally, all objects have an identifier and each identifier form is
+ * specific to the object type. The identifiers taken by the methods in this interface
+ * may take generic identifiers (such as {@link AdminObject#WILDCARD}) to specify a set of objects
+ * to work on. The identifier forms and uniqueness constraints are specified in the
+ * javadoc for each particular object.
+ * </p>
+ *
+ * @see AdminObject
+ *
+ * @since 4.3
+ */
+public interface ServerAdmin extends ServerMonitoringAdmin, ServerConfigAdmin, ServerRuntimeStateAdmin, ServerSecurityAdmin, org.teiid.adminapi.Admin {
+
+ /**
+ * Closes ServerAdmin connection to the server.
+ * @since 4.3
+ */
+ @RolesAllowed(value=AdminRoles.RoleName.ANONYMOUS)
+ void close();
+}
Copied: trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerConfigAdmin.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerConfigAdmin.java)
===================================================================
--- trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerConfigAdmin.java (rev 0)
+++ trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerConfigAdmin.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,277 @@
+/*
+ * 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.server;
+
+import java.util.Properties;
+
+import org.teiid.adminapi.AdminException;
+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;
+
+
+/**
+ * Interface that exposes MetaMatrix server configuration for administration.
+ * <p>
+ * Clients should <i>not</i> code directly to this interface but should instead use {@link ServerAdmin}.
+ * </p>
+ *
+ * @since 4.3
+ */
+ at RolesAllowed(value=AdminRoles.RoleName.ADMIN_SYSTEM)
+public interface ServerConfigAdmin extends
+ ConfigurationAdmin {
+
+ /**
+ * Generate the scripts necessary for loading or refreshing a VDB with Materialized Views.
+ * <p>
+ * This method requires that the VDB version exists in the system and that materialization
+ * model(s) have connector bindings bound to them.
+ *
+ * @param vdbName the name of the VDB containing that materialized views.
+ * @param vdbVersion the version of the VDB.
+ * @param metamatrixUserName the user that will be used to run the load transformation in
+ * MetaMatrix (Load).
+ * @param metamatrixUserPwd the MetaMatrix user's password.
+ * @param materializationUserName the user that will be used to log in directly to the
+ * Materialization database and run the DDL (Create, Truncate, Swap).
+ * @param materializationUserPwd the materialization user's password.
+ * @return The container of scripts that can be saved to a directory.
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ ScriptsContainer generateMaterializationScripts(String vdbName, String vdbVersion,
+ String metamatrixUserName, String metamatrixUserPwd,
+ String materializationUserName, String materializationUserPwd) throws AdminException;
+
+ /**
+ * Add a Host with Properties to MetaMatrix System
+ *
+ * @param hostIdentifier
+ * Name of {@link org.teiid.adminapi.Host Host} to add
+ * @param properties
+ * name,value
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void addHost(String hostIdentifier,
+ Properties properties) throws AdminException;
+
+ /**
+ * Enable Host in Configuration
+ *
+ * @param hostIdentifier
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void enableHost(String hostIdentifier) throws AdminException;
+
+ /**
+ * Disable Host in Configuration
+ *
+ * @param identifier
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void disableHost(String identifier) throws AdminException;
+
+ /**
+ * Delete Host in Configuration
+ * <p>
+ * Note that this method may invalidate your connection to the Admin API, if you are connected to the host you are deleting.
+ * You may receive an exception on the next call to the API, and then it will recover.
+ * As a workaround, you can close your connection and obtain a new connection.
+ * @param identifier
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void deleteHost(String identifier) throws AdminException;
+
+ /**
+ * Delete Process in Configuration
+ *
+ * <p>
+ * Note that this method may invalidate your connection to the Admin API, if you are connected to the process you are deleting.
+ * You may receive an exception on the next call to the API, and then it will recover.
+ * As a workaround, you can close your connection and obtain a new connection.
+ * @param identifier
+ * Process Identifer
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void deleteProcess(String identifier) throws AdminException;
+
+ /**
+ * Enable Process in Configuration
+ *
+ * @param identifier
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void enableProcess(String identifier) throws AdminException;
+
+ /**
+ * Disable Process in Configuration
+ *
+ * @param identifier
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void disableProcess(String identifier) throws AdminException;
+
+ /**
+ * Add Process to specified host in the processIdentifier
+ *
+ * @param processIdentifier
+ * Process Identifiers is Host Name.Process Name e.g. "myhost.MetaMatrixProcess"
+ * @param properties
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void addProcess(String processIdentifier,
+ Properties properties) throws AdminException;
+
+
+
+ /**
+ * Import the Configuration from a character array in XML format.
+ * NOTE: This imports the specified data to the "Next Startup" configuration.
+ * The server must be restarted for the new configuration to take effect.
+ *
+ * @param fileData Contents of configuration file, in XML format, as exported by {@link #exportConfiguration()}
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void importConfiguration(char[] fileData) throws AdminException;
+
+ /**
+ * Deassign a {@link ConnectorBinding} from a {@link VDB}'s Model
+ *
+ * @param connectorBindingName
+ * Name of the ConnectorBinding
+ * @param vdbName
+ * Name of the VDB
+ * @param vdbVersion
+ * Version of the VDB
+ * @param modelName
+ * Name of the Model to unmap Connector Binding
+ * @throws AdminException
+ * if there's a system error or if there's a user input error.
+ * @since 4.3
+ */
+ void deassignBindingFromModel(String connectorBindingName,
+ String vdbName,
+ String vdbVersion,
+ String modelName) throws AdminException;
+
+ /**
+ * Assign {@link ConnectorBinding}s to a {@link VDB}'s Model. If the supplied model does not
+ * support MultiSource bindings, then only the first binding in the supplied array is assigned and
+ * the remainder are ignored.
+ *
+ * @param connectorBindingNames
+ * Names of the ConnectorBindings
+ * @param vdbName
+ * Name of the VDB
+ * @param vdbVersion
+ * Version of the VDB
+ * @param modelName
+ * Name of the Model to map Connector Bindings
+ * @throws AdminException
+ * if there's a system error or if there's a user input error.
+ * @since 4.3
+ */
+ void assignBindingsToModel(String[] connectorBindingNames,
+ String vdbName,
+ String vdbVersion,
+ String modelName) throws AdminException;
+
+ /**
+ * Deassign {@link ConnectorBinding}s from a {@link VDB}'s Model. Any of the supplied array of
+ * bindings are deassigned from the supplied model.
+ *
+ * @param connectorBindingNames
+ * Names of the ConnectorBindings
+ * @param vdbName
+ * Name of the VDB
+ * @param vdbVersion
+ * Version of the VDB
+ * @param modelName
+ * Name of the Model to unmap Connector Bindings
+ * @throws AdminException
+ * if there's a system error or if there's a user input error.
+ * @since 4.3
+ */
+ void deassignBindingsFromModel(String[] connectorBindingNames,
+ String vdbName,
+ String vdbVersion,
+ String modelName) throws AdminException;
+
+
+
+ /**
+ * @param domainprovidername is the name to be assigned to the newly created {@link AuthenticationProvider}
+ * @param providertypename is the type of provider to create.
+ * There are 3 installed provider types and they are:
+ * <ul>
+ * <li> <code>File Membership Domain Provider</code>
+ * <li> <code>LDAP Membership Domain Provider</code>
+ * <li><code>Custom Membership Domain Provider</code>
+ * </ul>
+ * @param properties are the settings specified by the providertype to be used
+ * @throws AdminException
+ * if there's a system error.
+ * @since 5.5.2
+ */
+ void addAuthorizationProvider(String domainprovidername, String providertypename, Properties properties) throws AdminException;
+
+ /**
+ * Return the bootstrap properties used to configure initialize the system.
+ * @return
+ * @throws AdminException
+ * @since 6.0.0
+ */
+ Properties getBootstrapProperties() throws AdminException;
+
+ /**
+ * Retrieves the cluster key that authenticates and secures intra-cluster communication.
+ * @return the cluster key or null if encryption is disabled
+ * @throws AdminException
+ * @since 6.0.0
+ */
+ byte[] getClusterKey() throws AdminException;
+
+}
Copied: trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerMonitoringAdmin.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerMonitoringAdmin.java)
===================================================================
--- trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerMonitoringAdmin.java (rev 0)
+++ trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerMonitoringAdmin.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,118 @@
+/*
+ * 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.server;
+
+import java.util.Collection;
+
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.AdminRoles;
+import org.teiid.adminapi.MonitoringAdmin;
+
+import com.metamatrix.admin.RolesAllowed;
+
+
+/**
+ * Interface that exposes the MetaMatrix server for system monitoring.
+ *
+ * <p>Clients should <i>not</i> code directly to this interface but
+ * should instead use {@link ServerAdmin}.</p>
+ * @since 4.3
+ */
+ at RolesAllowed(value=AdminRoles.RoleName.ADMIN_READONLY)
+public interface ServerMonitoringAdmin extends MonitoringAdmin {
+
+ /**
+ * Get the hosts that correspond to the specified identifier pattern.
+ *
+ * @param hostIdentifier the unique identifier for for a {@link org.teiid.adminapi.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}
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ Collection getHosts(String hostIdentifier) throws AdminException;
+
+ /**
+ * Get the processes that correspond to the specified identifier pattern.
+ *
+ * @param processIdentifier the unique identifier for for a {@link org.teiid.adminapi.ProcessObject ProcessObject}
+ * in the system or "{@link org.teiid.adminapi.AdminObject#WILDCARD WILDCARD}"
+ * if all Processes are desired.
+ * @return Collection of {@link org.teiid.adminapi.ProcessObject ProcessObject}
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ @RolesAllowed(value=AdminRoles.RoleName.ANONYMOUS)
+ Collection getProcesses(String processIdentifier) throws AdminException;
+
+
+ /**
+ * 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}
+ * 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}
+ * @throws AdminException if there's a system error.
+ * @since 6.1
+ */
+
+ Collection getServices(String identifier) throws AdminException ;
+
+
+ /**
+ * Get the Resources that correspond to the specified identifer pattern.
+ *
+ * @param resourceIdentifier the unique resourceIdentifier for for a {@link org.teiid.adminapi.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}
+ * @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.
+ *
+ * @param identifier the unique identifier for for a {@link org.teiid.adminapi.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}
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ Collection getDQPs(String identifier) throws AdminException;
+
+ /**
+ * Export the server logs to a byte[]. The bytes contain the contents of a .zip file containing the logs.
+ * @return the logs, as a byte[].
+ * @throws AdminException
+ * @since 4.3
+ */
+ byte[] exportLogs() throws AdminException;
+
+
+}
Copied: trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerRuntimeStateAdmin.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerRuntimeStateAdmin.java)
===================================================================
--- trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerRuntimeStateAdmin.java (rev 0)
+++ trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerRuntimeStateAdmin.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,123 @@
+/*
+ * 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.server;
+
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.AdminRoles;
+import org.teiid.adminapi.RuntimeStateAdmin;
+
+import com.metamatrix.admin.RolesAllowed;
+
+
+/**
+ * Interface that exposes the MetaMatrix system for runtime control.
+ *
+ * <p>Clients should <i>not</i> code directly to this interface but
+ * should instead use {@link ServerAdmin}.</p>
+ * @since 4.3
+ */
+ at RolesAllowed(value=AdminRoles.RoleName.ADMIN_PRODUCT)
+public interface ServerRuntimeStateAdmin extends RuntimeStateAdmin {
+
+ /**
+ * Stop the entire system.
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ void stopSystem() throws AdminException;
+
+
+ /**
+ * Stop and restart the entire 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
+ * may not be finished.
+ * NOTE: If <code>waitUntilDone</code> is true, this method will wait until the server is able to connect to,
+ * but it may not wait until non-essential services are available.
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ void bounceSystem(boolean waitUntilDone) throws AdminException;
+
+ /**
+ * Synchronize the entire system. Synchronization will attempt to make the
+ * runtime state match the configuration.
+ * @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
+ * may not be finished.
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ void synchronizeSystem(boolean waitUntilDone) throws AdminException;
+
+ /**
+ * Start the Host for this cluster
+ * @param hostIdentifier the unique identifier for for a {@link org.teiid.adminapi.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
+ * may not be finished.
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ void startHost(String hostIdentifier, boolean waitUntilDone) throws AdminException;
+
+ /**
+ * Stop the Host for this cluster
+ * @param hostIdentifier the unique identifier for for a {@link org.teiid.adminapi.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.
+ * This may take a long time to complete. If false, this method returns immediately, even though the operation
+ * may not be finished.
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ void stopHost(String hostIdentifier, boolean stopNow, boolean waitUntilDone) throws AdminException;
+
+ /**
+ * Start a Process in the system.
+ * @param processIdentifier the unique identifier for for a
+ * {@link org.teiid.adminapi.ProcessObject ProcessObject} 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
+ * may not be finished.
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ void startProcess(String processIdentifier, boolean waitUntilDone) throws AdminException;
+
+ /**
+ * Stop Process running in the system.
+ * @param processIdentifier the unique identifier for for a
+ * {@link org.teiid.adminapi.ProcessObject ProcessObject} in the system.
+ * @param stopNow a <code>boolean</code> value indicating whether to halt the process immediately
+ * or let it finish processing first.
+ * @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
+ * may not be finished.
+ * @throws AdminException if there's a system error.
+ * @since 4.3
+ */
+ void stopProcess(String processIdentifier, boolean stopNow, boolean waitUntilDone) throws AdminException;
+}
Copied: trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerSecurityAdmin.java (from rev 1086, trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerSecurityAdmin.java)
===================================================================
--- trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerSecurityAdmin.java (rev 0)
+++ trunk/server/src/main/java/com/metamatrix/admin/api/server/ServerSecurityAdmin.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -0,0 +1,189 @@
+/*
+ * 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.server;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.AdminObject;
+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;
+
+
+/**
+ * Interface that exposes MetaMatrix security system for administration.
+ * <p>
+ * Clients should <i>not</i> code directly to this interface but should instead use {@link ServerAdmin}.
+ * </p>
+ *
+ * @since 4.3
+ */
+ at RolesAllowed(value=AdminRoles.RoleName.ADMIN_SYSTEM)
+public interface ServerSecurityAdmin extends SecurityAdmin {
+
+ /**
+ * 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.
+ * The {@link AdminObject#WILDCARD WILDCARD} cannot be used here.
+ * @return The Collection of {@link Role}s.
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ Collection<Role> getRolesForGroup(String groupIdentifier) throws AdminException;
+
+ /**
+ * Get the Collection of administrative role names possessed by the given user, if any.
+ *
+ * @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 {@link AdminObject#WILDCARD WILDCARD} cannot be used here.
+ * @return The Collection of {@link Role}s
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ Collection<Role> getRolesForUser(String userIdentifier) throws AdminException;
+
+ /**
+ * 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 {@link AdminObject#WILDCARD WILDCARD} cannot be used here.
+ * @return The collection of groups in which the given user has membership.
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ Collection<Group> getGroupsForUser(String userIdentifier) throws AdminException;
+
+
+ /**
+ * 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. <br>
+ * Note that by supplying the {@link AdminObject#WILDCARD WILDCARD} identifier, all all users in the system will
+ * retrieved.</br>
+ * @return The Collection of groups.
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ Collection<Group> getGroups(String groupIdentifier) throws AdminException;
+
+ /**
+ * Assign to the given {@link Group} the given Administrative Role.
+ *
+ * @param roleIdentifier
+ * one of {@link AdminRoles}.
+ * @param groupIdentifier
+ * the unique identifier for the Principal. The {@link AdminObject#WILDCARD WILDCARD} cannot be used here.
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void assignRoleToGroup(String roleIdentifier,
+ String groupIdentifier) throws AdminException;
+
+ /**
+ * Remove an administrative role from the given {@link Group}.
+ *
+ * @param roleIdentifier
+ * one of {@link AdminRoles}
+ * @param groupIdentifier
+ * the unique identifier for the Principal. The {@link AdminObject#WILDCARD WILDCARD} cannot be used here.
+ * @throws AdminException
+ * if there's a system error.
+ * @since 4.3
+ */
+ void removeRoleFromGroup(String roleIdentifier,
+ String groupIdentifier) throws AdminException;
+
+ /**
+ * Import the data Roles for given vdb and version into the connected server
+ * @param vdbName - target name of the VDB, the roles to be imported under
+ * @param vdbVersion - target version of the vdb, the roles to be imported under
+ * @param data - character data array containing the XML file which defines the roles
+ * @param options - options to overwrite in case the matching roles already exist.
+ * @return a report of the import
+ * @throws AdminException
+ */
+ String importDataRoles(String vdbName, String vdbVersion, char[] data, AdminOptions options)
+ throws AdminException;
+
+ /**
+ * Export the data roles defined for the given vdb from the current system
+ * @param vdbName - Name of the vdb
+ * @param vdbVersion - version of the vdb
+ * @return - char[] stream containing the XML contents of the roles.
+ * @throws AdminException
+ */
+ char[] exportDataRoles(String vdbName, String vdbVersion) throws AdminException;
+
+ /**
+ * Authenticate a user with the specified user name and credentials
+ * for use with the specified application. The application name may also
+ * be used by the Membership Service to determine the appropriate authentication
+ * mechanism.
+ * @param username the user name that is to be authenticated
+ * @param credential
+ * @param trustePayload
+ * @param applicationName the name of the application for which the user
+ * is authenticating
+ * @return true if the authentication is successful
+ * @throws AdminException
+ */
+ boolean authenticateUser(String username, char[] credentials, Serializable trustePayload, String applicationName) throws AdminException;
+
+ /**
+ * Returns the active authorization provider domain names, in authentication order.
+ * @return List<String>
+ * @throws AdminException
+ */
+ List<String> getDomainNames( ) throws AdminException;
+
+ /**
+ * Return the {@link Group}s for a given domain. The domain name must be an specified
+ * exactly. See {@link #getActiveDomainNames()} for possible domain names.
+ * @param domainName
+ * @return
+ * @throws AdminException
+ */
+ Collection<Group> getGroupsForDomain(String domainName) throws AdminException;
+}
Modified: trunk/server/src/main/java/com/metamatrix/admin/server/AbstractAdminImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/admin/server/AbstractAdminImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/admin/server/AbstractAdminImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -36,16 +36,16 @@
import javax.xml.parsers.ParserConfigurationException;
+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.VDB;
import org.teiid.dqp.internal.process.DQPWorkContext;
import org.xml.sax.SAXException;
-import com.metamatrix.admin.api.exception.AdminComponentException;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
-import com.metamatrix.admin.api.objects.AdminObject;
-import com.metamatrix.admin.api.objects.AdminOptions;
-import com.metamatrix.admin.api.objects.VDB;
import com.metamatrix.admin.objects.MMAdminObject;
import com.metamatrix.admin.objects.MMConnectorBinding;
import com.metamatrix.admin.objects.MMModel;
Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -30,15 +30,17 @@
import javax.transaction.xa.Xid;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.objects.AdminOptions;
-import com.metamatrix.admin.api.objects.ConnectorBinding;
-import com.metamatrix.admin.api.objects.Group;
-import com.metamatrix.admin.api.objects.LogConfiguration;
-import com.metamatrix.admin.api.objects.ScriptsContainer;
-import com.metamatrix.admin.api.objects.SystemObject;
-import com.metamatrix.admin.api.objects.Transaction;
-import com.metamatrix.admin.api.objects.VDB;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.AdminOptions;
+import org.teiid.adminapi.ConnectorBinding;
+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.Transaction;
+import org.teiid.adminapi.VDB;
+
import com.metamatrix.admin.api.server.ServerAdmin;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.MetaMatrixProcessingException;
@@ -94,7 +96,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#addAuthorizationProvider(java.lang.String, java.lang.String, java.util.Properties)
+ * @see org.teiid.adminapi.ConfigurationAdmin#addAuthorizationProvider(java.lang.String, java.lang.String, java.util.Properties)
* @since 4.3
*/
public void addAuthorizationProvider(String domainprovidername,
@@ -120,7 +122,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreMonitoringAdmin#getConnectorBindingsInVDB(java.lang.String)
+ * @see org.teiid.adminapi.MonitoringAdmin#getConnectorBindingsInVDB(java.lang.String)
* @since 4.3
*/
public Collection getConnectorBindingsInVDB(String identifier) throws AdminException {
@@ -224,7 +226,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreMonitoringAdmin#getPropertyDefinitions(java.lang.String, java.lang.String)
+ * @see org.teiid.adminapi.MonitoringAdmin#getPropertyDefinitions(java.lang.String, java.lang.String)
* @since 4.3
*/
public Collection getPropertyDefinitions(String identifier, String className) throws AdminException {
@@ -273,7 +275,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#addConnectorArchive(byte[], com.metamatrix.admin.api.objects.AdminOptions)
+ * @see org.teiid.adminapi.ConfigurationAdmin#addConnectorArchive(byte[], org.teiid.adminapi.AdminOptions)
* @since 4.3
*/
public void addConnectorArchive(byte[] archiveContents, AdminOptions options) throws AdminException {
@@ -372,7 +374,7 @@
}
/**
- * @see com.metamatrix.admin.api.server.ServerConfigAdmin#setLogConfiguration(com.metamatrix.admin.api.objects.LogConfiguration)
+ * @see com.metamatrix.admin.api.server.ServerConfigAdmin#setLogConfiguration(org.teiid.adminapi.LogConfiguration)
* @since 4.3
*/
public void setLogConfiguration(LogConfiguration config) throws AdminException {
@@ -389,7 +391,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#updateSystemProperties(java.util.Properties)
+ * @see org.teiid.adminapi.ConfigurationAdmin#updateSystemProperties(java.util.Properties)
* @since 4.3
*/
public void updateSystemProperties(Properties properties) throws AdminException {
@@ -496,7 +498,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreRuntimeStateAdmin#clearCache(java.lang.String)
+ * @see org.teiid.adminapi.RuntimeStateAdmin#clearCache(java.lang.String)
* @since 4.3
*/
public void clearCache(String cacheIdentifier) throws AdminException {
@@ -518,7 +520,7 @@
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#updateProperties(java.lang.String, java.lang.String, java.util.Properties)
+ * @see org.teiid.adminapi.ConfigurationAdmin#updateProperties(java.lang.String, java.lang.String, java.util.Properties)
* @since 4.3
*/
public void updateProperties(String identifier,
@@ -681,7 +683,7 @@
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#assignBindingToModel(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#assignBindingToModel(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
* @since 4.3
*/
public void assignBindingToModel(String connectorBindingName,
@@ -692,7 +694,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#deassignBindingsFromModel(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#deassignBindingsFromModel(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
* @since 5.0
*/
public void deassignBindingFromModel(String connectorBindingName,
@@ -703,7 +705,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#assignBindingToModel(String[], java.lang.String, java.lang.String, java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#assignBindingToModel(String[], java.lang.String, java.lang.String, java.lang.String)
* @since 5.0
*/
public void assignBindingsToModel(String[] connectorBindingNames,
@@ -714,7 +716,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#deassignBindingsFromModel(String[], java.lang.String, java.lang.String, java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#deassignBindingsFromModel(String[], java.lang.String, java.lang.String, java.lang.String)
* @since 5.0
*/
public void deassignBindingsFromModel(String[] connectorBindingNames,
@@ -725,7 +727,7 @@
}
/**
- * @see com.metamatrix.admin.api.server.ServerSecurityAdmin#importDataRoles(java.lang.String, java.lang.String, char[], com.metamatrix.admin.api.objects.AdminOptions)
+ * @see com.metamatrix.admin.api.server.ServerSecurityAdmin#importDataRoles(java.lang.String, java.lang.String, char[], org.teiid.adminapi.AdminOptions)
*/
public String importDataRoles(String vdbName, String vdbVersion, char[] data, AdminOptions options) throws AdminException {
return getSecurityAdmin().importDataRoles(vdbName, vdbVersion, data, options);
@@ -740,7 +742,7 @@
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportConfiguration()
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportConfiguration()
* @since 4.3
*/
public char[] exportConfiguration() throws AdminException {
@@ -748,7 +750,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#importConfiguration()
+ * @see org.teiid.adminapi.ConfigurationAdmin#importConfiguration()
* @since 4.3
*/
public void importConfiguration(char[] fileData) throws AdminException {
@@ -756,7 +758,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportConnectorBinding(java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportConnectorBinding(java.lang.String)
* @since 4.3
*/
public char[] exportConnectorBinding(String connectorBindingIdentifier) throws AdminException {
@@ -764,7 +766,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportConnectorType(java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportConnectorType(java.lang.String)
* @since 4.3
*/
public char[] exportConnectorType(String connectorTypeIdentifier) throws AdminException {
@@ -772,7 +774,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportConnectorArchive(java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportConnectorArchive(java.lang.String)
* @since 4.3
*/
public byte[] exportConnectorArchive(String connectorTypeIdentifier) throws AdminException {
@@ -780,7 +782,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportExtensionModule(java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportExtensionModule(java.lang.String)
* @since 4.3
*/
public byte[] exportExtensionModule(String sourceName) throws AdminException {
@@ -788,7 +790,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportVDB(java.lang.String, java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportVDB(java.lang.String, java.lang.String)
* @since 4.3
*/
public byte[] exportVDB(String name, String version) throws AdminException {
@@ -932,14 +934,14 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#addUDF(byte[], java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#addUDF(byte[], java.lang.String)
*/
public void addUDF(byte[] modelFileContents,String classpath) throws AdminException {
getConfigurationAdmin().addUDF(modelFileContents, classpath);
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#deleteUDF()
+ * @see org.teiid.adminapi.ConfigurationAdmin#deleteUDF()
*/
public void deleteUDF() throws AdminException {
getConfigurationAdmin().deleteUDF();
@@ -1001,7 +1003,21 @@
throws AdminException {
return getMonitoringAdmin().getConnectionPoolStats(identifier);
}
-
-
-
+
+ @Override
+ public void extensionModuleModified(String name) throws AdminException {
+ }
+
+ @Override
+ public void restart() throws AdminException {
+ }
+
+ @Override
+ public void setLogListener(EmbeddedLogger listener) throws AdminException {
+ }
+
+ @Override
+ public void shutdown(int millisToWait) throws AdminException {
+ }
+
}
\ 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-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerConfigAdminImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -40,21 +40,21 @@
import java.util.Set;
import java.util.StringTokenizer;
+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.LogConfiguration;
+import org.teiid.adminapi.ProcessObject;
+import org.teiid.adminapi.ScriptsContainer;
+import org.teiid.adminapi.SystemObject;
+import org.teiid.adminapi.VDB;
import org.teiid.transport.SSLConfiguration;
import com.metamatrix.admin.AdminPlugin;
-import com.metamatrix.admin.api.exception.AdminComponentException;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
-import com.metamatrix.admin.api.objects.AdminObject;
-import com.metamatrix.admin.api.objects.AdminOptions;
-import com.metamatrix.admin.api.objects.AdminStatus;
-import com.metamatrix.admin.api.objects.LogConfiguration;
-import com.metamatrix.admin.api.objects.ProcessObject;
-import com.metamatrix.admin.api.objects.ScriptsContainer;
-import com.metamatrix.admin.api.objects.SystemObject;
-import com.metamatrix.admin.api.objects.VDB;
import com.metamatrix.admin.api.server.ServerConfigAdmin;
import com.metamatrix.admin.objects.MMAdminObject;
import com.metamatrix.admin.objects.MMAdminStatus;
@@ -158,12 +158,12 @@
* java.util.Properties, AdminOptions)
* @since 4.3
*/
- public com.metamatrix.admin.api.objects.ConnectorBinding addConnectorBinding(String connectorBindingName,
+ public org.teiid.adminapi.ConnectorBinding addConnectorBinding(String connectorBindingName,
String connectorTypeIdentifier,
Properties properties,
AdminOptions options) throws AdminException {
- com.metamatrix.admin.api.objects.ConnectorBinding newBinding = null;
+ org.teiid.adminapi.ConnectorBinding newBinding = null;
if (connectorBindingName == null) {
throw new AdminProcessingException(AdminServerPlugin.Util.getString("ServerConfigAdminImpl.Name_can_not_be_null")); //$NON-NLS-1$
@@ -210,12 +210,12 @@
Collection newBindings =
parent.getConnectorBindings(AdminObject.WILDCARD + AdminObject.DELIMITER + connectorBindingName);
- newBinding = (com.metamatrix.admin.api.objects.ConnectorBinding)newBindings.iterator().next();
+ newBinding = (org.teiid.adminapi.ConnectorBinding)newBindings.iterator().next();
} else {
// We didn't add the new connector binding. Return the existing.
if (existingBindings != null && existingBindings.size() > 0) {
// Only expecting one existing binding
- newBinding = (com.metamatrix.admin.api.objects.ConnectorBinding)existingBindings.iterator().next();
+ newBinding = (org.teiid.adminapi.ConnectorBinding)existingBindings.iterator().next();
}
}
return newBinding;
@@ -228,9 +228,9 @@
* @see com.metamatrix.admin.api.server.ServerConfigAdmin#addConnectorBinding(java.lang.String, char[], AdminOptions)
* @since 4.3
*/
- public com.metamatrix.admin.api.objects.ConnectorBinding addConnectorBinding(String connectorBindingName,
+ public org.teiid.adminapi.ConnectorBinding addConnectorBinding(String connectorBindingName,
char[] xmlFile, AdminOptions options) throws AdminException {
- com.metamatrix.admin.api.objects.ConnectorBinding newBinding = null;
+ org.teiid.adminapi.ConnectorBinding newBinding = null;
if (xmlFile == null) {
throw new AdminProcessingException(AdminServerPlugin.Util.getString("ServerConfigAdminImpl.CDK_File_Name_can_not_be_null")); //$NON-NLS-1$
@@ -335,7 +335,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#addConnectorArchive(byte[], com.metamatrix.admin.api.objects.AdminOptions)
+ * @see org.teiid.adminapi.ConfigurationAdmin#addConnectorArchive(byte[], org.teiid.adminapi.AdminOptions)
* @since 4.3
*/
public void addConnectorArchive(byte[] contents, AdminOptions options) throws AdminException {
@@ -415,7 +415,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#addAuthroizationProvider(String, String, Properties)
+ * @see org.teiid.adminapi.ConfigurationAdmin#addAuthroizationProvider(String, String, Properties)
* @param domainname is the name to be assigned to the newly created {@link AuthenticationProvider}
* @param provdertypename is the type of provider to create.
* @param properties are the settings specified by the providertype to be used
@@ -808,7 +808,7 @@
String mmHost = null;
String mmPort = null;
Collection hosts = parent.getHosts(AdminObject.WILDCARD);
- com.metamatrix.admin.api.objects.Host aHost = (com.metamatrix.admin.api.objects.Host) hosts.iterator().next();
+ org.teiid.adminapi.Host aHost = (org.teiid.adminapi.Host) hosts.iterator().next();
mmHost = aHost.getName();
Collection hostProcesses = parent.getProcesses(aHost.getIdentifier() + AdminObject.DELIMITER + AdminObject.WILDCARD);
ProcessObject hostProcess = (ProcessObject) hostProcesses.iterator().next();
@@ -1000,7 +1000,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportConfiguration()
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportConfiguration()
* @since 4.3
*/
public char[] exportConfiguration() throws AdminException {
@@ -1040,7 +1040,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#importConfiguration(char[])
+ * @see org.teiid.adminapi.ConfigurationAdmin#importConfiguration(char[])
* @since 4.3
*/
public void importConfiguration(char[] fileData) throws AdminException {
@@ -1086,7 +1086,7 @@
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportConnectorBinding(java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportConnectorBinding(java.lang.String)
* @since 4.3
*/
public char[] exportConnectorBinding(String connectorBindingIdentifier) throws AdminException {
@@ -1167,7 +1167,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportConnectorType(java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportConnectorType(java.lang.String)
* @since 4.3
*/
public char[] exportConnectorType(String connectorTypeIdentifier) throws AdminException {
@@ -1237,7 +1237,7 @@
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportConnectorArchive(java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportConnectorArchive(java.lang.String)
* @since 4.3
*/
public byte[] exportConnectorArchive(String connectorTypeIdentifier) throws AdminException {
@@ -1292,7 +1292,7 @@
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportExtensionModule(java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportExtensionModule(java.lang.String)
* @since 4.3
*/
public byte[] exportExtensionModule(String identifier) throws AdminException {
@@ -1321,7 +1321,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#exportVDB(java.lang.String, java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#exportVDB(java.lang.String, java.lang.String)
* @since 4.3
*/
public byte[] exportVDB(String name, String version) throws AdminException {
@@ -1387,7 +1387,7 @@
}
/**
- * @see com.metamatrix.admin.api.server.ServerConfigAdmin#setLogConfiguration(com.metamatrix.admin.api.objects.LogConfiguration)
+ * @see com.metamatrix.admin.api.server.ServerConfigAdmin#setLogConfiguration(org.teiid.adminapi.LogConfiguration)
* @since 4.3
*/
public void setLogConfiguration(LogConfiguration adminLogConfig) throws AdminException {
@@ -1462,7 +1462,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#updateSystemProperties(java.util.Properties)
+ * @see org.teiid.adminapi.ConfigurationAdmin#updateSystemProperties(java.util.Properties)
* @since 4.3
*/
public void updateSystemProperties(Properties properties) throws AdminException {
@@ -1477,7 +1477,7 @@
/**
- * Supported classes are {@link com.metamatrix.admin.api.objects.Host}, {@link com.metamatrix.admin.api.objects.ConnectorBinding},
+ * Supported classes are {@link org.teiid.adminapi.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
@@ -1496,9 +1496,9 @@
/**
- * Supported classes are {@link com.metamatrix.admin.api.objects.ConnectorBinding}, {@link com.metamatrix.admin.api.objects.Service},
+ * Supported classes are {@link org.teiid.adminapi.ConnectorBinding}, {@link org.teiid.adminapi.Service},
* {@link SystemObject}, {@link ProcessObject}
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#updateProperties(java.lang.String, java.lang.String, java.util.Properties)
+ * @see org.teiid.adminapi.ConfigurationAdmin#updateProperties(java.lang.String, java.lang.String, java.util.Properties)
* @since 4.3
*/
public void updateProperties(String identifier,
@@ -1698,7 +1698,7 @@
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#assignBindingToModel(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#assignBindingToModel(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
* @since 4.3
*/
public void assignBindingToModel(String connectorBindingName,
@@ -1711,7 +1711,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#deassignBindingFromModel(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#deassignBindingFromModel(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
* @since 5.0
*/
public void deassignBindingFromModel(String connectorBindingName,
@@ -1724,7 +1724,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#assignBindingsToModel(String[], java.lang.String, java.lang.String, java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#assignBindingsToModel(String[], java.lang.String, java.lang.String, java.lang.String)
* @since 5.0
*/
public void assignBindingsToModel(String[] connectorBindingNames,
@@ -1804,7 +1804,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#deassignBindingFromModel(String[], java.lang.String, java.lang.String, java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#deassignBindingFromModel(String[], java.lang.String, java.lang.String, java.lang.String)
* @since 5.0
*/
public void deassignBindingsFromModel(String[] connectorBindingNames,
@@ -1902,8 +1902,8 @@
// Second, stop connector binding if running
Collection binding = parent.getConnectorBindings(connectorBindingIdentifier);
if ( binding != null && binding.size() > 0 ) {
- com.metamatrix.admin.api.objects.ConnectorBinding theBinding = (com.metamatrix.admin.api.objects.ConnectorBinding)binding.iterator().next();
- if ( theBinding != null && theBinding.getState() == com.metamatrix.admin.api.objects.ConnectorBinding.STATE_OPEN ) {
+ org.teiid.adminapi.ConnectorBinding theBinding = (org.teiid.adminapi.ConnectorBinding)binding.iterator().next();
+ if ( theBinding != null && theBinding.getState() == org.teiid.adminapi.ConnectorBinding.STATE_OPEN ) {
try {
shutDownConnectorBinding((MMConnectorBinding)theBinding, true);
} catch (final Exception err) {
@@ -2294,7 +2294,7 @@
aBindingName = ((ConnectorBinding)aBindingObj).getName();
} else {
// instance of com.metamatrix.admin.api.objects.ConnectorBinding - or exception
- aBindingName = ((com.metamatrix.admin.api.objects.ConnectorBinding)aBindingObj).getName();
+ aBindingName = ((org.teiid.adminapi.ConnectorBinding)aBindingObj).getName();
}
bindingNames.add(aBindingName);
}
@@ -2329,7 +2329,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#addUDF(byte[], java.lang.String)
+ * @see org.teiid.adminapi.ConfigurationAdmin#addUDF(byte[], java.lang.String)
*/
public void addUDF(byte[] modelFileContents, String classpath) throws AdminException {
classpath = classpath.trim();
@@ -2357,7 +2357,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreConfigAdmin#deleteUDF()
+ * @see org.teiid.adminapi.ConfigurationAdmin#deleteUDF()
*/
public void deleteUDF() throws AdminException {
deleteExtensionModule(FUNCTION_DEFINITIONS_MODEL);
@@ -2383,5 +2383,10 @@
}
return null;
}
+
+ @Override
+ public void extensionModuleModified(String name) 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-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -41,17 +41,18 @@
import java.util.Properties;
import java.util.Set;
-import com.metamatrix.admin.api.exception.AdminComponentException;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
-import com.metamatrix.admin.api.objects.AdminObject;
-import com.metamatrix.admin.api.objects.Model;
-import com.metamatrix.admin.api.objects.Resource;
-import com.metamatrix.admin.api.objects.Service;
-import com.metamatrix.admin.api.objects.Session;
-import com.metamatrix.admin.api.objects.SystemObject;
-import com.metamatrix.admin.api.objects.Transaction;
-import com.metamatrix.admin.api.objects.VDB;
+import org.teiid.adminapi.AdminComponentException;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.AdminObject;
+import org.teiid.adminapi.AdminProcessingException;
+import org.teiid.adminapi.Model;
+import org.teiid.adminapi.Resource;
+import org.teiid.adminapi.Service;
+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.server.ServerMonitoringAdmin;
import com.metamatrix.admin.objects.MMAdminObject;
import com.metamatrix.admin.objects.MMConnectionPool;
@@ -243,7 +244,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreMonitoringAdmin#getConnectorBindingsInVDB(java.lang.String)
+ * @see org.teiid.adminapi.MonitoringAdmin#getConnectorBindingsInVDB(java.lang.String)
* @since 4.3
*/
public Collection getConnectorBindingsInVDB(String identifier) throws AdminException {
@@ -1201,7 +1202,7 @@
}
/**
- * @see com.metamatrix.admin.api.core.CoreMonitoringAdmin#getPropertyDefinitions(java.lang.String, java.lang.String)
+ * @see org.teiid.adminapi.MonitoringAdmin#getPropertyDefinitions(java.lang.String, java.lang.String)
* @since 4.3
*/
public Collection getPropertyDefinitions(String identifier, String className) throws AdminException {
Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerRuntimeStateAdminImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/admin/server/ServerRuntimeStateAdminImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerRuntimeStateAdminImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -31,16 +31,17 @@
import javax.transaction.xa.Xid;
+import org.teiid.adminapi.AdminComponentException;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.AdminProcessingException;
+import org.teiid.adminapi.Cache;
+import org.teiid.adminapi.ConnectorBinding;
+import org.teiid.adminapi.EmbeddedLogger;
+import org.teiid.adminapi.ProcessObject;
+import org.teiid.adminapi.Request;
import org.teiid.dqp.internal.process.DQPWorkContext;
-import com.metamatrix.admin.api.exception.AdminComponentException;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
-import com.metamatrix.admin.api.objects.Cache;
-import com.metamatrix.admin.api.objects.ConnectorBinding;
-import com.metamatrix.admin.api.objects.ProcessObject;
-import com.metamatrix.admin.api.objects.Request;
import com.metamatrix.admin.api.server.ServerRuntimeStateAdmin;
import com.metamatrix.admin.objects.MMConnectorBinding;
import com.metamatrix.admin.objects.MMProcess;
@@ -395,7 +396,7 @@
* @param waitUntilDone Ignored: the waiting for this method is done in ServerAdminClientInterceptor on the client-side.
* @since 4.3
*/
- public void bounceSystem(boolean waitUntilDone) throws AdminException {
+ public void restart() throws AdminException {
try {
getRuntimeStateAdminAPIHelper().bounceServer();
} catch (MetaMatrixComponentException e) {
@@ -432,7 +433,7 @@
/**
- * @see com.metamatrix.admin.api.core.CoreRuntimeStateAdmin#clearCache(java.lang.String)
+ * @see org.teiid.adminapi.RuntimeStateAdmin#clearCache(java.lang.String)
* @since 4.3
*/
public void clearCache(String cacheIdentifier) throws AdminException {
@@ -743,6 +744,16 @@
public void terminateTransaction(Xid transactionId) throws AdminException {
this.getQueryServiceProxy().terminateTransaction(transactionId);
}
-
+ @Override
+ public void setLogListener(EmbeddedLogger listener) throws AdminException {
+ }
+
+ @Override
+ public void bounceSystem(boolean waitUntilDone) throws AdminException {
+ }
+
+ @Override
+ public void shutdown(int millisToWait) throws AdminException {
+ }
}
\ No newline at end of file
Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerSecurityAdminImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/admin/server/ServerSecurityAdminImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerSecurityAdminImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -29,16 +29,17 @@
import java.util.List;
import java.util.Set;
-import com.metamatrix.admin.api.exception.AdminComponentException;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
+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.AdminRoles;
+import org.teiid.adminapi.Group;
+import org.teiid.adminapi.Principal;
+
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
import com.metamatrix.admin.api.exception.security.MetaMatrixSecurityException;
-import com.metamatrix.admin.api.objects.AdminObject;
-import com.metamatrix.admin.api.objects.AdminOptions;
-import com.metamatrix.admin.api.objects.Group;
-import com.metamatrix.admin.api.objects.Principal;
-import com.metamatrix.admin.api.server.AdminRoles;
import com.metamatrix.admin.api.server.ServerSecurityAdmin;
import com.metamatrix.admin.objects.MMGroup;
import com.metamatrix.admin.objects.MMRole;
@@ -284,7 +285,7 @@
}
/**
- * @see com.metamatrix.admin.api.server.ServerSecurityAdmin#importDataRoles(java.lang.String, java.lang.String, char[], com.metamatrix.admin.api.objects.AdminOptions)
+ * @see com.metamatrix.admin.api.server.ServerSecurityAdmin#importDataRoles(java.lang.String, java.lang.String, char[], org.teiid.adminapi.AdminOptions)
*/
public String importDataRoles(String vdbName, String vdbVersion, char[] xmlContents, AdminOptions options)
throws AdminException{
Modified: trunk/server/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -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(com.metamatrix.admin.api.objects.Host.INSTALL_DIR, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.INSTALL_DIR, System.getProperty("user.dir"))); //$NON-NLS-1$
- props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTORY, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTORY, System.getProperty("user.dir"))); //$NON-NLS-1$
- props.setProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY, System.getProperty("user.dir"))); //$NON-NLS-1$
- props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_BIND_ADDRESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.HOST_BIND_ADDRESS, "")); //$NON-NLS-1$
- props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_PHYSICAL_ADDRESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.HOST_PHYSICAL_ADDRESS, "")); //$NON-NLS-1$
+ 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$
host.setProperties(props);
return host;
Modified: trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/AuthorizationAdminAPIImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/AuthorizationAdminAPIImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/AuthorizationAdminAPIImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -29,9 +29,10 @@
import java.util.Map;
import java.util.Set;
+import org.teiid.adminapi.AdminRoles;
+
import com.metamatrix.admin.RolesAllowed;
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
-import com.metamatrix.admin.api.server.AdminRoles;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.security.AuthorizationException;
import com.metamatrix.api.exception.security.AuthorizationMgmtException;
Modified: trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/ConfigurationAdminAPIImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/ConfigurationAdminAPIImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/ConfigurationAdminAPIImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -26,9 +26,10 @@
import java.util.List;
import java.util.Set;
+import org.teiid.adminapi.AdminRoles;
+
import com.metamatrix.admin.RolesAllowed;
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
-import com.metamatrix.admin.api.server.AdminRoles;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.security.AuthorizationException;
import com.metamatrix.common.actions.ActionDefinition;
Modified: trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/ExtensionSourceAdminAPIImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/ExtensionSourceAdminAPIImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/ExtensionSourceAdminAPIImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -25,9 +25,10 @@
import java.util.Collection;
import java.util.List;
+import org.teiid.adminapi.AdminRoles;
+
import com.metamatrix.admin.RolesAllowed;
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
-import com.metamatrix.admin.api.server.AdminRoles;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.security.AuthorizationException;
import com.metamatrix.common.extensionmodule.ExtensionModuleDescriptor;
Modified: trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/RuntimeStateAdminAPIHelper.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/RuntimeStateAdminAPIHelper.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/RuntimeStateAdminAPIHelper.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -32,7 +32,8 @@
import java.util.List;
import java.util.Map;
-import com.metamatrix.admin.api.exception.AdminException;
+import org.teiid.adminapi.AdminException;
+
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.MultipleException;
Modified: trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/RuntimeStateAdminAPIImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/RuntimeStateAdminAPIImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/RuntimeStateAdminAPIImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -28,9 +28,10 @@
import java.util.Iterator;
import java.util.List;
+import org.teiid.adminapi.AdminRoles;
+
import com.metamatrix.admin.RolesAllowed;
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
-import com.metamatrix.admin.api.server.AdminRoles;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.MetaMatrixException;
import com.metamatrix.api.exception.MultipleException;
Modified: trunk/server/src/main/java/com/metamatrix/platform/security/api/service/AuthorizationServiceInterface.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/security/api/service/AuthorizationServiceInterface.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/platform/security/api/service/AuthorizationServiceInterface.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -27,9 +27,10 @@
import java.util.Map;
import java.util.Set;
+import org.teiid.adminapi.AdminOptions;
+
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
import com.metamatrix.admin.api.exception.security.MetaMatrixSecurityException;
-import com.metamatrix.admin.api.objects.AdminOptions;
import com.metamatrix.api.exception.ComponentNotFoundException;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.security.AuthorizationException;
Modified: trunk/server/src/main/java/com/metamatrix/platform/security/authorization/service/AuthorizationServiceImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/security/authorization/service/AuthorizationServiceImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/platform/security/authorization/service/AuthorizationServiceImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -33,10 +33,11 @@
import java.util.Properties;
import java.util.Set;
+import org.teiid.adminapi.AdminOptions;
+import org.teiid.adminapi.AdminRoles;
+
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
import com.metamatrix.admin.api.exception.security.MetaMatrixSecurityException;
-import com.metamatrix.admin.api.objects.AdminOptions;
-import com.metamatrix.admin.api.server.AdminRoles;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.security.AuthorizationException;
import com.metamatrix.api.exception.security.AuthorizationMgmtException;
Modified: trunk/server/src/main/java/com/metamatrix/platform/vm/api/controller/ProcessManagement.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/vm/api/controller/ProcessManagement.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/platform/vm/api/controller/ProcessManagement.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -24,7 +24,8 @@
import java.net.InetAddress;
-import com.metamatrix.admin.api.exception.AdminException;
+import org.teiid.adminapi.AdminException;
+
import com.metamatrix.common.config.api.ServiceComponentDefnID;
import com.metamatrix.common.log.LogConfiguration;
import com.metamatrix.platform.service.api.ServiceID;
Modified: trunk/server/src/main/java/com/metamatrix/platform/vm/controller/ProcessController.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/vm/controller/ProcessController.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/platform/vm/controller/ProcessController.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -37,10 +37,10 @@
import java.util.Map;
import java.util.Properties;
+import org.teiid.adminapi.AdminException;
import org.teiid.transport.AdminAuthorizationInterceptor;
import org.teiid.transport.LogonImpl;
-import com.metamatrix.admin.api.exception.AdminException;
import com.metamatrix.admin.api.server.ServerAdmin;
import com.metamatrix.admin.server.ServerAdminImpl;
import com.metamatrix.api.exception.MetaMatrixComponentException;
Modified: trunk/server/src/main/java/com/metamatrix/server/admin/apiimpl/RuntimeMetadataAdminAPIImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/admin/apiimpl/RuntimeMetadataAdminAPIImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/server/admin/apiimpl/RuntimeMetadataAdminAPIImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -34,11 +34,11 @@
import java.util.Properties;
import java.util.Set;
+import org.teiid.adminapi.AdminRoles;
import org.teiid.transport.SSLConfiguration;
import com.metamatrix.admin.RolesAllowed;
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
-import com.metamatrix.admin.api.server.AdminRoles;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.security.AuthorizationException;
import com.metamatrix.common.config.api.ConnectorBinding;
Modified: trunk/server/src/main/java/com/metamatrix/server/admin/apiimpl/RuntimeMetadataHelper.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/admin/apiimpl/RuntimeMetadataHelper.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/server/admin/apiimpl/RuntimeMetadataHelper.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -33,7 +33,8 @@
import java.util.Map;
import java.util.Set;
-import com.metamatrix.admin.api.objects.AdminOptions;
+import org.teiid.adminapi.AdminOptions;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.security.AuthorizationMgmtException;
import com.metamatrix.common.jdbc.JDBCPlatform;
Modified: trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformAuthorizationService.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformAuthorizationService.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformAuthorizationService.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -34,6 +34,7 @@
import com.google.inject.Inject;
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
import com.metamatrix.api.exception.MetaMatrixComponentException;
+import com.metamatrix.api.exception.security.AuthorizationException;
import com.metamatrix.api.exception.security.AuthorizationMgmtException;
import com.metamatrix.api.exception.security.InvalidUserException;
import com.metamatrix.api.exception.security.MembershipServiceException;
@@ -44,9 +45,11 @@
import com.metamatrix.dqp.service.AuthorizationService;
import com.metamatrix.platform.security.api.AuthorizationActions;
import com.metamatrix.platform.security.api.AuthorizationPermission;
+import com.metamatrix.platform.security.api.AuthorizationPolicy;
import com.metamatrix.platform.security.api.AuthorizationRealm;
import com.metamatrix.platform.security.api.BasicAuthorizationPermission;
import com.metamatrix.platform.security.api.BasicAuthorizationPermissionFactory;
+import com.metamatrix.platform.security.api.MetaMatrixPrincipalName;
import com.metamatrix.platform.security.api.SessionToken;
import com.metamatrix.platform.security.api.StandardAuthorizationActions;
import com.metamatrix.platform.security.api.service.AuthorizationServiceInterface;
@@ -213,10 +216,29 @@
}
@Override
- public boolean isCallerInRole(SessionToken caller, String roleName)
+ public boolean isCallerInRole(SessionToken session, String roleName)
throws AuthorizationMgmtException {
- // rameshTODO Auto-generated method stub
return false;
}
+ @Override
+ public Collection<AuthorizationPolicy> getPoliciesInRealm(
+ AuthorizationRealm realm)
+ throws AuthorizationException, AuthorizationMgmtException {
+ return null;
+ }
+
+ @Override
+ public Collection<String> getRoleNamesForPrincipal(
+ MetaMatrixPrincipalName principal) throws InvalidSessionException,
+ AuthorizationException, AuthorizationMgmtException {
+ return null;
+ }
+
+ @Override
+ public void updatePoliciesInRealm(AuthorizationRealm realm,
+ Collection<AuthorizationPolicy> policies)
+ throws AuthorizationMgmtException {
+ }
+
}
Modified: trunk/server/src/main/java/com/metamatrix/server/query/service/QueryService.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/query/service/QueryService.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/server/query/service/QueryService.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -34,10 +34,10 @@
import javax.transaction.xa.Xid;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.Transaction;
import org.teiid.dqp.internal.process.DQPCore;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.objects.Transaction;
import com.metamatrix.api.exception.ComponentNotFoundException;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.server.InvalidRequestIDException;
Modified: trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServiceInterface.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServiceInterface.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServiceInterface.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -26,8 +26,9 @@
import javax.transaction.xa.Xid;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.objects.Transaction;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.Transaction;
+
import com.metamatrix.api.exception.ComponentNotFoundException;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.server.InvalidRequestIDException;
Modified: trunk/server/src/test/java/com/metamatrix/admin/server/FakeCacheAdmin.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/admin/server/FakeCacheAdmin.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/test/java/com/metamatrix/admin/server/FakeCacheAdmin.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -32,7 +32,8 @@
import java.util.Properties;
import java.util.Set;
-import com.metamatrix.admin.api.objects.Cache;
+import org.teiid.adminapi.Cache;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.common.application.ClassLoaderManager;
import com.metamatrix.common.comm.ClientServiceRegistry;
Modified: trunk/server/src/test/java/com/metamatrix/admin/server/FakeConfigurationService.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/admin/server/FakeConfigurationService.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/test/java/com/metamatrix/admin/server/FakeConfigurationService.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -34,7 +34,8 @@
import java.util.Properties;
import java.util.Set;
-import com.metamatrix.admin.api.objects.Resource;
+import org.teiid.adminapi.Resource;
+
import com.metamatrix.common.actions.ActionDefinition;
import com.metamatrix.common.actions.CreateObject;
import com.metamatrix.common.actions.ModificationException;
Modified: trunk/server/src/test/java/com/metamatrix/admin/server/FakeQueryService.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/admin/server/FakeQueryService.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/test/java/com/metamatrix/admin/server/FakeQueryService.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -34,8 +34,9 @@
import javax.transaction.xa.Xid;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.objects.Transaction;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.Transaction;
+
import com.metamatrix.admin.objects.MMAdminObject;
import com.metamatrix.api.exception.ComponentNotFoundException;
import com.metamatrix.api.exception.MetaMatrixComponentException;
Modified: trunk/server/src/test/java/com/metamatrix/admin/server/FakeRuntimeStateAdminAPIHelper.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/admin/server/FakeRuntimeStateAdminAPIHelper.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/test/java/com/metamatrix/admin/server/FakeRuntimeStateAdminAPIHelper.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -28,7 +28,8 @@
import java.util.List;
import java.util.Set;
-import com.metamatrix.admin.api.objects.AdminObject;
+import org.teiid.adminapi.AdminObject;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.MultipleException;
import com.metamatrix.api.exception.security.AuthorizationException;
Modified: trunk/server/src/test/java/com/metamatrix/admin/server/IdentifierConstants.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/admin/server/IdentifierConstants.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/test/java/com/metamatrix/admin/server/IdentifierConstants.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -22,8 +22,8 @@
package com.metamatrix.admin.server;
-import com.metamatrix.admin.api.objects.AdminObject;
-import com.metamatrix.admin.api.objects.Request;
+import org.teiid.adminapi.AdminObject;
+import org.teiid.adminapi.Request;
/**
Modified: trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -28,16 +28,17 @@
import java.util.List;
import java.util.Properties;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.AdminObject;
+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.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
-import com.metamatrix.admin.api.objects.AdminObject;
-import com.metamatrix.admin.api.objects.AdminOptions;
-import com.metamatrix.admin.api.objects.ConnectorBinding;
-import com.metamatrix.admin.api.objects.Host;
-import com.metamatrix.admin.api.objects.ProcessObject;
-import com.metamatrix.admin.api.objects.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-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/test/java/com/metamatrix/admin/server/TestServerMonitoringAdminImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -28,13 +28,14 @@
import java.util.List;
import java.util.Properties;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.AdminObject;
+import org.teiid.adminapi.ConnectorBinding;
+import org.teiid.adminapi.Request;
+import org.teiid.adminapi.Session;
+
import junit.framework.TestCase;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.objects.AdminObject;
-import com.metamatrix.admin.api.objects.ConnectorBinding;
-import com.metamatrix.admin.api.objects.Request;
-import com.metamatrix.admin.api.objects.Session;
import com.metamatrix.admin.objects.MMConnectorBinding;
import com.metamatrix.admin.objects.MMConnectorType;
import com.metamatrix.admin.objects.MMDQP;
Modified: trunk/server/src/test/java/com/metamatrix/admin/server/TestServerRuntimeStateAdminImpl.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/admin/server/TestServerRuntimeStateAdminImpl.java 2009-06-27 05:22:45 UTC (rev 1089)
+++ trunk/server/src/test/java/com/metamatrix/admin/server/TestServerRuntimeStateAdminImpl.java 2009-06-30 21:19:01 UTC (rev 1090)
@@ -23,14 +23,15 @@
package com.metamatrix.admin.server;
import java.util.List;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.AdminObject;
+import org.teiid.adminapi.AdminProcessingException;
+import org.teiid.adminapi.Cache;
+import org.teiid.adminapi.ConnectorBinding;
+import org.teiid.adminapi.Request;
+
import junit.framework.TestCase;
-import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.admin.api.exception.AdminProcessingException;
-import com.metamatrix.admin.api.objects.AdminObject;
-import com.metamatrix.admin.api.objects.Cache;
-import com.metamatrix.admin.api.objects.ConnectorBinding;
-import com.metamatrix.admin.api.objects.Request;
import com.metamatrix.common.id.dbid.DBIDGenerator;
import com.metamatrix.platform.config.ConfigUpdateMgr;
import com.metamatrix.platform.registry.ClusteredRegistryState;
More information about the teiid-commits
mailing list