Attachment #9577 for bug #31962

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 31962
Collapse All | Expand All

Lines 59-65 Link Here

(-)nbbuild/antsrc/org/netbeans/nbbuild/MakeLNBM.java (-1 / +1 lines)
59	try {	59	try {
60	InputStream is = new FileInputStream (file);	60	InputStream is = new FileInputStream (file);
61	try {	61	try {
62	Reader r = new InputStreamReader (is);	62	Reader r = new InputStreamReader (is, "UTF-8");
63	char[] buf = new char[4096];	63	char[] buf = new char[4096];
64	int len;	64	int len;
65	while ((len = r.read (buf)) != -1)	65	while ((len = r.read (buf)) != -1)

Lines 56-62 Link Here

(-)nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java (-1 / +1 lines)
56	try {	56	try {
57	InputStream is = new FileInputStream (file);	57	InputStream is = new FileInputStream (file);
58	try {	58	try {
59	Reader r = new InputStreamReader (is);	59	Reader r = new InputStreamReader (is, "UTF-8");
60	char[] buf = new char[4096];	60	char[] buf = new char[4096];
61	int len;	61	int len;
62	while ((len = r.read (buf)) != -1)	62	while ((len = r.read (buf)) != -1)




                    }
                    desc_ent = new File(ent_name);               
                    desc_ent.delete();
                    pw.println ("<!DOCTYPE module_updates PUBLIC \"-//NetBeans//DTD Autoupdate Catalog 2.0//EN\" \"http://www.netbeans.org/dtds/autoupdate-catalog-2_0.dtd\" [");
                    // Would be better to follow order of groups and includes
                    pw.println ("    <!ENTITY entity SYSTEM \"" + xmlEscape(desc_ent.getName()) + "\">");
                    int inc_num=0;

                    pw.println ("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
                    
                } else {
                    pw.println ("<!DOCTYPE module_updates PUBLIC \"-//NetBeans//DTD Autoupdate Catalog 2.0//EN\" \"http://www.netbeans.org/dtds/autoupdate-catalog-2_0.dtd\">");
                    pw.println ("<module_updates timestamp=\"" + date + "\">");
                    pw.println ();
                }

                                        throw new BuildException ("NBM " + n_file + " was malformed: no Info/info.xml", location);
                                    java.io.InputStream is = zip.getInputStream (entry);
                                    try {
                                        java.io.BufferedReader r = new java.io.BufferedReader (new java.io.InputStreamReader (is, "UTF-8"));
                                        String line = r.readLine ();
                                        if (! line.startsWith ("<?xml"))
                                            throw new BuildException ("Strange info.xml line: " + line, location);

Return to bug 31962

Lines 171-177 Link Here

(-)nbbuild/antsrc/org/netbeans/nbbuild/MakeUpdateDesc.java (-3 / +3 lines)
171	}	171	}
172	desc_ent = new File(ent_name);	172	desc_ent = new File(ent_name);
173	desc_ent.delete();	173	desc_ent.delete();
174	pw.println ("<!DOCTYPE autoupdate_catalog PUBLIC \"-//NetBeans//DTD Autoupdate Catalog 2.0//EN\" \"http://www.netbeans.org/dtds/autoupdate-catalog-2_0.dtd\" [");	174	pw.println ("<!DOCTYPE module_updates PUBLIC \"-//NetBeans//DTD Autoupdate Catalog 2.0//EN\" \"http://www.netbeans.org/dtds/autoupdate-catalog-2_0.dtd\" [");
175	// Would be better to follow order of groups and includes	175	// Would be better to follow order of groups and includes
176	pw.println (" <!ENTITY entity SYSTEM \"" + xmlEscape(desc_ent.getName()) + "\">");	176	pw.println (" <!ENTITY entity SYSTEM \"" + xmlEscape(desc_ent.getName()) + "\">");
177	int inc_num=0;	177	int inc_num=0;
Lines 195-201 Link Here
195	pw.println ("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");	195	pw.println ("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
196		196
197	} else {	197	} else {
198	pw.println ("<!DOCTYPE module_updates PUBLIC \"-//NetBeans//DTD Autoupdate Module Info 2.0//EN\" \"http://www.netbeans.org/dtds/autoupdate-info-2_0.dtd\">");	198	pw.println ("<!DOCTYPE module_updates PUBLIC \"-//NetBeans//DTD Autoupdate Catalog 2.0//EN\" \"http://www.netbeans.org/dtds/autoupdate-catalog-2_0.dtd\">");
199	pw.println ("<module_updates timestamp=\"" + date + "\">");	199	pw.println ("<module_updates timestamp=\"" + date + "\">");
200	pw.println ();	200	pw.println ();
201	}	201	}
Lines 234-240 Link Here
234	throw new BuildException ("NBM " + n_file + " was malformed: no Info/info.xml", location);	234	throw new BuildException ("NBM " + n_file + " was malformed: no Info/info.xml", location);
235	java.io.InputStream is = zip.getInputStream (entry);	235	java.io.InputStream is = zip.getInputStream (entry);
236	try {	236	try {
237	java.io.BufferedReader r = new java.io.BufferedReader (new java.io.InputStreamReader (is));	237	java.io.BufferedReader r = new java.io.BufferedReader (new java.io.InputStreamReader (is, "UTF-8"));
238	String line = r.readLine ();	238	String line = r.readLine ();
239	if (! line.startsWith ("<?xml"))	239	if (! line.startsWith ("<?xml"))
240	throw new BuildException ("Strange info.xml line: " + line, location);	240	throw new BuildException ("Strange info.xml line: " + line, location);