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 2005/12/30 04:42:28 UTC
svn commit: r359978 - in
/geronimo/devtools/trunk/modules/eclipse-plugin/plugins:
org.apache.geronimo.deployment.model.edit/META-INF/
org.apache.geronimo.deployment.model/META-INF/
org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/...
Author: sppatel
Date: Thu Dec 29 19:42:17 2005
New Revision: 359978
URL: http://svn.apache.org/viewcvs?rev=359978&view=rev
Log:
fix MANIFEST version mismatches, move out util methods into util class
Modified:
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/commands/AbstractDeploymentCommand.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/commands/DistributeCommand.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/commands/RedeployCommand.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoSchemaNS.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF?rev=359978&r1=359977&r2=359978&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF Thu Dec 29 19:42:17 2005
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.apache.geronimo.deployment.model.edit; singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 0.5.0
Bundle-ClassPath: .
Bundle-Activator: org.apache.geronimo.deployment.model.edit.GeronimoEMFEditPlugin$Implementation
Bundle-Vendor: %providerName
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF?rev=359978&r1=359977&r2=359978&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF Thu Dec 29 19:42:17 2005
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.apache.geronimo.deployment.model; singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 0.5.0
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/commands/AbstractDeploymentCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/commands/AbstractDeploymentCommand.java?rev=359978&r1=359977&r2=359978&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/commands/AbstractDeploymentCommand.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/commands/AbstractDeploymentCommand.java Thu Dec 29 19:42:17 2005
@@ -15,26 +15,11 @@
*/
package org.apache.geronimo.core.commands;
-import java.io.File;
-
import javax.enterprise.deploy.spi.DeploymentManager;
import javax.enterprise.deploy.spi.TargetModuleID;
import javax.enterprise.deploy.spi.exceptions.TargetException;
-import org.apache.geronimo.core.internal.GeronimoPlugin;
import org.apache.geronimo.core.internal.GeronimoUtils;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentExportDataModelProvider;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.server.core.IModule;
abstract class AbstractDeploymentCommand implements IDeploymentCommand {
@@ -57,61 +42,10 @@
return module;
}
- public File createJarFile(IModule module) {
- IDataModel model = getExportDataModel(module);
-
- IVirtualComponent comp = ComponentCore.createComponent(module
- .getProject());
-
- IPath path = GeronimoPlugin.getInstance().getStateLocation();
-
- model.setProperty(J2EEComponentExportDataModelProvider.PROJECT_NAME,
- module.getProject());
- model.setProperty(
- J2EEComponentExportDataModelProvider.ARCHIVE_DESTINATION, path
- .append(module.getName())
- + ".zip");
- model.setProperty(J2EEComponentExportDataModelProvider.COMPONENT, comp);
- model.setBooleanProperty(
- J2EEComponentExportDataModelProvider.OVERWRITE_EXISTING, true);
-
- if (model != null) {
- try {
- model.getDefaultOperation().execute(null, null);
- return new File(
- model
- .getStringProperty(J2EEComponentExportDataModelProvider.ARCHIVE_DESTINATION));
- } catch (ExecutionException e) {
- e.printStackTrace();
- }
- }
-
- return null;
- }
-
- public IDataModel getExportDataModel(IModule module) {
- String type = module.getModuleType().getId();
- if (IModuleConstants.JST_WEB_MODULE.equals(type)) {
- return DataModelFactory
- .createDataModel(new WebComponentExportDataModelProvider());
- } else if (IModuleConstants.JST_EJB_MODULE.equals(type)) {
- return DataModelFactory
- .createDataModel(new EJBComponentExportDataModelProvider());
- } else if (IModuleConstants.JST_EAR_MODULE.equals(type)) {
- return DataModelFactory
- .createDataModel(new EARComponentExportDataModelProvider());
- } else if (IModuleConstants.JST_CONNECTOR_MODULE.equals(type)) {
- return DataModelFactory
- .createDataModel(new ConnectorComponentExportDataModelProvider());
- }
- return null;
- }
-
public TargetModuleID getTargetModuleID(IModule module) {
try {
- TargetModuleID ids[] = getDeploymentManager().getAvailableModules(
- GeronimoUtils.getJSR88ModuleType(module),
- getDeploymentManager().getTargets());
+ TargetModuleID ids[] = dm.getAvailableModules(GeronimoUtils
+ .getJSR88ModuleType(module), dm.getTargets());
if (ids != null) {
for (int i = 0; i < ids.length; i++) {
if (ids[i].getModuleID().equals(
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/commands/DistributeCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/commands/DistributeCommand.java?rev=359978&r1=359977&r2=359978&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/commands/DistributeCommand.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/commands/DistributeCommand.java Thu Dec 29 19:42:17 2005
@@ -21,6 +21,7 @@
import javax.enterprise.deploy.spi.DeploymentManager;
import javax.enterprise.deploy.spi.Target;
+import org.apache.geronimo.core.DeploymentUtils;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -39,7 +40,7 @@
*/
public IStatus execute(IProgressMonitor monitor) {
Target[] targets = getDeploymentManager().getTargets();
- File jarFile = createJarFile(getModule());
+ File jarFile = DeploymentUtils.createJarFile(getModule());
return new DeploymentCmdStatus(Status.OK_STATUS, getDeploymentManager()
.distribute(targets, jarFile, null));
}
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/commands/RedeployCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/commands/RedeployCommand.java?rev=359978&r1=359977&r2=359978&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/commands/RedeployCommand.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/commands/RedeployCommand.java Thu Dec 29 19:42:17 2005
@@ -21,6 +21,7 @@
import javax.enterprise.deploy.spi.DeploymentManager;
import javax.enterprise.deploy.spi.TargetModuleID;
+import org.apache.geronimo.core.DeploymentUtils;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -38,7 +39,7 @@
public IStatus execute(IProgressMonitor monitor) {
TargetModuleID id = getTargetModuleID(getModule());
if (id != null) {
- File jarFile = createJarFile(getModule());
+ File jarFile = DeploymentUtils.createJarFile(getModule());
return new DeploymentCmdStatus(Status.OK_STATUS,
getDeploymentManager().redeploy(
new TargetModuleID[] { id }, jarFile, null));
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoSchemaNS.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoSchemaNS.java?rev=359978&r1=359977&r2=359978&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoSchemaNS.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoSchemaNS.java Thu Dec 29 19:42:17 2005
@@ -15,7 +15,10 @@
*/
package org.apache.geronimo.core.internal;
-public interface GeronimoSchemaNS {
+public class GeronimoSchemaNS {
+
+ private GeronimoSchemaNS() {
+ }
public static final String GERONIMO_APP_NS = "http://geronimo.apache.org/xml/ns/j2ee/application-1.0";
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java?rev=359978&r1=359977&r2=359978&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java Thu Dec 29 19:42:17 2005
@@ -62,7 +62,7 @@
public GeronimoServerBehaviour() {
super();
- timer = new Timer();
+ timer = new Timer(true);
//timer.schedule(new UpdateServerStateTask(), 0, 60000);
}