apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug CLOUDSTACK-1171 due to spring injection.

Browse Source
This commit is contained in:
Min Chen 2013-02-05 21:55:11 -08:00
parent fda8ec3c59
commit 5a2cd68fa8
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
View File

@ -11,12 +11,16 @@
// Unless required by applicable law or agreed to in writing, // Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an // software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the // KIND, either express or implied. See the License for the
// specific language governing permissions and limitations // specific language governing permissions and limitations
// under the License. // under the License.
package com.cloud.hypervisor.vmware.resource; package com.cloud.hypervisor.vmware.resource;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import com.cloud.hypervisor.vmware.manager.VmwareManager; import com.cloud.hypervisor.vmware.manager.VmwareManager;
import com.cloud.hypervisor.vmware.manager.VmwareManagerImpl; import com.cloud.hypervisor.vmware.manager.VmwareManagerImpl;
@ -25,18 +29,25 @@ import com.cloud.utils.StringUtils;
import com.cloud.utils.component.ComponentContext; import com.cloud.utils.component.ComponentContext;
import com.vmware.apputils.version.ExtendedAppUtil; import com.vmware.apputils.version.ExtendedAppUtil;
@Component
public class VmwareContextFactory { public class VmwareContextFactory {
private static final Logger s_logger = Logger.getLogger(VmwareContextFactory.class); private static final Logger s_logger = Logger.getLogger(VmwareContextFactory.class);
private static volatile int s_seq = 1; private static volatile int s_seq = 1;
private static VmwareManager s_vmwareMgr; private static VmwareManager s_vmwareMgr;
@Inject VmwareManager _vmwareMgr;
static { static {
// skip certificate check // skip certificate check
System.setProperty("axis.socketSecureFactory", "org.apache.axis.components.net.SunFakeTrustSocketFactory"); System.setProperty("axis.socketSecureFactory", "org.apache.axis.components.net.SunFakeTrustSocketFactory");
s_vmwareMgr = ComponentContext.inject(VmwareManagerImpl.class); //s_vmwareMgr = ComponentContext.inject(VmwareManagerImpl.class);
}
@PostConstruct
void init() {
s_vmwareMgr = _vmwareMgr;
} }
public static VmwareContext create(String vCenterAddress, String vCenterUserName, String vCenterPassword) throws Exception { public static VmwareContext create(String vCenterAddress, String vCenterUserName, String vCenterPassword) throws Exception {
@ -49,13 +60,13 @@ public class VmwareContextFactory {
if(s_logger.isDebugEnabled()) if(s_logger.isDebugEnabled())
s_logger.debug("initialize VmwareContext. url: " + serviceUrl + ", username: " + vCenterUserName + ", password: " + StringUtils.getMaskedPasswordForDisplay(vCenterPassword)); s_logger.debug("initialize VmwareContext. url: " + serviceUrl + ", username: " + vCenterUserName + ", password: " + StringUtils.getMaskedPasswordForDisplay(vCenterPassword));
ExtendedAppUtil appUtil = ExtendedAppUtil.initialize(vCenterAddress + "-" + s_seq++, params); ExtendedAppUtil appUtil = ExtendedAppUtil.initialize(vCenterAddress + "-" + s_seq++, params);
appUtil.connect(); appUtil.connect();
VmwareContext context = new VmwareContext(appUtil, vCenterAddress); VmwareContext context = new VmwareContext(appUtil, vCenterAddress);
context.registerStockObject(VmwareManager.CONTEXT_STOCK_NAME, s_vmwareMgr); context.registerStockObject(VmwareManager.CONTEXT_STOCK_NAME, s_vmwareMgr);
context.registerStockObject("serviceconsole", s_vmwareMgr.getServiceConsolePortGroupName()); context.registerStockObject("serviceconsole", s_vmwareMgr.getServiceConsolePortGroupName());
context.registerStockObject("manageportgroup", s_vmwareMgr.getManagementPortGroupName()); context.registerStockObject("manageportgroup", s_vmwareMgr.getManagementPortGroupName());