# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: /Volumes/300gb/nbtrunk6/web/webapi # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: src/org/netbeans/modules/web/api/webmodule/WebProjectConstants.java *** /Volumes/300gb/nbtrunk6/web/webapi/src/org/netbeans/modules/web/api/webmodule/WebProjectConstants.java Base (1.7) --- /Volumes/300gb/nbtrunk6/web/webapi/src/org/netbeans/modules/web/api/webmodule/WebProjectConstants.java Locally Modified (Based On 1.7) *************** *** 13,19 **** * "Portions Copyrighted [year] [name of copyright owner]" * * The Original Software is NetBeans. The Initial Developer of the Original ! * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun * Microsystems, Inc. All Rights Reserved. */ --- 13,19 ---- * "Portions Copyrighted [year] [name of copyright owner]" * * The Original Software is NetBeans. The Initial Developer of the Original ! * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun * Microsystems, Inc. All Rights Reserved. */ *************** *** 65,68 **** --- 65,76 ---- //TO-DO: should be got from org.netbeans.modules.j2ee.common.J2eeProjectConstants public static final String ARTIFACT_TYPE_WAR_EAR_ARCHIVE = "j2ee_ear_archive"; //NOI18N + /** + * Constant representing the build directory of a web app artifact to be + * packaged as a part of an ear archive. Used to directory deploy EAR projects. + * @see org.netbeans.api.project.ant.AntArtifact + * @since 1.9 + */ + public static final String ARTIFACT_TYPE_BUILD_DIR_EAR_ARCHIVE = "j2ee_ear_builddir"; // NOI18N + } Index: manifest.mf *** /Volumes/300gb/nbtrunk6/web/webapi/manifest.mf Base (1.11) --- /Volumes/300gb/nbtrunk6/web/webapi/manifest.mf Locally Modified (Based On 1.11) *************** *** 1,5 **** Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.api.web.webmodule ! OpenIDE-Module-Specification-Version: 1.8 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/webmodule/Bundle.properties --- 1,5 ---- Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.api.web.webmodule ! OpenIDE-Module-Specification-Version: 1.9 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/webmodule/Bundle.properties Index: apichanges.xml *** /Volumes/300gb/nbtrunk6/web/webapi/apichanges.xml Base (1.5) --- /Volumes/300gb/nbtrunk6/web/webapi/apichanges.xml Locally Modified (Based On 1.5) *************** *** 80,85 **** --- 80,100 ---- + + + Add Ant Atrifact type + + + + + +

+ Added constant for a new AntArtifact type to support directory + deployment of ear projects. +

+
+ +
Adding getServletPath method for framework providers