Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [4959] added missing remotes and remote api methods to this consolidated bean
|
From: <jsh...@rh...> - 2009-08-20 02:55:34
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [4959] added missing remotes and remote api methods to this consolidated bean</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>4959</dd> <dt>Author</dt> <dd>jshaughn</dd> <dt>Date</dt> <dd>2009-08-19 21:55:24 -0500 (Wed, 19 Aug 2009)</dd> </dl> <h3>Log Message</h3> <pre>added missing remotes and remote api methods to this consolidated bean</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverwebservicesWebservicesManagerBeanjava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverwebservicesWebservicesManagerBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java (4958 => 4959)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java 2009-08-20 02:53:59 UTC (rev 4958) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java 2009-08-20 02:55:24 UTC (rev 4959) </span><span class="lines">@@ -36,6 +36,7 @@ </span><span class="cx"> import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria; </span><span class="add">+import org.rhq.core.domain.criteria.ResourceTypeCriteria; </span><span class="cx"> import org.rhq.core.domain.criteria.RoleCriteria; import org.rhq.core.domain.criteria.SubjectCriteria; import org.rhq.core.domain.event.Event; </span><span class="lines">@@ -54,6 +55,7 @@ </span><span class="cx"> import org.rhq.core.domain.operation.ResourceOperationHistory; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; </span><span class="add">+import org.rhq.core.domain.resource.ResourceType; </span><span class="cx"> import org.rhq.core.domain.resource.composite.ProblemResourceComposite; import org.rhq.core.domain.resource.composite.ResourceComposite; import org.rhq.core.domain.resource.group.ResourceGroup; </span><span class="lines">@@ -77,6 +79,8 @@ </span><span class="cx"> import org.rhq.enterprise.server.content.ChannelManagerRemote; import org.rhq.enterprise.server.content.ContentManagerLocal; import org.rhq.enterprise.server.content.ContentManagerRemote; </span><span class="add">+import org.rhq.enterprise.server.discovery.DiscoveryBossLocal; +import org.rhq.enterprise.server.discovery.DiscoveryBossRemote; </span><span class="cx"> import org.rhq.enterprise.server.event.EventManagerLocal; import org.rhq.enterprise.server.event.EventManagerRemote; import org.rhq.enterprise.server.exception.LoginException; </span><span class="lines">@@ -106,6 +110,8 @@ </span><span class="cx"> import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.resource.ResourceManagerRemote; import org.rhq.enterprise.server.resource.ResourceNotFoundException; </span><span class="add">+import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; +import org.rhq.enterprise.server.resource.ResourceTypeManagerRemote; </span><span class="cx"> import org.rhq.enterprise.server.resource.ResourceTypeNotFoundException; import org.rhq.enterprise.server.resource.group.ResourceGroupDeleteException; import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal; </span><span class="lines">@@ -127,12 +133,30 @@ </span><span class="cx"> */ @Stateless @WebService(endpointInterface = "org.rhq.enterprise.server.webservices.WebservicesRemote", targetNamespace = ServerVersion.namespace) </span><span class="rem">-public class WebservicesManagerBean implements AlertManagerRemote, AlertDefinitionManagerRemote, - AvailabilityManagerRemote, CallTimeDataManagerRemote, ChannelManagerRemote, ConfigurationManagerRemote, - ContentManagerRemote, DataAccessManagerRemote, EventManagerRemote, MeasurementBaselineManagerRemote, - MeasurementDataManagerRemote, MeasurementDefinitionManagerRemote, MeasurementProblemManagerRemote, - MeasurementScheduleManagerRemote, OperationManagerRemote, ResourceManagerRemote, ResourceGroupManagerRemote, - RoleManagerRemote, SubjectManagerRemote, SupportManagerRemote, SystemManagerRemote { </span><span class="add">+public class WebservicesManagerBean implements // + AlertManagerRemote, // + AlertDefinitionManagerRemote, // + AvailabilityManagerRemote, // + CallTimeDataManagerRemote, // + ChannelManagerRemote, // + ConfigurationManagerRemote, // + ContentManagerRemote, // + DataAccessManagerRemote, // + DiscoveryBossRemote, // + EventManagerRemote, // + MeasurementBaselineManagerRemote, // + MeasurementDataManagerRemote, // + MeasurementDefinitionManagerRemote, // + MeasurementProblemManagerRemote, // + MeasurementScheduleManagerRemote, // + OperationManagerRemote, // + ResourceManagerRemote, // + ResourceGroupManagerRemote, // + ResourceTypeManagerRemote, // + RoleManagerRemote, // + SubjectManagerRemote, // + SupportManagerRemote, // + SystemManagerRemote { </span><span class="cx"> //Lookup the required beans as local references private AlertManagerLocal alertManager = LookupUtil.getAlertManager(); </span><span class="lines">@@ -143,6 +167,7 @@ </span><span class="cx"> private ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); private ContentManagerLocal contentManager = LookupUtil.getContentManager(); private DataAccessManagerLocal dataAccessManager = LookupUtil.getDataAccessManager(); </span><span class="add">+ private DiscoveryBossLocal discoveryBoss = LookupUtil.getDiscoveryBoss(); </span><span class="cx"> private EventManagerLocal eventManager = LookupUtil.getEventManager(); private MeasurementBaselineManagerLocal measurementBaselineManager = LookupUtil.getMeasurementBaselineManager(); private MeasurementDataManagerLocal measurementDataManager = LookupUtil.getMeasurementDataManager(); </span><span class="lines">@@ -153,6 +178,7 @@ </span><span class="cx"> private OperationManagerLocal operationManager = LookupUtil.getOperationManager(); private ResourceManagerLocal resourceManager = LookupUtil.getResourceManager(); private ResourceGroupManagerLocal resourceGroupManager = LookupUtil.getResourceGroupManager(); </span><span class="add">+ private ResourceTypeManagerLocal resourceTypeManager = LookupUtil.getResourceTypeManager(); </span><span class="cx"> private RoleManagerLocal roleManager = LookupUtil.getRoleManager(); private SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager(); private SupportManagerLocal supportManager = LookupUtil.getSupportManager(); </span><span class="lines">@@ -326,6 +352,10 @@ </span><span class="cx"> return configurationManager.updateResourceConfiguration(subject, resourceId, newConfiguration); } </span><span class="add">+ public ConfigurationDefinition getPackageTypeConfigurationDefinition(Subject subject, int packageTypeId) { + return configurationManager.getPackageTypeConfigurationDefinition(subject, packageTypeId); + } + </span><span class="cx"> //CONFIGURATIONMANAGER: END ---------------------------------- //CONTENTMANAGER: BEGIN ---------------------------------- </span><span class="lines">@@ -377,6 +407,21 @@ </span><span class="cx"> //DATAACCESSMANAGER: END ---------------------------------- </span><span class="add">+ //DISCOVERYBOSS: BEGIN ------------------------------------ + public void ignoreResources(Subject subject, Integer[] resourceIds) { + discoveryBoss.ignoreResources(subject, resourceIds); + } + + public void importResources(Subject subject, Integer[] resourceIds) { + discoveryBoss.importResources(subject, resourceIds); + } + + public void unignoreResources(Subject subject, Integer[] resourceIds) { + discoveryBoss.unignoreResources(subject, resourceIds); + } + + //DISCOVERYBOSS: END ------------------------------------ + </span><span class="cx"> //EVENTMANAGER: BEGIN ---------------------------------- public PageList<Event> findEventsByCriteria(Subject subject, EventCriteria criteria) { return eventManager.findEventsByCriteria(subject, criteria); </span><span class="lines">@@ -552,6 +597,14 @@ </span><span class="cx"> return resourceManager.findResourcesByCriteria(subject, criteria); } </span><span class="add">+ public PageList<Resource> findChildResources(Subject subject, int resourceId, PageControl pageControl) { + return resourceManager.findChildResources(subject, resourceId, pageControl); + } + + public Resource getParentResource(Subject subject, int resourceId) { + return resourceManager.getParentResource(subject, resourceId); + } + </span><span class="cx"> public Resource getResource(Subject subject, int resourceId) { return resourceManager.getResource(subject, resourceId); } </span><span class="lines">@@ -606,6 +659,21 @@ </span><span class="cx"> //RESOURCEGROUPMANAGER: END ---------------------------------- </span><span class="add">+ //RESOURCETYPEMANAGER: BEGIN ------------------------------------ + public PageList<ResourceType> findResourceTypesByCriteria(Subject subject, ResourceTypeCriteria criteria) { + return resourceTypeManager.findResourceTypesByCriteria(subject, criteria); + } + + public ResourceType getResourceTypeById(Subject subject, int resourceTypeId) throws ResourceTypeNotFoundException { + return resourceTypeManager.getResourceTypeById(subject, resourceTypeId); + } + + public ResourceType getResourceTypeByNameAndPlugin(Subject subject, String name, String plugin) { + return resourceTypeManager.getResourceTypeByNameAndPlugin(subject, name, plugin); + } + + //RESOURCETYPEMANAGER: END ------------------------------------ + </span><span class="cx"> //ROLEMANAGER: BEGIN ---------------------------------- public void addResourceGroupsToRole(Subject subject, int roleId, int[] pendingGroupIds) { roleManager.addResourceGroupsToRole(subject, roleId, pendingGroupIds); </span><span class="lines">@@ -707,11 +775,11 @@ </span><span class="cx"> //SUPPORTMANAGER: END ------------------------------------ </span><span class="rem">- //SYSTEMMANAGER: BEGIN ------------------------------------ </span><span class="add">+ //SYSTEMMANAGER: BEGIN ------------------------------------ </span><span class="cx"> public ServerVersion getServerVersion(Subject subject) throws Exception { return systemManager.getServerVersion(subject); } </span><span class="rem">- //SYSTEMMANAGER: END ------------------------------------ </span><span class="add">+ //SYSTEMMANAGER: END ------------------------------------ </span><span class="cx"> } </span> </pre> </div> </div> </body> </html> |