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/29 22:48:38 UTC
svn commit: r589873 - in /geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.deployment.model.edit/
org.apache.geronimo.deployment.model/ org.apache.geronimo.runtime.common/
org.apache.geronimo.runtime.v1/ org.apache.geronimo.runtime.v...
Author: mcconne
Date: Mon Oct 29 14:48:35 2007
New Revision: 589873
URL: http://svn.apache.org/viewvc?rev=589873&view=rev
Log:
GERONIMODEVTOOLS-248 Catch and handle the case where a Targeted Runtime is not specified for a project in Eclipse
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Trace.java
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/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/FacetInstallPage.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/plugin.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/FacetInstallPage.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml Mon Oct 29 14:48:35 2007
@@ -169,6 +169,7 @@
<include>plugin.*</include>
<include>*.properties</include>
<include>icons</include>
+ <include>bin</include>
<include>src/org/openejb</include>
<include>src/org/apache/geronimo/deployment</include>
<include>src/org/apache/geronimo/xml/ns/j2ee</include>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml Mon Oct 29 14:48:35 2007
@@ -156,6 +156,7 @@
<include>plugin.*</include>
<include>*.properties</include>
<include>src</include>
+ <include>bin</include>
</includes>
</fileset>
</filesets>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml Mon Oct 29 14:48:35 2007
@@ -136,6 +136,7 @@
<includes>
<include>.classpath</include>
<include>lib</include>
+ <include>bin</include>
</includes>
</fileset>
</filesets>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml Mon Oct 29 14:48:35 2007
@@ -165,8 +165,9 @@
<fileset>
<directory>${pom.basedir}</directory>
<includes>
- <include>lib</include>
<include>.classpath</include>
+ <include>lib</include>
+ <include>bin</include>
</includes>
</fileset>
</filesets>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml Mon Oct 29 14:48:35 2007
@@ -177,6 +177,7 @@
<includes>
<include>.classpath</include>
<include>lib</include>
+ <include>bin</include>
</includes>
</fileset>
</filesets>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml Mon Oct 29 14:48:35 2007
@@ -191,6 +191,7 @@
<includes>
<include>.classpath</include>
<include>lib</include>
+ <include>bin</include>
</includes>
</fileset>
</filesets>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java Mon Oct 29 14:48:35 2007
@@ -20,6 +20,7 @@
import java.util.Map;
import org.apache.geronimo.st.ui.Activator;
+import org.apache.geronimo.st.ui.internal.Trace;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
@@ -54,13 +55,19 @@
* @see org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor#doAddPages()
*/
public void doAddPages() throws PartInitException {
+ Trace.trace("Entry", "SharedDeploymentPlanEditor.doAddPages");
+
if (getDeploymentPlan() != null && getLoader() != null) {
currentLoader.doAddPages(this);
}
addSourcePage();
+
+ Trace.trace("Exit", "SharedDeploymentPlanEditor.doAddPages");
}
private static synchronized void loadExtensionPoints() {
+ Trace.trace("Entry", "SharedDeploymentPlanEditor.loadExtensionPoints");
+
IExtensionRegistry registry = Platform.getExtensionRegistry();
IConfigurationElement[] cf = registry.getConfigurationElementsFor(Activator.PLUGIN_ID, "loader");
for (int i = 0; i < cf.length; i++) {
@@ -71,10 +78,13 @@
String version = element.getAttribute("version");
loaders.put(version, loader);
} catch (CoreException e) {
+ Trace.trace("CoreException", "SharedDeploymentPlanEditor.loadExtensionPoints");
e.printStackTrace();
}
}
}
+
+ Trace.trace("Exit", "SharedDeploymentPlanEditor.loadExtensionPoints");
}
/*
@@ -83,11 +93,15 @@
* @see org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor#loadDeploymentPlan(org.eclipse.core.resources.IFile)
*/
public EObject loadDeploymentPlan(IFile file) {
- return getLoader() != null ? currentLoader.loadDeploymentPlan(file)
- : null;
+ Trace.trace("Entry", "SharedDeploymentPlanEditor.loadDeploymentPlan", file);
+
+ Trace.trace("Exit", "SharedDeploymentPlanEditor.loadDeploymentPlan", (getLoader() != null ? currentLoader.loadDeploymentPlan(file) : null));
+ return getLoader() != null ? currentLoader.loadDeploymentPlan(file) : null;
}
private IGeronimoFormContentLoader getLoader() {
+ Trace.trace("Entry", "SharedDeploymentPlanEditor.getLoader");
+
if (currentLoader == null) {
IEditorInput input = getEditorInput();
if (input instanceof IFileEditorInput) {
@@ -98,10 +112,16 @@
String version = runtime.getRuntimeType().getVersion();
currentLoader = (IGeronimoFormContentLoader) loaders.get(version);
} catch (CoreException e) {
+ Trace.trace("CoreException", "SharedDeploymentPlanEditor.getLoader");
e.printStackTrace();
- }
+ } catch (IllegalArgumentException ie) {
+ Trace.trace("IllegalArgumentException", "SharedDeploymentPlanEditor.getLoader");
+ throw new IllegalArgumentException("The project [" + project.getName() + "] does not have a Targeted Runtime specified.");
+ }
}
}
+
+ Trace.trace("Exit", "SharedDeploymentPlanEditor.getLoader", currentLoader);
return currentLoader;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Trace.java?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Trace.java Mon Oct 29 14:48:35 2007
@@ -78,4 +78,48 @@
if (t != null)
t.printStackTrace();
}
+
+ /**
+ * Trace the given message
+ *
+ * @param tracePoint
+ * The trace point (e.g., "Exit", "Entry", "Constructor", etc....
+ *
+ * @param classDotMethod
+ * The class name + method name (e.g., "Class.method()")
+ *
+ * @param parm1,2,3,4,5
+ * Method parameters if the trace point is an "Entry"
+ * or
+ * Return value if the trace point is an "Exit"
+ */
+ public static void trace(String tracePoint, String classDotMethod) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()" );
+ }
+ public static void trace(String tracePoint, String classDotMethod, Object parm1) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "] )" );
+ }
+
+ public static void trace(String tracePoint, String classDotMethod, Object parm1, Object parm2) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
+ "parm2=[" + (parm2 == null ? null : parm2.toString()) + "] )" );
+ }
+ public static void trace(String tracePoint, String classDotMethod, Object parm1, Object parm2, Object parm3) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
+ "parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
+ "parm3=[" + (parm3 == null ? null : parm3.toString()) + "] )" );
+ }
+ public static void trace(String tracePoint, String classDotMethod, Object parm1, Object parm2, Object parm3, Object parm4) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
+ "parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
+ "parm3=[" + (parm3 == null ? null : parm3.toString()) + "], " +
+ "parm4=[" + (parm4 == null ? null : parm4.toString()) + "] )" );
+ }
+ public static void trace(String tracePoint, String classDotMethod, Object parm1, Object parm2, Object parm3, Object parm4, Object parm5) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
+ "parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
+ "parm3=[" + (parm3 == null ? null : parm3.toString()) + "], " +
+ "parm4=[" + (parm4 == null ? null : parm4.toString()) + "], " +
+ "parm5=[" + (parm5 == null ? null : parm5.toString()) + "] )" );
+ }
}
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=589873&r1=589872&r2=589873&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 Mon Oct 29 14:48:35 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.v11">
+ <action type="install" id="geronimo.plan.install">
<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/internal/Trace.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/internal/Trace.java?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/internal/Trace.java Mon Oct 29 14:48:35 2007
@@ -88,9 +88,9 @@
* The class name + method name (e.g., "Class.method()")
*
* @param parm1,2,3,4,5
- * Method parameters if the trace point is an "Entry"
- * or
- * Return value if the trace point is an "Exit"
+ * Method parameters if the trace point is an "Entry"
+ * or
+ * Return value if the trace point is an "Exit"
*/
public static void trace(String tracePoint, String classDotMethod) {
trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()" );
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml Mon Oct 29 14:48:35 2007
@@ -33,7 +33,7 @@
</extension>
<extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
- <wizard-pages action="geronimo.plan.install.v11">
+ <wizard-pages action="geronimo.plan.install">
<page class="org.apache.geronimo.st.v11.ui.wizards.FacetInstallPage"/>
</wizard-pages>
</extension>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/Trace.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/internal/Trace.java?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/Trace.java Mon Oct 29 14:48:35 2007
@@ -88,9 +88,9 @@
* The class name + method name (e.g., "Class.method()")
*
* @param parm1,2,3,4,5
- * Method parameters if the trace point is an "Entry"
- * or
- * Return value if the trace point is an "Exit"
+ * Method parameters if the trace point is an "Entry"
+ * or
+ * Return value if the trace point is an "Exit"
*/
public static void trace(String tracePoint, String classDotMethod) {
trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()" );
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/FacetInstallPage.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/wizards/FacetInstallPage.java?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/FacetInstallPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/wizards/FacetInstallPage.java Mon Oct 29 14:48:35 2007
@@ -39,7 +39,7 @@
private Button sharedLib;
public FacetInstallPage() {
- super("geronimo.plan.install.v11");
+ super("geronimo.plan.install");
Trace.trace("Constructor Entry", "FacetInstallPage");
setTitle("Geronimo Deployment Plan");
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml Mon Oct 29 14:48:35 2007
@@ -71,7 +71,7 @@
<extension point="org.eclipse.wst.common.project.facet.core.facets">
<project-facet-version facet="org.apache.geronimo.facet" version="2.0">
- <action type="install" id="geronimo.plan.install.v20">
+ <action type="install" id="geronimo.plan.install">
<delegate class="org.apache.geronimo.st.v20.core.operations.GeronimoV20FacetInstallDelegate"/>
<config-factory class="org.apache.geronimo.st.v20.core.DeploymentPlanInstallConfig$Factory"/>
</action>
@@ -105,8 +105,8 @@
id="org.apache.geronimo.defaultFacets"
name="Geronimo Default Facets">
<default-facets>
- <runtime-component id="org.apache.geronimo.runtime" version="1.1"/>
- <facet id="org.apache.geronimo.facet" version="1.1"/>
+ <runtime-component id="org.apache.geronimo.runtime" version="2.0"/>
+ <facet id="org.apache.geronimo.facet" version="2.0"/>
</default-facets>
</extension>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/internal/Trace.java?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/internal/Trace.java Mon Oct 29 14:48:35 2007
@@ -88,9 +88,9 @@
* The class name + method name (e.g., "Class.method()")
*
* @param parm1,2,3,4,5
- * Method parameters if the trace point is an "Entry"
- * or
- * Return value if the trace point is an "Exit"
+ * Method parameters if the trace point is an "Entry"
+ * or
+ * Return value if the trace point is an "Exit"
*/
public static void trace(String tracePoint, String classDotMethod) {
trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()" );
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/plugin.xml?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/plugin.xml Mon Oct 29 14:48:35 2007
@@ -33,7 +33,7 @@
</extension>
<extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
- <wizard-pages action="geronimo.plan.install.v20">
+ <wizard-pages action="geronimo.plan.install">
<page class="org.apache.geronimo.st.v20.ui.wizards.FacetInstallPage"/>
</wizard-pages>
</extension>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/internal/Trace.java?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/internal/Trace.java Mon Oct 29 14:48:35 2007
@@ -88,9 +88,9 @@
* The class name + method name (e.g., "Class.method()")
*
* @param parm1,2,3,4,5
- * Method parameters if the trace point is an "Entry"
- * or
- * Return value if the trace point is an "Exit"
+ * Method parameters if the trace point is an "Entry"
+ * or
+ * Return value if the trace point is an "Exit"
*/
public static void trace(String tracePoint, String classDotMethod) {
trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()" );
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/FacetInstallPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/FacetInstallPage.java?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/FacetInstallPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/FacetInstallPage.java Mon Oct 29 14:48:35 2007
@@ -39,7 +39,7 @@
private Button sharedLib;
public FacetInstallPage() {
- super("geronimo.plan.install.v20");
+ super("geronimo.plan.install");
Trace.trace("Constructor Entry", "FacetInstallPage");
setTitle("Geronimo Deployment Plan");
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml?rev=589873&r1=589872&r2=589873&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml Mon Oct 29 14:48:35 2007
@@ -169,6 +169,7 @@
<include>plugin.*</include>
<include>*.properties</include>
<include>icons</include>
+ <include>bin</include>
<include>src/org/openejb</include>
<include>src/org/apache/geronimo/v11</include>
<include>src/org/apache/geronimo/xml/ns/j2ee</include>