[teiid-commits] teiid SVN: r1077 - trunk/server/src/main/java/com/metamatrix/admin/server.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2009-06-24 14:50:01 -0400 (Wed, 24 Jun 2009)
New Revision: 1077

Modified:
   trunk/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java
   trunk/server/src/main/java/com/metamatrix/admin/server/ServerConfigAdminImpl.java
Log:
Teiid-570 -  reverse these changes, removing the configuration related methods that were added

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-24 18:00:40 UTC (rev 1076)
+++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.java	2009-06-24 18:50:01 UTC (rev 1077)
@@ -991,20 +991,6 @@
 	}
 
 	@Override
-	public Collection getConnectorBindingsToConfigure(String resourceIdentfier)
-			throws AdminException {
-		// TODO Auto-generated method stub
-		return getConfigurationAdmin().getConnectorBindingsToConfigure(resourceIdentfier);
-	}
-
-	@Override
-	public Collection getServicesToConfigure(String resourceIdentfier)
-			throws AdminException {
-		// TODO Auto-generated method stub
-		return getConfigurationAdmin().getServicesToConfigure(resourceIdentfier);
-	}
-
-	@Override
 	public Collection getServices(String identifier) throws AdminException {
 		// TODO Auto-generated method stub
 		return getMonitoringAdmin().getServices(identifier);

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-24 18:00:40 UTC (rev 1076)
+++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerConfigAdminImpl.java	2009-06-24 18:50:01 UTC (rev 1077)
@@ -2103,105 +2103,7 @@
 			throw new AdminComponentException(e);
 		}
     }
-    
-    
-    @Override
-	public Collection getConnectorBindingsToConfigure(String resourceIdentfier)
-			throws AdminException {
-        if (resourceIdentfier == null) {
-            throwProcessingException("AdminImpl.requiredparameter", new Object[] {}); //$NON-NLS-1$
-        }
-        
-        HashSet results = new HashSet();
-        try {
-            ConfigurationModelContainer config = getConfigurationServiceProxy().getConfigurationModel(Configuration.NEXT_STARTUP);
 
-            Collection<ConnectorBinding> components = config.getConfiguration().getConnectorBindings();
-
-            for (Iterator<ConnectorBinding> iter = components.iterator(); iter.hasNext();) {
-                ConnectorBinding cb = iter.next();
-
-                String bindingName = cb.getName();
-
-                String[] identifierParts = new String[] {
-                     bindingName
-                };
-
-                if (identifierMatches(resourceIdentfier, identifierParts)) {
-			        MMConnectorBinding binding = new MMConnectorBinding(identifierParts);
-			        binding.setConnectorTypeName(cb.getComponentTypeID().getFullName());
-			        binding.setRoutingUUID(cb.getRoutingUUID());
-			        binding.setEnabled(cb.isEnabled());
-			        binding.setDeployed(false);
-			        binding.setRegistered(false);
-			        binding.setState(MMConnectorBinding.STATE_NOT_REGISTERED);
-			        binding.setProperties(cb.getProperties());
-			        
-			        binding.setCreated(cb.getCreatedDate());
-			        binding.setCreatedBy(cb.getCreatedBy());
-			        binding.setLastUpdated(cb.getLastChangedDate());
-			        binding.setLastUpdatedBy(cb.getLastChangedBy());
-			        results.add(binding);
-                }
-            }
-         } catch(ConfigurationException e) {
-        	throw new AdminComponentException(e); 
-        } catch (ServiceException e) {
-        	throw new AdminComponentException(e);
-        } 
-
-        return results;
-	}
-
-	@Override
-	public Collection getServicesToConfigure(String resourceIdentfier)
-			throws AdminException {
-	       if (resourceIdentfier == null) {
-	            throwProcessingException("AdminImpl.requiredparameter", new Object[] {}); //$NON-NLS-1$
-	        }
-	        
-	        HashSet results = new HashSet();
-	        try {
-	            ConfigurationModelContainer config = getConfigurationServiceProxy().getConfigurationModel(Configuration.NEXT_STARTUP);
-
-	            Collection<ServiceComponentDefn> components = config.getConfiguration().getServiceComponentDefns();
-
-	            for (Iterator<ServiceComponentDefn> iter = components.iterator(); iter.hasNext();) {
-	            	ServiceComponentDefn svc = iter.next();
-
-	                String svcName = svc.getName();
-
-	                String[] identifierParts = new String[] {
-	                     svcName
-	                };
-
-	                if (identifierMatches(resourceIdentfier, identifierParts)) {
-				        MMService service = new MMService(identifierParts);
-				        service.setComponentTypeName(svc.getComponentTypeID().getFullName());
-				        service.setEnabled(svc.isEnabled());
-				        service.setDeployed(false);
-				        service.setRegistered(false);
-				        service.setState(MMConnectorBinding.STATE_NOT_REGISTERED);
-				        service.setProperties(svc.getProperties());
-				        
-				        service.setCreated(svc.getCreatedDate());
-				        service.setCreatedBy(svc.getCreatedBy());
-				        service.setLastUpdated(svc.getLastChangedDate());
-				        service.setLastUpdatedBy(svc.getLastChangedBy());
-				        results.add(service);
-	                }
-	            }
-	         } catch(ConfigurationException e) {
-	        	throw new AdminComponentException(e); 
-	        } catch (ServiceException e) {
-	        	throw new AdminComponentException(e);
-	        } 
-
-	        return results;
-
-	}
-
-
     protected ServiceComponentDefn getServiceByName(String serviceName) throws ConfigurationException,
                                                                        InvalidSessionException,
                                                                        AuthorizationException,