Author: adietish Date: 2011-11-28 08:12:22 -0500 (Mon, 28 Nov 2011) New Revision: 36692 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7ManagementActivator.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71ManagementActivator.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/jboss-management-service.xml Log: [JBIDE-10253][JBIDE-10224] reverted changes since those did not fix the problems Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java 2011-11-28 13:10:44 UTC (rev 36691) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java 2011-11-28 13:12:22 UTC (rev 36692) @@ -23,8 +23,8 @@ public static IJBoss7ManagerService getService(IServer server) throws InvalidSyntaxException { BundleContext context = JBossServerCorePlugin.getContext(); -// skipLazyInit(); JBoss7ManagerServiceProxy proxy = new JBoss7ManagerServiceProxy(context, getRequiredVersion(server)); + skipLazyInit(); proxy.open(); return proxy; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-11-28 13:10:44 UTC (rev 36691) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-11-28 13:12:22 UTC (rev 36692) @@ -3,8 +3,11 @@ Bundle-Name: JBoss AS7 management API Bundle-SymbolicName: org.jboss.ide.eclipse.as.management.as7 Bundle-Version: 2.3.0.qualifier -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", +Bundle-Activator: org.jboss.ide.eclipse.as.internal.management.as7.AS7ManagementActivator +Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="2.3.0", + org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.wst.server.core;bundle-version="1.1.302" +Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: ., jboss-as-controller-client-7.0.0.Final.jar, @@ -20,4 +23,3 @@ Service-Component: META-INF/jboss-management-service.xml Export-Package: org.jboss.ide.eclipse.as.internal.management.as7;x-friends:="org.jboss.ide.eclipse.as.management.as7.tests" Bundle-Vendor: JBoss by Red Hat -Import-Package: org.jboss.ide.eclipse.as.core.server.v7.management Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml 2011-11-28 13:10:44 UTC (rev 36691) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml 2011-11-28 13:12:22 UTC (rev 36692) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="false" name="org.jboss.ide.eclipse.as.management.as7.service"> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.jboss.ide.eclipse.as.management.as7.service"> <implementation class="org.jboss.ide.eclipse.as.internal.management.as7.JBoss7ManagerService"/> <service> <provide interface="org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService"/> Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7ManagementActivator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7ManagementActivator.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7ManagementActivator.java 2011-11-28 13:12:22 UTC (rev 36692) @@ -0,0 +1,54 @@ +package org.jboss.ide.eclipse.as.internal.management.as7; + +import org.eclipse.core.runtime.Plugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class AS7ManagementActivator extends Plugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.management.as7"; //$NON-NLS-1$ + + // The shared instance + private static AS7ManagementActivator plugin; + + /** + * The constructor + */ + public AS7ManagementActivator() { + } + + public static BundleContext getContext() { + return plugin.getBundle().getBundleContext(); + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static AS7ManagementActivator getDefault() { + return plugin; + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7ManagementActivator.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF 2011-11-28 13:10:44 UTC (rev 36691) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF 2011-11-28 13:12:22 UTC (rev 36692) @@ -3,8 +3,11 @@ Bundle-Name: JBoss AS7.1 management API Bundle-SymbolicName: org.jboss.ide.eclipse.as.management.as71 Bundle-Version: 2.3.0.qualifier -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", +Bundle-Activator: org.jboss.ide.eclipse.as.internal.management.as71.AS71ManagementActivator +Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="2.3.0", + org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.wst.server.core;bundle-version="1.1.302" +Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: ., jboss-as-controller-client-7.1.0.CR1-SNAPSHOT.jar, @@ -20,4 +23,3 @@ Service-Component: META-INF/jboss-management-service.xml Export-Package: org.jboss.ide.eclipse.as.internal.management.as71;x-friends:="org.jboss.ide.eclipse.as.management.as7.tests" Bundle-Vendor: JBoss by Red Hat -Import-Package: org.jboss.ide.eclipse.as.core.server.v7.management Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/jboss-management-service.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/jboss-management-service.xml 2011-11-28 13:10:44 UTC (rev 36691) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/jboss-management-service.xml 2011-11-28 13:12:22 UTC (rev 36692) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="false" name="org.jboss.ide.eclipse.as.management.as7.service"> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.jboss.ide.eclipse.as.management.as7.service"> <implementation class="org.jboss.ide.eclipse.as.internal.management.as71.JBoss71ManagerService"/> <service> <provide interface="org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService"/> Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71ManagementActivator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71ManagementActivator.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71ManagementActivator.java 2011-11-28 13:12:22 UTC (rev 36692) @@ -0,0 +1,54 @@ +package org.jboss.ide.eclipse.as.internal.management.as71; + +import org.eclipse.core.runtime.Plugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class AS71ManagementActivator extends Plugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.management.as7"; //$NON-NLS-1$ + + // The shared instance + private static AS71ManagementActivator plugin; + + /** + * The constructor + */ + public AS71ManagementActivator() { + } + + public static BundleContext getContext() { + return plugin.getBundle().getBundleContext(); + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static AS71ManagementActivator getDefault() { + return plugin; + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71ManagementActivator.java ___________________________________________________________________ Added: svn:mime-type + text/plain