Attachment #128583 for bug #222924

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

Lines 352-357 Link Here

(-)a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eeModule.java (+6 lines)
352		352
353	}	353	}
354		354
		355	public interface RootedEntry2 extends RootedEntry {
		356
		357	boolean isDirectoryDeployIgnored();
		358
		359	}
		360
355	public static final class Type {	361	public static final class Type {
356		362
357	public static final Type WAR = new Type(ModuleType.WAR);	363	public static final Type WAR = new Type(ModuleType.WAR);




                    J2eeModule.RootedEntry entry = rootedEntries.next();
                    String relativePath = entry.getRelativePath();
                    FileObject sourceFO = entry.getFileObject();
                    if ((entry instanceof J2eeModule.RootedEntry2)
                            && ((J2eeModule.RootedEntry2) entry).isDirectoryDeployIgnored()) {
                        continue;
                    }
                    FileObject destFolder = ServerFileDistributor.findOrCreateParentFolder(destRoot, relativePath);

        }
    }

    private boolean isArchiveInRootDir(FileObject root, FileObject sourceFO) {
        if (sourceFO.getParent().equals(root) && ("jar".equals(sourceFO.getExt()) || "war".equals(sourceFO.getExt()))) {
            return true;
        }
        return false;
    }

    //ServerProgress methods
    private void setStatusDistributeRunning(String message) {
        notify(createRunningProgressEvent(CommandType.DISTRIBUTE, message));

Return to bug 222924

Lines 206-212 Link Here

(-)a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/InitialServerFileDistributor.java (-8 / +2 lines)
206	J2eeModule.RootedEntry entry = rootedEntries.next();	206	J2eeModule.RootedEntry entry = rootedEntries.next();
207	String relativePath = entry.getRelativePath();	207	String relativePath = entry.getRelativePath();
208	FileObject sourceFO = entry.getFileObject();	208	FileObject sourceFO = entry.getFileObject();
209	if (sourceFO.isData() && isArchiveInRootDir(root, sourceFO)) {	209	if ((entry instanceof J2eeModule.RootedEntry2)
		210	&& ((J2eeModule.RootedEntry2) entry).isDirectoryDeployIgnored()) {
210	continue;	211	continue;
211	}	212	}
212	FileObject destFolder = ServerFileDistributor.findOrCreateParentFolder(destRoot, relativePath);	213	FileObject destFolder = ServerFileDistributor.findOrCreateParentFolder(destRoot, relativePath);
Lines 228-240 Link Here
228	}	229	}
229	}	230	}
230		231
231	private boolean isArchiveInRootDir(FileObject root, FileObject sourceFO) {
232	if (sourceFO.getParent().equals(root) && ("jar".equals(sourceFO.getExt()) \|\| "war".equals(sourceFO.getExt()))) {
233	return true;
234	}
235	return false;
236	}
237
238	//ServerProgress methods	232	//ServerProgress methods
239	private void setStatusDistributeRunning(String message) {	233	private void setStatusDistributeRunning(String message) {
240	notify(createRunningProgressEvent(CommandType.DISTRIBUTE, message));	234	notify(createRunningProgressEvent(CommandType.DISTRIBUTE, message));