Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 10695 invoked from network); 12 Aug 2009 07:16:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 Aug 2009 07:16:44 -0000 Received: (qmail 54583 invoked by uid 500); 12 Aug 2009 07:16:51 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 54531 invoked by uid 500); 12 Aug 2009 07:16:51 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 54522 invoked by uid 99); 12 Aug 2009 07:16:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Aug 2009 07:16:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Aug 2009 07:16:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 810BE23888D7; Wed, 12 Aug 2009 07:16:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r803390 - in /geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.v21.core: META-INF/MANIFEST.MF src/main/java/org/apache/geronimo/st/v21/core/DeploymentPlanInstallConfig.java Date: Wed, 12 Aug 2009 07:16:28 -0000 To: scm@geronimo.apache.org From: delos@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090812071628.810BE23888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: delos Date: Wed Aug 12 07:16:28 2009 New Revision: 803390 URL: http://svn.apache.org/viewvc?rev=803390&view=rev Log: GERONIMODEVTOOLS-585 Make GEP generate standard JEE deployment descriptor by default Modified: geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/DeploymentPlanInstallConfig.java Modified: geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF?rev=803390&r1=803389&r2=803390&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF (original) +++ geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF Wed Aug 12 07:16:28 2009 @@ -6,7 +6,8 @@ Bundle-Activator: org.apache.geronimo.st.v21.core.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin -Require-Bundle: org.apache.geronimo.runtime.v21, +Require-Bundle: org.eclipse.jst.j2ee, + org.apache.geronimo.runtime.v21, org.apache.geronimo.st.core, org.apache.geronimo.jee.v21.jaxbmodel, org.eclipse.core.runtime, Modified: geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/DeploymentPlanInstallConfig.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/DeploymentPlanInstallConfig.java?rev=803390&r1=803389&r2=803390&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/DeploymentPlanInstallConfig.java (original) +++ geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/DeploymentPlanInstallConfig.java Wed Aug 12 07:16:28 2009 @@ -17,6 +17,8 @@ package org.apache.geronimo.st.v21.core; import org.apache.geronimo.st.v21.core.internal.Trace; +import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; +import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences; import org.eclipse.wst.common.project.facet.core.IActionConfigFactory; @@ -40,8 +42,24 @@ public Object create() { Trace.tracePoint("Entry/Exit", "DeploymentPlanInstallConfig.create"); + + enableGenerationDDByDefault(); + return new DeploymentPlanInstallConfig(); } + + /* + * by default, WTP won't generate deployment descriptor for all the projects(only true for web project). + * Try to generate deployment descriptor by default for all projects, the default value are set here + * + * reference to J2EEPreferences.java in org.eclipse.jst.j2ee bundle + */ + private void enableGenerationDDByDefault(){ + J2EEPlugin.getDefault().getJ2EEPreferences().setValue(J2EEPreferences.Keys.APPLICATION_GENERATE_DD,true); + J2EEPlugin.getDefault().getJ2EEPreferences().setValue(J2EEPreferences.Keys.DYNAMIC_WEB_GENERATE_DD,true); + J2EEPlugin.getDefault().getJ2EEPreferences().setValue(J2EEPreferences.Keys.EJB_GENERATE_DD,true); + J2EEPlugin.getDefault().getJ2EEPreferences().setValue(J2EEPreferences.Keys.APP_CLIENT_GENERATE_DD,true); + } } public String getArtifactId() {