Skip to content

Commit 997708f

Browse files
authored
Namespaces are ignored when unmarshalling web.xml (#410)
1 parent 7bd2590 commit 997708f

File tree

5 files changed

+91
-378
lines changed

5 files changed

+91
-378
lines changed

components/sbm-support-jee/src/generated/web/java/META-INF/JAXB/episode_web_1.xjb

Lines changed: 0 additions & 363 deletions
This file was deleted.

components/sbm-support-jee/src/generated/web/java/org/springframework/sbm/project/web/api/package-info.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
@javax.xml.bind.annotation.XmlSchema(namespace = "http://xmlns.jcp.org/xml/ns/javaee", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
16+
@javax.xml.bind.annotation.XmlSchema(namespace = "http://xmlns.jcp.org/xml/ns/javaee", elementFormDefault = XmlNsForm.UNSET)
1717
package org.springframework.sbm.project.web.api;
18+
19+
import javax.xml.bind.annotation.XmlNsForm;

components/sbm-support-jee/src/main/java/org/springframework/sbm/jee/web/api/ServletDefinition.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,9 @@ public class ServletDefinition {
2828
private String fullyQualifiedServletClassName;
2929
private String servletName;
3030
private List<String> urlPattern;
31+
private String jspFile;
32+
33+
public String getJspFile() {
34+
return jspFile;
35+
}
3136
}

0 commit comments

Comments
 (0)