You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2007/10/26 06:15:10 UTC
svn commit: r588515 - in
/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core:
./ src/org/apache/geronimo/st/v11/core/
src/org/apache/geronimo/st/v11/core/operations/
Author: mcconne
Date: Thu Oct 25 21:15:09 2007
New Revision: 588515
URL: http://svn.apache.org/viewvc?rev=588515&view=rev
Log:
Use unique action across all wizards
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/DeploymentPlanInstallConfig.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.v11.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml?rev=588515&r1=588514&r2=588515&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml Thu Oct 25 21:15:09 2007
@@ -70,7 +70,7 @@
<extension point="org.eclipse.wst.common.project.facet.core.facets">
<project-facet-version facet="org.apache.geronimo.facet" version="1.1">
- <action type="install" id="geronimo.plan.install">
+ <action type="install" id="geronimo.plan.install.v11">
<delegate class="org.apache.geronimo.st.v11.core.operations.GeronimoV11FacetInstallDelegate"/>
<config-factory class="org.apache.geronimo.st.v11.core.DeploymentPlanInstallConfig$Factory"/>
</action>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/DeploymentPlanInstallConfig.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/DeploymentPlanInstallConfig.java?rev=588515&r1=588514&r2=588515&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/DeploymentPlanInstallConfig.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/DeploymentPlanInstallConfig.java Thu Oct 25 21:15:09 2007
@@ -17,6 +17,8 @@
package org.apache.geronimo.st.v11.core;
import org.eclipse.wst.common.project.facet.core.IActionConfigFactory;
+import org.apache.geronimo.st.v11.core.internal.Trace;
+
/**
* @version $Rev$ $Date$
@@ -37,6 +39,7 @@
{
public Object create()
{
+ Trace.trace("Entry/Exit", "DeploymentPlanInstallConfig.create");
return new DeploymentPlanInstallConfig();
}
}
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=588515&r1=588514&r2=588515&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 Thu Oct 25 21:15:09 2007
@@ -17,6 +17,7 @@
package org.apache.geronimo.st.v11.core.operations;
import org.apache.geronimo.st.core.GeronimoFacetInstallDelegate;
+import org.apache.geronimo.st.v11.core.internal.Trace;
import org.eclipse.core.resources.IProject;
import org.eclipse.jst.common.project.facet.JavaProjectFacetCreationDataModelProvider;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
@@ -30,8 +31,12 @@
public class GeronimoV11FacetInstallDelegate extends GeronimoFacetInstallDelegate {
public IDataModelOperation createDeploymentPlanCreationOp(IProject project, Object config) {
+ Trace.trace("Entry", "GeronimoV11FacetInstallDelegate.createDeploymentPlanCreationOp", project, config);
+
IDataModel model = DataModelFactory.createDataModel(new JavaProjectFacetCreationDataModelProvider());
model.setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, project.getName());
+
+ Trace.trace("Exit", "GeronimoV11FacetInstallDelegate.createDeploymentPlanCreationOp");
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=588515&r1=588514&r2=588515&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 Thu Oct 25 21:15:09 2007
@@ -20,6 +20,7 @@
import org.apache.geronimo.st.core.operations.DeploymentPlanCreationOperation;
import org.apache.geronimo.st.v11.core.DeploymentPlanInstallConfig;
import org.apache.geronimo.st.v11.core.GeronimoV11Utils;
+import org.apache.geronimo.st.v11.core.internal.Trace;
import org.apache.geronimo.xml.ns.deployment.ArtifactType;
import org.apache.geronimo.xml.ns.deployment.DependenciesType;
import org.apache.geronimo.xml.ns.deployment.DependencyType;
@@ -63,6 +64,7 @@
public V11DeploymentPlanCreationOperation(IDataModel model, Object config) {
super(model, config);
+ Trace.trace("Constructor Entry/Exit", "V11DeploymentPlanCreationOperation", model, config);
}
/*