Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2216,10 +2216,6 @@ jobs:
# - name: web.project
# run: ant $OPTS -f enterprise/web.project test

# Fails
# - name: web.struts
# run: ant $OPTS -f enterprise/web.struts test

- name: websvc.clientapi
run: ant $OPTS -f enterprise/websvc.clientapi test

Expand Down
1 change: 0 additions & 1 deletion enterprise/j2ee.common/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,6 @@
<friend>org.netbeans.modules.web.jsf.richfaces</friend>
<friend>org.netbeans.modules.web.primefaces</friend>
<friend>org.netbeans.modules.web.project</friend>
<friend>org.netbeans.modules.web.struts</friend>
<friend>org.netbeans.modules.websvc.core</friend>
<friend>org.netbeans.modules.websvc.jaxrpc</friend>
<friend>org.netbeans.modules.websvc.restapi</friend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ public class JSFCatalog implements CatalogReader, CatalogDescriptor2, org.xml.sa
private static final String RESOURCE_URL_FACELETS_TAGLIB_DTD_10 ="nbres:/org/netbeans/modules/web/jsf/resources/" + FILE_FACELETS_TAGLIB_DTD_10; // NOI18N


/** Creates a new instance of StrutsCatalog */
public JSFCatalog() {
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ public class JSFConfigDataObject extends MultiDataObject implements org.openide.
public static final String PROP_DOC_VALID = "documentValid"; // NOI18N


/** Creates a new instance of StrutsConfigDataObject */
public JSFConfigDataObject(FileObject pf, JSFConfigLoader loader) throws DataObjectExistsException {
super(pf, loader);
init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.openide.util.Exceptions;
import org.openide.util.ImageUtilities;

/** StrutsConfig loader bean info.
/**
*
* @author Petr Pisl
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public class JSFConfigNode extends DataNode {

public static final String ICON_BASE = "org/netbeans/modules/web/jsf/resources/JSFConfigIcon.png";

/** Creates a new instance of StrutsConfigNode */
public JSFConfigNode (final JSFConfigDataObject dataObject) {
super(dataObject,Children.LEAF);
setIconBaseWithExtension(ICON_BASE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ public class JSFConfigHyperlinkProvider implements HyperlinkProvider {
private int valueOffset;
private String [] ev = null;

/** Creates a new instance of StrutsHyperlinkProvider. */
public JSFConfigHyperlinkProvider() {
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,25 +70,9 @@ public boolean setJSFFrameworkCheckbox() {
}
}

/*
* Selects a Struts Framework to be added
*/

public boolean setStrutsFrameworkCheckbox() {
Integer strutsRow = tabSelectTheFrameworksYouWantToUseInYourWebApplication().findCellRow("org.netbeans.modules.web.struts");
if (strutsRow != -1) {
tabSelectTheFrameworksYouWantToUseInYourWebApplication().clickOnCell(strutsRow, 0);
return true;
} else {
System.err.println("No Struts framework found!");
return false;
}

}
/*
* Selects a Spring MVC Framework to be added
*/

public boolean setSpringFrameworkCheckbox() {
Integer springRow = tabSelectTheFrameworksYouWantToUseInYourWebApplication().findCellRow("org.netbeans.modules.spring.webmvc");
if (springRow != -1) {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public static Test suite() {
conf = addServerTests(Server.GLASSFISH, conf, WebProjectValidation.class, WebProjectValidation.TESTS);
conf = addServerTests(Server.GLASSFISH, conf, WebProjectValidationNb36WebModule.class, WebProjectValidationNb36WebModule.TESTS);
conf = addServerTests(Server.GLASSFISH, conf, WebSpringProjectValidation.class, WebSpringProjectValidation.TESTS);
conf = addServerTests(Server.GLASSFISH, conf, WebStrutsProjectValidation.class, WebStrutsProjectValidation.TESTS);
conf = addServerTests(Server.GLASSFISH, conf, MavenWebProjectValidationEE5.class, MavenWebProjectValidationEE5.TESTS);
conf = addServerTests(Server.GLASSFISH, conf, MavenWebProjectValidationEE6.class, MavenWebProjectValidationEE6.TESTS);
conf = addServerTests(Server.GLASSFISH, conf, MavenWebProjectValidation.class, MavenWebProjectValidation.TESTS);
Expand Down
Loading