You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/02/07 21:04:12 UTC
[10/51] [abbrv] git commit: refs/heads/ui-plugins - Fix bug
CLOUDSTACK-1171 due to spring injection.
Fix bug CLOUDSTACK-1171 due to spring injection.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5a2cd68f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5a2cd68f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5a2cd68f
Branch: refs/heads/ui-plugins
Commit: 5a2cd68fa8570cd6a9e442bee1c88dcbd0f04501
Parents: fda8ec3
Author: Min Chen <mi...@citrix.com>
Authored: Tue Feb 5 21:55:11 2013 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Tue Feb 5 21:55:11 2013 -0800
----------------------------------------------------------------------
.../vmware/resource/VmwareContextFactory.java | 29 ++++++++++-----
1 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5a2cd68f/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
index ab10e5e..8324bcf 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
@@ -11,12 +11,16 @@
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "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
// under the License.
package com.cloud.hypervisor.vmware.resource;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.hypervisor.vmware.manager.VmwareManager;
import com.cloud.hypervisor.vmware.manager.VmwareManagerImpl;
@@ -25,18 +29,25 @@ import com.cloud.utils.StringUtils;
import com.cloud.utils.component.ComponentContext;
import com.vmware.apputils.version.ExtendedAppUtil;
-
+@Component
public class VmwareContextFactory {
-
+
private static final Logger s_logger = Logger.getLogger(VmwareContextFactory.class);
-
+
private static volatile int s_seq = 1;
private static VmwareManager s_vmwareMgr;
-
+
+ @Inject VmwareManager _vmwareMgr;
+
static {
// skip certificate check
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 {
@@ -49,13 +60,13 @@ public class VmwareContextFactory {
if(s_logger.isDebugEnabled())
s_logger.debug("initialize VmwareContext. url: " + serviceUrl + ", username: " + vCenterUserName + ", password: " + StringUtils.getMaskedPasswordForDisplay(vCenterPassword));
-
+
ExtendedAppUtil appUtil = ExtendedAppUtil.initialize(vCenterAddress + "-" + s_seq++, params);
-
+
appUtil.connect();
VmwareContext context = new VmwareContext(appUtil, vCenterAddress);
context.registerStockObject(VmwareManager.CONTEXT_STOCK_NAME, s_vmwareMgr);
-
+
context.registerStockObject("serviceconsole", s_vmwareMgr.getServiceConsolePortGroupName());
context.registerStockObject("manageportgroup", s_vmwareMgr.getManagementPortGroupName());