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/06/26 22:01:13 UTC
svn commit: r417287 - in /geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/
org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/
org.apache.geronimo.st.v1.core/META-INF/ org.apac...
Author: sppatel
Date: Mon Jun 26 13:01:12 2006
New Revision: 417287
URL: http://svn.apache.org/viewvc?rev=417287&view=rev
Log: (empty)
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/AbstractGeronimoJ2EEComponentOperation.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/Activator.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/operations/GeronimoV1FacetInstallDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/V1DeploymentPlanCreationOperation.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/ConfigStoreInstaller.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/operations/GeronimoV11FacetInstallDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/operations/V11DeploymentPlanCreationOperation.java
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/AbstractGeronimoJ2EEComponentOperation.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/AbstractGeronimoJ2EEComponentOperation.java?rev=417287&r1=417286&r2=417287&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/AbstractGeronimoJ2EEComponentOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/AbstractGeronimoJ2EEComponentOperation.java Mon Jun 26 13:01:12 2006
@@ -21,8 +21,8 @@
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
+import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
@@ -63,16 +63,12 @@
}
public boolean isGeronimoRuntimeTarget() {
- String runtimeID = model.getStringProperty(J2EEComponentCreationDataModelProvider.RUNTIME_TARGET_ID);
+ String runtimeID = model.getStringProperty(IJ2EEFacetInstallDataModelProperties.RUNTIME_TARGET_ID);
return runtimeID != null && runtimeID.startsWith("Apache Geronimo");
}
- public String getComponentName() {
- return model.getProperty(IComponentCreationDataModelProperties.COMPONENT_NAME).toString();
- }
-
public IProject getProject() {
- String projectName = model.getProperty(IComponentCreationDataModelProperties.PROJECT_NAME).toString();
+ String projectName = model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME).toString();
if (projectName != null) {
return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/Activator.java?rev=417287&r1=417286&r2=417287&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/Activator.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/Activator.java Mon Jun 26 13:01:12 2006
@@ -6,6 +6,7 @@
import java.util.Map;
import org.apache.geronimo.st.ui.internal.Trace;
+import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
@@ -69,7 +70,7 @@
public static String getIconLocation() {
if (iconLocation == null) {
try {
- iconLocation = Platform.resolve(plugin.getBundle().getEntry("/")).getPath()
+ iconLocation = FileLocator.resolve(plugin.getBundle().getEntry("/")).getPath()
+ ICONS_DIRECTORY;
} catch (IOException e) {
e.printStackTrace();
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=417287&r1=417286&r2=417287&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 Mon Jun 26 13:01:12 2006
@@ -20,7 +20,8 @@
org.eclipse.wst.common.project.facet.core,
org.eclipse.wst.common.frameworks,
org.apache.geronimo.runtime.v1,
- org.apache.geronimo.st.jmxagent
+ org.apache.geronimo.st.jmxagent,
+ org.eclipse.jst.common.frameworks
Eclipse-LazyStart: true
Bundle-Vendor: Apache
Export-Package: org.apache.geronimo.st.v1.core.operations,
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/GeronimoV1FacetInstallDelegate.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/operations/GeronimoV1FacetInstallDelegate.java?rev=417287&r1=417286&r2=417287&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/GeronimoV1FacetInstallDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/GeronimoV1FacetInstallDelegate.java Mon Jun 26 13:01:12 2006
@@ -17,10 +17,8 @@
import org.apache.geronimo.st.core.GeronimoFacetInstallDelegate;
import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.jst.common.project.facet.JavaProjectFacetCreationDataModelProvider;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
@@ -28,10 +26,8 @@
public class GeronimoV1FacetInstallDelegate extends GeronimoFacetInstallDelegate {
public IDataModelOperation createDeploymentPlanCreationOp(IProject project, Object config) {
- IVirtualComponent comp = ComponentCore.createComponent(project);
- IDataModel model = DataModelFactory.createDataModel(new JavaComponentCreationDataModelProvider());
- model.setStringProperty(IComponentCreationDataModelProperties.COMPONENT_NAME, comp.getName());
- model.setStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME, project.getName());
+ IDataModel model = DataModelFactory.createDataModel(new JavaProjectFacetCreationDataModelProvider());
+ model.setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, project.getName());
return new V1DeploymentPlanCreationOperation(model, config);
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/V1DeploymentPlanCreationOperation.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/operations/V1DeploymentPlanCreationOperation.java?rev=417287&r1=417286&r2=417287&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/V1DeploymentPlanCreationOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/V1DeploymentPlanCreationOperation.java Mon Jun 26 13:01:12 2006
@@ -60,8 +60,9 @@
map.put("sec", GeronimoSchemaNS.GERONIMO_SECURITY_NS_1_1);
map.put("sys", GeronimoSchemaNS.GERONIMO_DEPLOYMENT_NS_1_0);
- root.setApplicationName(getComponentName());
- root.setConfigId(getProject().getName() + "/" + getComponentName());
+ String projectName = getProject().getName();
+ root.setApplicationName(getProject().getName());
+ root.setConfigId(projectName + "/" + projectName);
documentRoot.setApplication(root);
resource.getContents().add(documentRoot);
@@ -92,8 +93,9 @@
WebAppType root = WebFactory.eINSTANCE.createWebAppType();
- root.setConfigId(getProject().getName() + "/" + getComponentName());
- root.setContextRoot("/" + getComponentName());
+ String projectName = getProject().getName();
+ root.setConfigId(projectName + "/" + projectName);
+ root.setContextRoot("/" + projectName);
root.setContextPriorityClassloader(false);
documentRoot.setWebApp(root);
@@ -124,7 +126,8 @@
map.put("sys", GeronimoSchemaNS.GERONIMO_DEPLOYMENT_NS_1_0);
map.put("pkgen", GeronimoSchemaNS.GERONIMO_PKGEN_NS_2_0);
- root.setConfigId(getProject().getName() + "/" + getComponentName());
+ String projectName = getProject().getName();
+ root.setConfigId(projectName + "/" + projectName);
root.setEnterpriseBeans(JarFactory.eINSTANCE.createEnterpriseBeansType());
@@ -154,7 +157,8 @@
map.put("nam", GeronimoSchemaNS.GERONIMO_NAMING_NS_1_0);
map.put("sys", GeronimoSchemaNS.GERONIMO_DEPLOYMENT_NS_1_0);
- root.setConfigId(getProject().getName() + "/" + getComponentName());
+ String projectName = getProject().getName();
+ root.setConfigId(projectName + "/" + projectName);
documentRoot.setConnector(root);
resource.getContents().add(documentRoot);
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=417287&r1=417286&r2=417287&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 Mon Jun 26 13:01:12 2006
@@ -24,7 +24,8 @@
org.eclipse.core.commands,
org.eclipse.wst.common.project.facet.core,
org.apache.ant,
- org.apache.geronimo.runtime.common
+ org.apache.geronimo.runtime.common,
+ org.eclipse.jst.common.frameworks
Eclipse-LazyStart: true
Export-Package: org.apache.geronimo.st.v11.core.operations,
org.apache.geronimo.st.v11.core.internal,
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/ConfigStoreInstaller.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/ConfigStoreInstaller.java?rev=417287&r1=417286&r2=417287&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/ConfigStoreInstaller.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/ConfigStoreInstaller.java Mon Jun 26 13:01:12 2006
@@ -19,8 +19,8 @@
import org.apache.geronimo.st.core.GeronimoConnectionFactory;
import org.apache.geronimo.st.jmxagent.Activator;
import org.apache.geronimo.st.v11.core.internal.Trace;
+import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerListener;
import org.eclipse.wst.server.core.ServerEvent;
@@ -85,7 +85,7 @@
private URL resolveFromBundle(String path) {
try {
- return Platform.resolve(Activator.getDefault().getBundle().getEntry(path));
+ return FileLocator.resolve(Activator.getDefault().getBundle().getEntry(path));
} catch (IOException e) {
e.printStackTrace();
}
@@ -127,7 +127,7 @@
private File getFileFromBundle(String path) {
try {
- URL url = Platform.resolve(Activator.getDefault().getBundle().getEntry(path));
+ URL url = FileLocator.resolve(Activator.getDefault().getBundle().getEntry(path));
return new File(url.getFile());
} catch (IOException e) {
e.printStackTrace();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/operations/GeronimoV11FacetInstallDelegate.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/operations/GeronimoV11FacetInstallDelegate.java?rev=417287&r1=417286&r2=417287&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/operations/GeronimoV11FacetInstallDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/operations/GeronimoV11FacetInstallDelegate.java Mon Jun 26 13:01:12 2006
@@ -16,26 +16,18 @@
package org.apache.geronimo.st.v11.core.operations;
import org.apache.geronimo.st.core.GeronimoFacetInstallDelegate;
-import org.apache.geronimo.st.v11.core.DeploymentPlanInstallConfig;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.jst.common.project.facet.JavaProjectFacetCreationDataModelProvider;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
public class GeronimoV11FacetInstallDelegate extends GeronimoFacetInstallDelegate {
public IDataModelOperation createDeploymentPlanCreationOp(IProject project, Object config) {
- IVirtualComponent comp = ComponentCore.createComponent(project);
- IDataModel model = DataModelFactory.createDataModel(new JavaComponentCreationDataModelProvider());
- model.setStringProperty(IComponentCreationDataModelProperties.COMPONENT_NAME, comp.getName());
- model.setStringProperty(IComponentCreationDataModelProperties.PROJECT_NAME, project.getName());
+ IDataModel model = DataModelFactory.createDataModel(new JavaProjectFacetCreationDataModelProvider());
+ model.setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, project.getName());
return new V11DeploymentPlanCreationOperation(model, config);
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/operations/V11DeploymentPlanCreationOperation.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/operations/V11DeploymentPlanCreationOperation.java?rev=417287&r1=417286&r2=417287&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/operations/V11DeploymentPlanCreationOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/operations/V11DeploymentPlanCreationOperation.java Mon Jun 26 13:01:12 2006
@@ -78,7 +78,7 @@
map.put("sec", GeronimoSchemaNS.GERONIMO_SECURITY_NS_1_1);
map.put("sys", GeronimoSchemaNS.GERONIMO_DEPLOYMENT_NS_1_1);
- root.setApplicationName(getComponentName());
+ root.setApplicationName(getProject().getName());
root.setEnvironment(getConfigEnvironment());
documentRoot.setApplication(root);
@@ -111,7 +111,7 @@
WebAppType root = WebFactory.eINSTANCE.createWebAppType();
root.setEnvironment(getConfigEnvironment());
- root.setContextRoot("/" + getComponentName());
+ root.setContextRoot("/" + getProject().getName());
//root.setContextPriorityClassloader(false); //TODO Replace this with inverse-classloading
documentRoot.setWebApp(root);
@@ -208,7 +208,7 @@
}
String groupId = cfg != null && hasValue(cfg.getGroupId()) ? cfg.getGroupId() : "default";
- String artifactId = cfg != null && hasValue(cfg.getArtifactId()) ? cfg.getArtifactId() : getComponentName();
+ String artifactId = cfg != null && hasValue(cfg.getArtifactId()) ? cfg.getArtifactId() : getProject().getName();
String version = cfg != null && hasValue(cfg.getVersion()) ? cfg.getVersion() : "1.0";
String type = cfg != null && hasValue(cfg.getType()) ? cfg.getType() : "car";