[teiid-commits] teiid SVN: r2449 - in trunk: client/src/main/java/org/teiid/adminapi and 2 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Wed Aug 11 16:45:31 EDT 2010
Author: shawkins
Date: 2010-08-11 16:45:30 -0400 (Wed, 11 Aug 2010)
New Revision: 2449
Modified:
trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
trunk/client/src/main/java/org/teiid/adminapi/Admin.java
trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java
trunk/test-integration/db/src/test/java/org/teiid/adminapi/jboss/TestConnectorBindings.java
Log:
TEIID-1199 fixing adminapi method names. TEIID-1187 allowing connection type to be set via admin api
Modified: trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
===================================================================
--- trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java 2010-08-11 20:33:46 UTC (rev 2448)
+++ trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java 2010-08-11 20:45:30 UTC (rev 2449)
@@ -44,6 +44,7 @@
import org.teiid.adminapi.Translator;
import org.teiid.adminapi.VDB;
import org.teiid.adminapi.WorkerPoolStatistics;
+import org.teiid.adminapi.VDB.ConnectionType;
import org.teiid.adminshell.Help.Doc;
@@ -105,16 +106,14 @@
}
p = props;
}
-
-
@Doc(text = "Adds a role to the specified policy")
- public static void addRoleToDataPolicy(
+ public static void addDataRoleMapping(
@Doc(text = "vdb name") String vdbName,
@Doc(text = "vdb version") int vdbVersion,
@Doc(text = "policy name") String policyName,
@Doc(text = "role") String role) throws AdminException {
- getAdmin().addRoleToDataPolicy(vdbName, vdbVersion, policyName, role);
+ getAdmin().addDataRoleMapping(vdbName, vdbVersion, policyName, role);
}
@Doc(text = "Assign a translator and data source to a source Model")
@@ -154,6 +153,15 @@
public static Collection<String> getCacheTypes() throws AdminException {
return getAdmin().getCacheTypes();
}
+
+ @Doc(text = "Cancel a request")
+ public static void changeVDBConnectionType(
+ @Doc(text = "vdb name") String vdbName,
+ @Doc(text = "vdb version") int vdbVersion,
+ @Doc(text = "Connection Type") String type)
+ throws AdminException {
+ getAdmin().changeVDBConnectionType(vdbName, vdbVersion, ConnectionType.valueOf(type));
+ }
@Doc(text = "Get all translator instances")
public static Collection<Translator> getTranslators()
@@ -223,13 +231,13 @@
}
@Doc(text = "Remove a role for the data policy")
- public static void removeRoleFromDataPolicy(
+ public static void removeDataRoleMapping(
@Doc(text = "vdb name") String vdbName,
@Doc(text = "vdb version") int vdbVersion,
@Doc(text = "policy name") String policyName,
@Doc(text = "role name") String role) throws AdminException {
getAdmin()
- .removeRoleFromDataPolicy(vdbName, vdbVersion, policyName, role);
+ .removeDataRoleMapping(vdbName, vdbVersion, policyName, role);
}
@Doc(text = "Set a runtime property")
Modified: trunk/client/src/main/java/org/teiid/adminapi/Admin.java
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/Admin.java 2010-08-11 20:33:46 UTC (rev 2448)
+++ trunk/client/src/main/java/org/teiid/adminapi/Admin.java 2010-08-11 20:45:30 UTC (rev 2449)
@@ -27,6 +27,8 @@
import java.util.Properties;
import java.util.Set;
+import org.teiid.adminapi.VDB.ConnectionType;
+
public interface Admin {
public enum Cache {PREPARED_PLAN_CACHE, QUERY_SERVICE_RESULT_SET_CACHE};
@@ -45,6 +47,15 @@
void assignToModel(String vdbName, int vdbVersion, String modelName, String sourceName, String translatorName, String dsName) throws AdminException;
/**
+ * Change the {@link ConnectionType} of the {@link VDB}.
+ * @param vdbName Name of the VDB
+ * @param vdbVersion Version of the VDB
+ * @param type
+ * @throws AdminException
+ */
+ void changeVDBConnectionType(String vdbName, int vdbVersion, ConnectionType type) throws AdminException;
+
+ /**
* Deploy a {@link VDB} file.
* @param name Name of the VDB file to save under
* @param VDB VDB.
@@ -210,24 +221,24 @@
void close();
/**
- * Assign a Role name to the Data Policy in a given VDB
+ * Assign a Role name to the Data Role in a given VDB
*
* @param vdbName
* @param vdbVersion
* @param policyName
* @param role
*/
- void addRoleToDataPolicy(String vdbName, int vdbVersion, String policyName, String role) throws AdminException;
+ void addDataRoleMapping(String vdbName, int vdbVersion, String policyName, String role) throws AdminException;
/**
- * Assign a Role name to the Data Policy in a given VDB
+ * Assign a Role name to the Data Role in a given VDB
*
* @param vdbName
* @param vdbVersion
* @param policyName
* @param role
*/
- void removeRoleFromDataPolicy(String vdbName, int vdbVersion, String policyName, String role) throws AdminException;
+ void removeDataRoleMapping(String vdbName, int vdbVersion, String policyName, String role) throws AdminException;
/**
Modified: trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java 2010-08-11 20:33:46 UTC (rev 2448)
+++ trunk/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java 2010-08-11 20:45:30 UTC (rev 2449)
@@ -41,6 +41,7 @@
import org.jboss.managed.plugins.DefaultFieldsImpl;
import org.jboss.managed.plugins.WritethroughManagedPropertyImpl;
import org.jboss.metatype.api.types.CollectionMetaType;
+import org.jboss.metatype.api.types.EnumMetaType;
import org.jboss.metatype.api.types.SimpleMetaType;
import org.jboss.metatype.api.values.CollectionValueSupport;
import org.jboss.metatype.api.values.MetaValue;
@@ -62,6 +63,7 @@
import org.teiid.adminapi.Translator;
import org.teiid.adminapi.VDB;
import org.teiid.adminapi.WorkerPoolStatistics;
+import org.teiid.adminapi.VDB.ConnectionType;
import org.teiid.adminapi.impl.PropertyDefinitionMetadata;
import org.teiid.adminapi.impl.RequestMetadata;
import org.teiid.adminapi.impl.SessionMetadata;
@@ -441,6 +443,26 @@
}
return false;
}
+
+ @Override
+ public void changeVDBConnectionType(String vdbName, int vdbVersion,
+ ConnectionType type) throws AdminException {
+ ManagedComponent mc = getVDBManagedComponent(vdbName, vdbVersion);
+ if (mc == null) {
+ throw new AdminProcessingException(IntegrationPlugin.Util.getString("vdb_not_found", vdbName, vdbVersion)); //$NON-NLS-1$
+ }
+
+ ManagedProperty connectionTypeProperty = mc.getProperty("connectionType"); //$NON-NLS-1$
+ if (connectionTypeProperty != null) {
+ connectionTypeProperty.setValue(ManagedUtil.wrap(new EnumMetaType(ConnectionType.values()), type != null ?type.name():ConnectionType.BY_VERSION.name()));
+ }
+
+ try {
+ getView().updateComponent(mc);
+ } catch (Exception e) {
+ throw new AdminComponentException(e.getMessage(), e);
+ }
+ }
@Override
public void assignToModel(String vdbName, int vdbVersion, String modelName, String sourceName, String translatorName, String dsName) throws AdminException {
@@ -552,12 +574,12 @@
@Override
- public void addRoleToDataPolicy(String vdbName, int vdbVersion, String policyName, String role) throws AdminException {
+ public void addDataRoleMapping(String vdbName, int vdbVersion, String policyName, String role) throws AdminException {
manageRoleToDataPolicy(vdbName, vdbVersion, policyName, role, true);
}
@Override
- public void removeRoleFromDataPolicy(String vdbName, int vdbVersion, String policyName, String role) throws AdminException{
+ public void removeDataRoleMapping(String vdbName, int vdbVersion, String policyName, String role) throws AdminException{
manageRoleToDataPolicy(vdbName, vdbVersion, policyName, role, false);
}
Modified: trunk/test-integration/db/src/test/java/org/teiid/adminapi/jboss/TestConnectorBindings.java
===================================================================
--- trunk/test-integration/db/src/test/java/org/teiid/adminapi/jboss/TestConnectorBindings.java 2010-08-11 20:33:46 UTC (rev 2448)
+++ trunk/test-integration/db/src/test/java/org/teiid/adminapi/jboss/TestConnectorBindings.java 2010-08-11 20:45:30 UTC (rev 2449)
@@ -309,7 +309,7 @@
@Test public void testAddRoleNames() throws Exception {
installVDB();
- admin.addRoleToDataPolicy("TransactionsRevisited", 1, "policy1", "managers"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ admin.addDataRoleMapping("TransactionsRevisited", 1, "policy1", "managers"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
VDB vdb = admin.getVDB("TransactionsRevisited", 1); //$NON-NLS-1$
List<DataPolicy> policies = vdb.getDataPolicies();
@@ -322,7 +322,7 @@
}
// remove the role
- admin.removeRoleFromDataPolicy("TransactionsRevisited", 1, "policy1", "managers");
+ admin.removeDataRoleMapping("TransactionsRevisited", 1, "policy1", "managers");
vdb = admin.getVDB("TransactionsRevisited", 1); //$NON-NLS-1$
policies = vdb.getDataPolicies();
@@ -336,7 +336,7 @@
}
// remove non-existent role name
- admin.removeRoleFromDataPolicy("TransactionsRevisited", 1, "policy1", "FOO");
+ admin.removeDataRoleMapping("TransactionsRevisited", 1, "policy1", "FOO");
}
@Test
More information about the teiid-commits
mailing list