You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/08/30 20:13:06 UTC
svn commit: r438572 - in /geronimo/devtools/eclipse-plugin/trunk: ./
assembly/ assembly/src/main/assembly/ config-store-service/
features/org.apache.geronimo.feature/ plugins/
plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/
plugins...
Author: sppatel
Date: Wed Aug 30 11:13:05 2006
New Revision: 438572
URL: http://svn.apache.org/viewvc?rev=438572&view=rev
Log:
remove old run resources from workspace support
Removed:
geronimo/devtools/eclipse-plugin/trunk/config-store-service/
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/ConfigStoreInstaller.java
Modified:
geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/Activator.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/sections/ServerEditorTestEnvSection.java
geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
geronimo/devtools/eclipse-plugin/trunk/pom.xml
Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml?rev=438572&r1=438571&r2=438572&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Wed Aug 30 11:13:05 2006
@@ -148,10 +148,5 @@
<artifactId>org.apache.geronimo.installableruntime.tomcat.feature</artifactId>
<version>${org.apache.geronimo.installableruntime.jetty.feature_version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.st.jmxagent</artifactId>
- <version>${org.apache.geronimo.st.jmxagent_version}</version>
- </dependency>
</dependencies>
</project>
Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml?rev=438572&r1=438571&r2=438572&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml Wed Aug 30 11:13:05 2006
@@ -59,13 +59,6 @@
<include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
</includes>
</dependencySet>
- <dependencySet>
- <outputDirectory>plugins/org.apache.geronimo.st.jmxagent_1.0.0</outputDirectory>
- <unpack>true</unpack>
- <includes>
- <include>org.apache.geronimo.devtools:org.apache.geronimo.st.jmxagent</include>
- </includes>
- </dependencySet>
<!-- Features -->
<dependencySet>
<outputDirectory>features/org.apache.geronimo.feature_1.1.0</outputDirectory>
Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml?rev=438572&r1=438571&r2=438572&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml Wed Aug 30 11:13:05 2006
@@ -26,7 +26,6 @@
<include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v1</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
- <include>org.apache.geronimo.devtools:org.apache.geronimo.st.jmxagent</include>
</includes>
</dependencySet>
<!-- Features -->
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml?rev=438572&r1=438571&r2=438572&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml Wed Aug 30 11:13:05 2006
@@ -142,12 +142,6 @@
unpack="false"/>
<plugin
- id="org.apache.geronimo.st.jmxagent"
- download-size="0"
- install-size="0"
- version="1.0.0"/>
-
- <plugin
id="org.apache.geronimo.st.core"
download-size="0"
install-size="0"
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java?rev=438572&r1=438571&r2=438572&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java Wed Aug 30 11:13:05 2006
@@ -26,6 +26,7 @@
import java.util.Timer;
import javax.enterprise.deploy.spi.DeploymentManager;
+import javax.enterprise.deploy.spi.Target;
import javax.enterprise.deploy.spi.TargetModuleID;
import javax.management.MBeanServerConnection;
import javax.management.remote.JMXConnector;
@@ -557,6 +558,10 @@
}
}
+ return null;
+ }
+
+ public Target[] getTargets() {
return null;
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/META-INF/MANIFEST.MF?rev=438572&r1=438571&r2=438572&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/META-INF/MANIFEST.MF Wed Aug 30 11:13:05 2006
@@ -19,7 +19,6 @@
org.eclipse.wst.common.project.facet.core,
org.eclipse.wst.common.frameworks,
org.apache.geronimo.runtime.v1,
- org.apache.geronimo.st.jmxagent,
org.eclipse.jst.common.frameworks
Eclipse-LazyStart: true
Bundle-Vendor: Apache
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java?rev=438572&r1=438571&r2=438572&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java Wed Aug 30 11:13:05 2006
@@ -162,15 +162,6 @@
/*
* (non-Javadoc)
*
- * @see org.apache.geronimo.st.core.IGeronimoServerBehavior#getTargets()
- */
- public Target[] getTargets() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
* @see org.eclipse.wst.server.core.internal.IModulePublishHelper#getPublishDirectory(org.eclipse.wst.server.core.IModule[])
*/
public IPath getPublishDirectory(IModule[] module) {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF?rev=438572&r1=438571&r2=438572&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF Wed Aug 30 11:13:05 2006
@@ -7,7 +7,6 @@
Bundle-Vendor: Apache
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
- org.apache.geronimo.st.jmxagent,
org.apache.geronimo.st.core,
org.apache.geronimo.runtime.v11,
org.apache.geronimo.v11.deployment.model,
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/Activator.java?rev=438572&r1=438571&r2=438572&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/Activator.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/Activator.java Wed Aug 30 11:13:05 2006
@@ -1,8 +1,5 @@
package org.apache.geronimo.st.v11.core;
-import java.io.IOException;
-
-import org.apache.geronimo.st.jmxagent.JMXAgent;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
import org.osgi.framework.BundleContext;
@@ -40,11 +37,6 @@
* @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext context) throws Exception {
- try {
- JMXAgent.getInstance().stop();
- } catch (IOException e) {
- e.printStackTrace();
- }
plugin = null;
super.stop(context);
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java?rev=438572&r1=438571&r2=438572&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java Wed Aug 30 11:13:05 2006
@@ -15,7 +15,6 @@
*/
package org.apache.geronimo.st.v11.core;
-import java.io.IOException;
import java.net.URL;
import java.util.Set;
@@ -36,30 +35,16 @@
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.st.core.GeronimoConnectionFactory;
import org.apache.geronimo.st.core.GeronimoServerBehaviourDelegate;
-import org.apache.geronimo.st.jmxagent.Activator;
-import org.apache.geronimo.st.jmxagent.JMXAgent;
import org.apache.geronimo.st.v11.core.internal.Trace;
import org.apache.geronimo.system.jmx.KernelDelegate;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunch;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.internal.IModulePublishHelper;
-import org.eclipse.wst.server.core.util.SocketUtil;
public class GeronimoServerBehaviour extends GeronimoServerBehaviourDelegate implements IModulePublishHelper {
- static {
- try {
- JMXAgent.getInstance().start();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
private Kernel kernel = null;
public GeronimoServerBehaviour() {
@@ -166,32 +151,6 @@
*/
public String getConfigId(IModule module) {
return GeronimoV11Utils.getConfigId(module);
- }
-
- protected void setupLaunch(ILaunch launch, String launchMode, IProgressMonitor monitor) throws CoreException {
- if (SocketUtil.isLocalhost(getServer().getHost())
- && getGeronimoServer().isRunFromWorkspace()) {
- getServer().addServerListener(new ConfigStoreInstaller());
- }
- super.setupLaunch(launch, launchMode, monitor);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geronimo.st.core.IGeronimoServerBehavior#getTargets()
- */
- public Target[] getTargets() {
- if (getGeronimoServer().isRunFromWorkspace()) {
- AbstractNameQuery query = new AbstractNameQuery("org.apache.geronimo.devtools.EclipseAwareConfigurationStore");
- Set set = getKernel().listGBeans(query);
- if (!set.isEmpty()) {
- AbstractName name = (AbstractName) set.toArray()[0];
- Target target = new TargetImpl(name, null);
- return new Target[] { target };
- }
- }
- return null;
}
public IPath getPublishDirectory(IModule[] module) {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/sections/ServerEditorTestEnvSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/sections/ServerEditorTestEnvSection.java?rev=438572&r1=438571&r2=438572&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/sections/ServerEditorTestEnvSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/sections/ServerEditorTestEnvSection.java Wed Aug 30 11:13:05 2006
@@ -17,7 +17,6 @@
import org.apache.geronimo.st.v11.core.GeronimoServer;
import org.apache.geronimo.st.v11.ui.commands.SetInPlaceDeploymentCommand;
-import org.apache.geronimo.st.v11.ui.commands.SetPersistentCommand;
import org.apache.geronimo.st.v11.ui.commands.SetRunFromWorkspaceCommand;
import org.apache.geronimo.st.v11.ui.internal.Messages;
import org.eclipse.swt.SWT;
@@ -38,8 +37,6 @@
private Button inPlace;
- //private Button persistant;
-
/*
* (non-Javadoc)
*
@@ -70,31 +67,22 @@
composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
section.setClient(composite);
- //persistant = toolkit.createButton(composite, Messages.editorSectionSetPersistent, SWT.CHECK);
inPlace = toolkit.createButton(composite, Messages.editorSectionEnableInPlace, SWT.CHECK);
runFromWorkspace = toolkit.createButton(composite, Messages.editorSectionRunFromWorkspace, SWT.CHECK);
runFromWorkspace.setToolTipText(Messages.seeRestrictions);
GeronimoServer gs = (GeronimoServer) server.getAdapter(GeronimoServer.class);
- //persistant.setSelection(gs.isPersistant());
inPlace.setSelection(gs.isInPlace());
runFromWorkspace.setSelection(gs.isRunFromWorkspace());
+
+ //TODO temporarily disable support until new implementation
+ inPlace.setEnabled(false);
+ runFromWorkspace.setEnabled(false);
GridData data = new GridData();
data.horizontalIndent = 20;
runFromWorkspace.setLayoutData(data);
runFromWorkspace.setEnabled(inPlace.getSelection());
-
- /*persistant.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent e) {
- execute(new SetPersistentCommand(server, persistant.getSelection()));
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- });*/
inPlace.addSelectionListener(new SelectionListener() {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml?rev=438572&r1=438571&r2=438572&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml Wed Aug 30 11:13:05 2006
@@ -92,7 +92,6 @@
<module>org.apache.geronimo.runtime.common</module>
<module>org.apache.geronimo.runtime.v1</module>
<module>org.apache.geronimo.runtime.v11</module>
- <module>org.apache.geronimo.st.jmxagent</module>
</modules>
</project>
Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=438572&r1=438571&r2=438572&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Wed Aug 30 11:13:05 2006
@@ -288,7 +288,6 @@
</pluginRepositories>
<modules>
- <module>config-store-service</module>
<module>maven-plugins/maven-emf-plugin</module>
<module>maven-plugins/maven-geronimodevtools-plugin</module>
<module>emf</module>