Attachment #20488 for bug #54042

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 54042
Collapse All | Expand All




<!-- -//NetBeans//DTD Autoupdate Catalog 2.2//EN -->
<!-- XML representation of Autoupdate Modules/Updates Catalog -->

<!ELEMENT module_updates ((notification?, (module_group|module)*, license*)|error)>
<!ATTLIST module_updates timestamp CDATA #REQUIRED>

<!ELEMENT module_group ((module_group|module)*)>
<!ATTLIST module_group name CDATA #REQUIRED>

<!ELEMENT notification (#PCDATA)>
<!ATTLIST notification url CDATA #IMPLIED>

<!ELEMENT module (description?, module_notification?, external_package*, (manifest | l10n) )>
<!ATTLIST module codenamebase CDATA #REQUIRED
                 homepage     CDATA #IMPLIED
                 distribution CDATA #REQUIRED
                 license      CDATA #IMPLIED
                 downloadsize CDATA #REQUIRED
                 needsrestart CDATA #IMPLIED
                 moduleauthor CDATA #IMPLIED
                 releasedate  CDATA #IMPLIED
                 global       CDATA #IMPLIED>

<!ELEMENT description (#PCDATA)>

<!ELEMENT module_notification (#PCDATA)>

<!ELEMENT external_package EMPTY>
<!ATTLIST external_package
                 name CDATA #REQUIRED
                 target_name  CDATA #REQUIRED
                 start_url    CDATA #REQUIRED
                 description  CDATA #IMPLIED>

<!ELEMENT manifest EMPTY>
<!ATTLIST manifest OpenIDE-Module CDATA #REQUIRED
                   OpenIDE-Module-Name CDATA #REQUIRED
                   OpenIDE-Module-Specification-Version CDATA #REQUIRED
                   OpenIDE-Module-Implementation-Version CDATA #IMPLIED
                   OpenIDE-Module-Module-Dependencies CDATA #IMPLIED
                   OpenIDE-Module-Package-Dependencies CDATA #IMPLIED
                   OpenIDE-Module-Java-Dependencies CDATA #IMPLIED
                   OpenIDE-Module-IDE-Dependencies CDATA #IMPLIED
                   OpenIDE-Module-Short-Description CDATA #IMPLIED
                   OpenIDE-Module-Long-Description CDATA #IMPLIED
                   OpenIDE-Module-Display-Category CDATA #IMPLIED
                   OpenIDE-Module-Provides CDATA #IMPLIED
                   OpenIDE-Module-Requires CDATA #IMPLIED>

<!ELEMENT l10n EMPTY>
<!ATTLIST l10n   langcode             CDATA #IMPLIED
                 brandingcode         CDATA #IMPLIED
                 module_spec_version  CDATA #IMPLIED
                 module_major_version CDATA #IMPLIED
                 OpenIDE-Module-Name  CDATA #IMPLIED
                 OpenIDE-Module-Long-Description CDATA #IMPLIED>

<!ELEMENT license (#PCDATA)>
<!ATTLIST license name CDATA #REQUIRED>

<!ELEMENT error (auth_error|other_error)>

<!ELEMENT auth_error EMPTY>

<!ELEMENT other_error EMPTY>
<!ATTLIST other_error message CDATA #REQUIRED>




<!-- -//NetBeans//DTD Autoupdate Module Info 2.2//EN -->
<!-- XML representation of Autoupdate Module Info file -->
<!-- (Info.xml is included in NBM archive) -->

<!ELEMENT module (description?, module_notification?, external_package*, (manifest | l10n), license?)>
<!ATTLIST module codenamebase CDATA #REQUIRED
                 homepage     CDATA #IMPLIED
                 distribution CDATA #IMPLIED
                 license      CDATA #IMPLIED
                 downloadsize CDATA #IMPLIED
                 needsrestart CDATA #IMPLIED
                 moduleauthor CDATA #IMPLIED
                 releasedate  CDATA #IMPLIED
                 global       CDATA #IMPLIED>

<!ELEMENT description (#PCDATA)>

<!ELEMENT module_notification (#PCDATA)>

<!ELEMENT external_package EMPTY>
<!ATTLIST external_package
                 name CDATA #REQUIRED
                 target_name  CDATA #REQUIRED
                 start_url    CDATA #REQUIRED
                 description  CDATA #IMPLIED>

<!ELEMENT manifest EMPTY>
<!ATTLIST manifest OpenIDE-Module CDATA #REQUIRED
                   OpenIDE-Module-Name CDATA #REQUIRED
                   OpenIDE-Module-Specification-Version CDATA #REQUIRED
                   OpenIDE-Module-Implementation-Version CDATA #IMPLIED
                   OpenIDE-Module-Module-Dependencies CDATA #IMPLIED
                   OpenIDE-Module-Package-Dependencies CDATA #IMPLIED
                   OpenIDE-Module-Java-Dependencies CDATA #IMPLIED
                   OpenIDE-Module-IDE-Dependencies CDATA #IMPLIED
                   OpenIDE-Module-Short-Description CDATA #IMPLIED
                   OpenIDE-Module-Long-Description CDATA #IMPLIED
                   OpenIDE-Module-Display-Category CDATA #IMPLIED
                   OpenIDE-Module-Provides CDATA #IMPLIED
                   OpenIDE-Module-Requires CDATA #IMPLIED>

<!ELEMENT l10n EMPTY>
<!ATTLIST l10n   langcode             CDATA #IMPLIED
                 brandingcode         CDATA #IMPLIED
                 module_spec_version  CDATA #IMPLIED
                 module_major_version CDATA #IMPLIED
                 OpenIDE-Module-Name  CDATA #IMPLIED
                 OpenIDE-Module-Long-Description CDATA #IMPLIED>

<!ELEMENT license (#PCDATA)>
<!ATTLIST license name CDATA #REQUIRED>

Lines 61-66 Link Here

(-)autoupdate/src/org/netbeans/modules/autoupdate/ModuleUpdate.java (+22 lines)
61		61
62	private static final String ATTR_AUTHOR = "moduleauthor"; // NOI18N	62	private static final String ATTR_AUTHOR = "moduleauthor"; // NOI18N
63	private static final String ATTR_RELEASE_DATE = "releasedate"; // NOI18N	63	private static final String ATTR_RELEASE_DATE = "releasedate"; // NOI18N
		64	private static final String ATTR_IS_GLOBAL = "global"; // NOI18N
64		65
65	static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat ("yyyy/MM/dd"); // NOI18N	66	static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat ("yyyy/MM/dd"); // NOI18N
66		67
Lines 155-160 Link Here
155	/** Holds value of property safeToInstall. */	156	/** Holds value of property safeToInstall. */
156	private boolean safeToInstall = false;	157	private boolean safeToInstall = false;
157		158
		159	/** Holds value of property isGlobal. */
		160	private boolean isGlobal = false;
		161
158	/** Holds value of property jarList. */	162	/** Holds value of property jarList. */
159	private List jarList = new ArrayList();	163	private List jarList = new ArrayList();
160		164
Lines 345-350 Link Here
345	purchased = Boolean.valueOf( getAttribute( ATTR_PURCHASED ) ).booleanValue();	349	purchased = Boolean.valueOf( getAttribute( ATTR_PURCHASED ) ).booleanValue();
346		350
347	processNeedsRestart();	351	processNeedsRestart();
		352	processIsGlobal ();
348		353
349	readReleaseDate ();	354	readReleaseDate ();
350	readModuleAuthor ();	355	readModuleAuthor ();
Lines 517-522 Link Here
517	purchased = Boolean.valueOf( getAttribute( ATTR_PURCHASED ) ).booleanValue();	522	purchased = Boolean.valueOf( getAttribute( ATTR_PURCHASED ) ).booleanValue();
518		523
519	processNeedsRestart();	524	processNeedsRestart();
		525	processIsGlobal ();
520		526
521	readReleaseDate ();	527	readReleaseDate ();
522	readModuleAuthor ();	528	readModuleAuthor ();
Lines 569-574 Link Here
569	setSafeToInstall( true );	575	setSafeToInstall( true );
570	}	576	}
571		577
		578	private void processIsGlobal () {
		579	String attr = getAttribute( ATTR_IS_GLOBAL );
		580	if ( attr != null && Boolean.TRUE.toString().equals( attr.toLowerCase() ) ) {
		581	setToInstallDir (true);
		582	// setGlobal (true);
		583	}
		584	}
		585
572	// GETTERS AND SETTERS ------------------------------------------------------	586	// GETTERS AND SETTERS ------------------------------------------------------
573		587
574	/** Getter for property codeNameBase.	588	/** Getter for property codeNameBase.
Lines 1117-1122 Link Here
1117	this.safeToInstall = safeToInstall;	1131	this.safeToInstall = safeToInstall;
1118	}	1132	}
1119		1133
		1134	// void setGlobal (boolean isGlobal) {
		1135	// this.isGlobal = isGlobal;
		1136	// }
		1137	//
		1138	// boolean isGlobal () {
		1139	// return this.isGlobal;
		1140	// }
		1141	//
1120	/** Getter for property jarList.	1142	/** Getter for property jarList.
1121	* @return Value of property jarList.	1143	* @return Value of property jarList.
1122	*/	1144	*/

Lines 580-587 Link Here

(-)autoupdate/src/org/netbeans/modules/autoupdate/ResultsPanel.java (-2 / +8 lines)
580	return ((ModuleUpdate)modulelist.get(row)).isInstallApproved() ? Boolean.TRUE : Boolean.FALSE;	580	return ((ModuleUpdate)modulelist.get(row)).isInstallApproved() ? Boolean.TRUE : Boolean.FALSE;
581	else if (col == 1)	581	else if (col == 1)
582	return modulelist.get(row);	582	return modulelist.get(row);
583	else	583	else {
584	return ((ModuleUpdate)modulelist.get(row)).isToInstallDir() ? Boolean.TRUE : Boolean.FALSE;	584	ModuleUpdate mu = (ModuleUpdate)modulelist.get (row);
		585	// if (mu.isGlobal ()) {
		586	// return Boolean.TRUE;
		587	// } else {
		588	return Boolean.valueOf (mu.isToInstallDir());
		589	// }
		590	}
585	}	591	}
586		592
587	public Class getColumnClass(int c) {	593	public Class getColumnClass(int c) {

Lines 193-199 Link Here

(-)nbbuild/antsrc/org/netbeans/nbbuild/MakeListOfNBM.java (-1 / +2 lines)
193	String nbmneedsrestart = this.getProject().getProperty("nbm.needs.restart"); // NOI18N	193	String nbmneedsrestart = this.getProject().getProperty("nbm.needs.restart"); // NOI18N
194	String nbmreleasedate = this.getProject().getProperty("nbm.release.date"); // NOI18N	194	String nbmreleasedate = this.getProject().getProperty("nbm.release.date"); // NOI18N
195	String nbmmoduleauthor = this.getProject().getProperty("nbm.module.author"); // NOI18N	195	String nbmmoduleauthor = this.getProject().getProperty("nbm.module.author"); // NOI18N
196	moduleTracking.putModule(moduleName, codename, clusterDir, nbmfilename, nbmhomepage, nbmneedsrestart, nbmreleasedate, nbmmoduleauthor, inc);	196	String nbmisglobal = this.getProject().getProperty("nbm.is.global"); // NOI18N
		197	moduleTracking.putModule(moduleName, codename, clusterDir, nbmfilename, nbmhomepage, nbmneedsrestart, nbmreleasedate, nbmmoduleauthor, nbmisglobal, inc);
197	moduleTracking.write();	198	moduleTracking.write();
198	}	199	}
199	}	200	}

Lines 285-290 Link Here

(-)nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java (-1 / +9 lines)
285	private String needsrestart = null;	285	private String needsrestart = null;
286	private String moduleauthor = null;	286	private String moduleauthor = null;
287	private String releasedate = null;	287	private String releasedate = null;
		288	private String global = null;
288	private String jarSignerMaxMemory = "96m";	289	private String jarSignerMaxMemory = "96m";
289	private Blurb license = null;	290	private Blurb license = null;
290	private Blurb description = null;	291	private Blurb description = null;
Lines 341-350 Link Here
341	public void setNeedsrestart (String needsrestart) {	342	public void setNeedsrestart (String needsrestart) {
342	this.needsrestart = needsrestart;	343	this.needsrestart = needsrestart;
343	}	344	}
344	/** Name of module's author. */	345	/** Install globally? */
345	public void setModuleauthor (String author) {	346	public void setModuleauthor (String author) {
346	this.moduleauthor = author;	347	this.moduleauthor = author;
347	}	348	}
		349	public void setGlobal (String isGlobal) {
		350	this.global = isGlobal;
		351	}
348	/** Maximum memory allowed to be used by jarsigner task. Default is 96 MB. */	352	/** Maximum memory allowed to be used by jarsigner task. Default is 96 MB. */
349	public void setJarSignerMaxMemory (String jsmm) {	353	public void setJarSignerMaxMemory (String jsmm) {
350	this.jarSignerMaxMemory = jsmm;	354	this.jarSignerMaxMemory = jsmm;
Lines 506-511 Link Here
506	ps.println (" downloadsize=\"0\""); //NOI18N	510	ps.println (" downloadsize=\"0\""); //NOI18N
507	if (needsrestart != null)	511	if (needsrestart != null)
508	ps.println (" needsrestart=\"" + xmlEscape(needsrestart) + "\""); //NOI18N	512	ps.println (" needsrestart=\"" + xmlEscape(needsrestart) + "\""); //NOI18N
		513	if (global != null)
		514	ps.println (" global=\"" + xmlEscape(global) + "\""); //NOI18N
509	if (moduleauthor != null)	515	if (moduleauthor != null)
510	ps.println (" moduleauthor=\"" + xmlEscape(moduleauthor) + "\""); //NOI18N	516	ps.println (" moduleauthor=\"" + xmlEscape(moduleauthor) + "\""); //NOI18N
511	if (releasedate == null \|\| "".equals (releasedate)) { //NOI18N	517	if (releasedate == null \|\| "".equals (releasedate)) { //NOI18N
Lines 608-613 Link Here
608	mtm.setNbmModuleAuthor(moduleauthor);	614	mtm.setNbmModuleAuthor(moduleauthor);
609	log(" needsrestart: \""+mtm.getNbmNeedsRestart()+ "\" => \"" + needsrestart + "\"", Project.MSG_DEBUG);	615	log(" needsrestart: \""+mtm.getNbmNeedsRestart()+ "\" => \"" + needsrestart + "\"", Project.MSG_DEBUG);
610	mtm.setNbmNeedsRestart(needsrestart);	616	mtm.setNbmNeedsRestart(needsrestart);
		617	log(" global: \""+mtm.getNbmIsGlobal()+ "\" => \"" + global + "\"", Project.MSG_DEBUG);
		618	mtm.setNbmIsGlobal(global);
611	log(" releasedate: \""+mtm.getNbmReleaseDate() + "\" => \"" + releasedate+"\"", Project.MSG_DEBUG);	619	log(" releasedate: \""+mtm.getNbmReleaseDate() + "\" => \"" + releasedate+"\"", Project.MSG_DEBUG);
612	mtm.setNbmReleaseDate(releasedate);	620	mtm.setNbmReleaseDate(releasedate);
613	mt.write();	621	mt.write();

Lines 36-41 Link Here

(-)nbbuild/antsrc/org/netbeans/nbbuild/ModuleTracking.java (-1 / +24 lines)
36	private static final String ATTR_NBM_HOME_PAGE = "nbmhomepage"; // NOI18N	36	private static final String ATTR_NBM_HOME_PAGE = "nbmhomepage"; // NOI18N
37	private static final String ATTR_NBM_FILE_NAME = "nbmfilename"; // NOI18N	37	private static final String ATTR_NBM_FILE_NAME = "nbmfilename"; // NOI18N
38	private static final String ATTR_NBM_NEEDS_RESTART = "nbmneedsrestart"; // NOI18N	38	private static final String ATTR_NBM_NEEDS_RESTART = "nbmneedsrestart"; // NOI18N
		39	private static final String ATTR_NBM_IS_GLOBAL = "nbmisglobal"; // NOI18N
39	private static final String ATTR_NBM_RELEASE_DATE = "nbmreleasedate"; // NOI18N	40	private static final String ATTR_NBM_RELEASE_DATE = "nbmreleasedate"; // NOI18N
40	private static final String ATTR_NBM_MODULE_AUTHOR = "nbmmoduleauthor"; // NOI18N	41	private static final String ATTR_NBM_MODULE_AUTHOR = "nbmmoduleauthor"; // NOI18N
41		42
Lines 69-75 Link Here
69	return module;	70	return module;
70	}*/	71	}*/
71		72
72	public void putModule(String name, String codename, String path, String nbmfilename, String nbmhomepage, String nbmneedsrestart, String nbmreleasedate, String nbmmoduleauthor, String[] files) {	73	public void putModule(String name, String codename, String path, String nbmfilename, String nbmhomepage, String nbmneedsrestart, String nbmreleasedate, String nbmmoduleauthor, String nbmisglobal, String[] files) {
73	Module modByName = tracking.getModule(name);	74	Module modByName = tracking.getModule(name);
74	Module modByCodeName = tracking.getModuleByCodeName(codename);	75	Module modByCodeName = tracking.getModuleByCodeName(codename);
75	Module module = null;	76	Module module = null;
Lines 95-100 Link Here
95	module.setNbmNeedsRestart(nbmneedsrestart);	96	module.setNbmNeedsRestart(nbmneedsrestart);
96	if (module.getNbmReleaseDate().equals("")) // NOI18N	97	if (module.getNbmReleaseDate().equals("")) // NOI18N
97	module.setNbmReleaseDate(nbmreleasedate);	98	module.setNbmReleaseDate(nbmreleasedate);
		99	if (module.getNbmIsGlobal().equals ("")) { // NOI18N
		100	module.setNbmIsGlobal(nbmisglobal);
		101	}
98	/**	102	/**
99	System.out.println(" module == "+name);	103	System.out.println(" module == "+name);
100	System.out.println(" path == "+path);	104	System.out.println(" path == "+path);
Lines 103-108 Link Here
103	System.out.println(" homepage == "+module.getNbmHomePage());	107	System.out.println(" homepage == "+module.getNbmHomePage());
104	System.out.println(" author == "+module.getNbmModuleAuthor());	108	System.out.println(" author == "+module.getNbmModuleAuthor());
105	System.out.println(" needsrestart == "+module.getNbmNeedsRestart());	109	System.out.println(" needsrestart == "+module.getNbmNeedsRestart());
		110	System.out.println(" global == "+module.getNbmIsGlobal ());
106	System.out.println(" releasedate == "+module.getNbmReleaseDate());	111	System.out.println(" releasedate == "+module.getNbmReleaseDate());
107	*/	112	*/
108	module.putFiles( files );	113	module.putFiles( files );
Lines 143-148 Link Here
143	e_module.setAttribute(ATTR_NBM_HOME_PAGE, mod.getNbmHomePage());	148	e_module.setAttribute(ATTR_NBM_HOME_PAGE, mod.getNbmHomePage());
144	e_module.setAttribute(ATTR_NBM_MODULE_AUTHOR, mod.getNbmModuleAuthor());	149	e_module.setAttribute(ATTR_NBM_MODULE_AUTHOR, mod.getNbmModuleAuthor());
145	e_module.setAttribute(ATTR_NBM_NEEDS_RESTART, mod.getNbmNeedsRestart());	150	e_module.setAttribute(ATTR_NBM_NEEDS_RESTART, mod.getNbmNeedsRestart());
		151	e_module.setAttribute(ATTR_NBM_IS_GLOBAL, mod.getNbmIsGlobal ());
146	e_module.setAttribute(ATTR_NBM_RELEASE_DATE, mod.getNbmReleaseDate());	152	e_module.setAttribute(ATTR_NBM_RELEASE_DATE, mod.getNbmReleaseDate());
147	e_module_tracking.appendChild( e_module );	153	e_module_tracking.appendChild( e_module );
148	Iterator it3 = mod.getFiles().iterator();	154	Iterator it3 = mod.getFiles().iterator();
Lines 239-244 Link Here
239	if (attr.getName().equals(ATTR_NBM_NEEDS_RESTART)) { // <module nbmneedsrestart="???">	245	if (attr.getName().equals(ATTR_NBM_NEEDS_RESTART)) { // <module nbmneedsrestart="???">
240	module.setNbmNeedsRestart( attr.getValue() );	246	module.setNbmNeedsRestart( attr.getValue() );
241	}	247	}
		248	if (attr.getName().equals(ATTR_NBM_IS_GLOBAL)) { // <module nbmisglobal="???">
		249	module.setNbmIsGlobal( attr.getValue() );
		250	}
242	if (attr.getName().equals(ATTR_NBM_RELEASE_DATE)) { // <module nbmreleasedate="???">	251	if (attr.getName().equals(ATTR_NBM_RELEASE_DATE)) { // <module nbmreleasedate="???">
243	module.setNbmReleaseDate( attr.getValue() );	252	module.setNbmReleaseDate( attr.getValue() );
244	}	253	}
Lines 335-340 Link Here
335	/** Holds value of property nbmneedsrestart. */	344	/** Holds value of property nbmneedsrestart. */
336	private String nbmneedsrestart = ""; // NOI18N	345	private String nbmneedsrestart = ""; // NOI18N
337		346
		347	/** Holds value of property nbmisglobal. */
		348	private String nbmisglobal = ""; // NOI18N
		349
338	/** Holds value of property nbmreleasedate. */	350	/** Holds value of property nbmreleasedate. */
339	private String nbmreleasedate = ""; // NOI18N	351	private String nbmreleasedate = ""; // NOI18N
340		352
Lines 417-422 Link Here
417	void setNbmNeedsRestart (String nbmnr) {	429	void setNbmNeedsRestart (String nbmnr) {
418	if (!(nbmnr == null))	430	if (!(nbmnr == null))
419	this.nbmneedsrestart = nbmnr;	431	this.nbmneedsrestart = nbmnr;
		432	}
		433
		434	/** Setter for property nbmisglobal */
		435	void setNbmIsGlobal (String isGlobal) {
		436	if (!(isGlobal == null))
		437	this.nbmisglobal = isGlobal;
		438	}
		439
		440	/** Getter for property nbmisglobal */
		441	String getNbmIsGlobal () {
		442	return this.nbmisglobal;
420	}	443	}
421		444
422	/** Getter for property nbmreleasedate */	445	/** Getter for property nbmreleasedate */

Return to bug 54042

Added Link Here

(-)autoupdate/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_3.dtd (+66 lines)
1	<!-- -//NetBeans//DTD Autoupdate Catalog 2.2//EN -->
2	<!-- XML representation of Autoupdate Modules/Updates Catalog -->
3
4	<!ELEMENT module_updates ((notification?, (module_group\|module), license)\|error)>
5	<!ATTLIST module_updates timestamp CDATA #REQUIRED>
6
7	<!ELEMENT module_group ((module_group\|module)*)>
8	<!ATTLIST module_group name CDATA #REQUIRED>
9
10	<!ELEMENT notification (#PCDATA)>
11	<!ATTLIST notification url CDATA #IMPLIED>
12
13	<!ELEMENT module (description?, module_notification?, external_package*, (manifest \| l10n) )>
14	<!ATTLIST module codenamebase CDATA #REQUIRED
15	homepage CDATA #IMPLIED
16	distribution CDATA #REQUIRED
17	license CDATA #IMPLIED
18	downloadsize CDATA #REQUIRED
19	needsrestart CDATA #IMPLIED
20	moduleauthor CDATA #IMPLIED
21	releasedate CDATA #IMPLIED
22	global CDATA #IMPLIED>
23
24	<!ELEMENT description (#PCDATA)>
25
26	<!ELEMENT module_notification (#PCDATA)>
27
28	<!ELEMENT external_package EMPTY>
29	<!ATTLIST external_package
30	name CDATA #REQUIRED
31	target_name CDATA #REQUIRED
32	start_url CDATA #REQUIRED
33	description CDATA #IMPLIED>
34
35	<!ELEMENT manifest EMPTY>
36	<!ATTLIST manifest OpenIDE-Module CDATA #REQUIRED
37	OpenIDE-Module-Name CDATA #REQUIRED
38	OpenIDE-Module-Specification-Version CDATA #REQUIRED
39	OpenIDE-Module-Implementation-Version CDATA #IMPLIED
40	OpenIDE-Module-Module-Dependencies CDATA #IMPLIED
41	OpenIDE-Module-Package-Dependencies CDATA #IMPLIED
42	OpenIDE-Module-Java-Dependencies CDATA #IMPLIED
43	OpenIDE-Module-IDE-Dependencies CDATA #IMPLIED
44	OpenIDE-Module-Short-Description CDATA #IMPLIED
45	OpenIDE-Module-Long-Description CDATA #IMPLIED
46	OpenIDE-Module-Display-Category CDATA #IMPLIED
47	OpenIDE-Module-Provides CDATA #IMPLIED
48	OpenIDE-Module-Requires CDATA #IMPLIED>
49
50	<!ELEMENT l10n EMPTY>
51	<!ATTLIST l10n langcode CDATA #IMPLIED
52	brandingcode CDATA #IMPLIED
53	module_spec_version CDATA #IMPLIED
54	module_major_version CDATA #IMPLIED
55	OpenIDE-Module-Name CDATA #IMPLIED
56	OpenIDE-Module-Long-Description CDATA #IMPLIED>
57
58	<!ELEMENT license (#PCDATA)>
59	<!ATTLIST license name CDATA #REQUIRED>
60
61	<!ELEMENT error (auth_error\|other_error)>
62
63	<!ELEMENT auth_error EMPTY>
64
65	<!ELEMENT other_error EMPTY>
66	<!ATTLIST other_error message CDATA #REQUIRED>

Added Link Here

(-)autoupdate/libsrc/org/netbeans/updater/resources/autoupdate-info-2_3.dtd (+51 lines)
1	<!-- -//NetBeans//DTD Autoupdate Module Info 2.2//EN -->
2	<!-- XML representation of Autoupdate Module Info file -->
3	<!-- (Info.xml is included in NBM archive) -->
4
5	<!ELEMENT module (description?, module_notification?, external_package*, (manifest \| l10n), license?)>
6	<!ATTLIST module codenamebase CDATA #REQUIRED
7	homepage CDATA #IMPLIED
8	distribution CDATA #IMPLIED
9	license CDATA #IMPLIED
10	downloadsize CDATA #IMPLIED
11	needsrestart CDATA #IMPLIED
12	moduleauthor CDATA #IMPLIED
13	releasedate CDATA #IMPLIED
14	global CDATA #IMPLIED>
15
16	<!ELEMENT description (#PCDATA)>
17
18	<!ELEMENT module_notification (#PCDATA)>
19
20	<!ELEMENT external_package EMPTY>
21	<!ATTLIST external_package
22	name CDATA #REQUIRED
23	target_name CDATA #REQUIRED
24	start_url CDATA #REQUIRED
25	description CDATA #IMPLIED>
26
27	<!ELEMENT manifest EMPTY>
28	<!ATTLIST manifest OpenIDE-Module CDATA #REQUIRED
29	OpenIDE-Module-Name CDATA #REQUIRED
30	OpenIDE-Module-Specification-Version CDATA #REQUIRED
31	OpenIDE-Module-Implementation-Version CDATA #IMPLIED
32	OpenIDE-Module-Module-Dependencies CDATA #IMPLIED
33	OpenIDE-Module-Package-Dependencies CDATA #IMPLIED
34	OpenIDE-Module-Java-Dependencies CDATA #IMPLIED
35	OpenIDE-Module-IDE-Dependencies CDATA #IMPLIED
36	OpenIDE-Module-Short-Description CDATA #IMPLIED
37	OpenIDE-Module-Long-Description CDATA #IMPLIED
38	OpenIDE-Module-Display-Category CDATA #IMPLIED
39	OpenIDE-Module-Provides CDATA #IMPLIED
40	OpenIDE-Module-Requires CDATA #IMPLIED>
41
42	<!ELEMENT l10n EMPTY>
43	<!ATTLIST l10n langcode CDATA #IMPLIED
44	brandingcode CDATA #IMPLIED
45	module_spec_version CDATA #IMPLIED
46	module_major_version CDATA #IMPLIED
47	OpenIDE-Module-Name CDATA #IMPLIED
48	OpenIDE-Module-Long-Description CDATA #IMPLIED>
49
50	<!ELEMENT license (#PCDATA)>
51	<!ATTLIST license name CDATA #REQUIRED>

Lines 84-89 Link Here

(-)nbbuild/templates/projectized.xml (+2 lines)
84	<property name="nbm.module.author" value=""/>	84	<property name="nbm.module.author" value=""/>
85	<property name="nbm.release.date" value=""/>	85	<property name="nbm.release.date" value=""/>
86	<property name="nbm.needs.restart" value="false"/>	86	<property name="nbm.needs.restart" value="false"/>
		87	<property name="nbm.is.global" value=""/>
87	<path id="cp">	88	<path id="cp">
88	<pathelement path="${module.classpath}"/>	89	<pathelement path="${module.classpath}"/>
89	<pathelement path="${cp.extra}"/>	90	<pathelement path="${cp.extra}"/>
Lines 236-241 Link Here
236	homepage="${nbm.homepage}"	237	homepage="${nbm.homepage}"
237	distribution="http://${dist.base}/${nbm}"	238	distribution="http://${dist.base}/${nbm}"
238	needsrestart="${nbm.needs.restart}"	239	needsrestart="${nbm.needs.restart}"
		240	global="${nbm.is.global}"
239	releasedate="${nbm.release.date}"	241	releasedate="${nbm.release.date}"
240	moduleauthor="${nbm.module.author}">	242	moduleauthor="${nbm.module.author}">
241	<license file="${license.file}"/>	243	<license file="${license.file}"/>