Author: djencks
Date: Mon Jun 27 21:28:04 2011
New Revision: 1140328
URL: http://svn.apache.org/viewvc?rev=1140328&view=rev
Log:
OPENEJB-1620 don't collapse servlet and filter mapping url-patterns
Added:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TrimStringAdapter.java
(with props)
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FilterMapping.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServletMapping.java
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FilterMapping.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FilterMapping.java?rev=1140328&r1=1140327&r2=1140328&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FilterMapping.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FilterMapping.java
Mon Jun 27 21:28:04 2011
@@ -67,6 +67,7 @@ public class FilterMapping {
@XmlElement(name = "filter-name", required = true)
protected String filterName;
@XmlElement(name = "url-pattern")
+ @XmlJavaTypeAdapter(TrimStringAdapter.class)
protected List<String> urlPattern;
@XmlElement(name = "servlet-name")
protected List<String> servletName;
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServletMapping.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServletMapping.java?rev=1140328&r1=1140327&r2=1140328&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServletMapping.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServletMapping.java
Mon Jun 27 21:28:04 2011
@@ -62,6 +62,7 @@ public class ServletMapping {
@XmlElement(name = "servlet-name", required = true)
protected String servletName;
@XmlElement(name = "url-pattern", required = true)
+ @XmlJavaTypeAdapter(TrimStringAdapter.class)
protected List<String> urlPattern;
@XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
Added:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TrimStringAdapter.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TrimStringAdapter.java?rev=1140328&view=auto
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TrimStringAdapter.java
(added)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TrimStringAdapter.java
Mon Jun 27 21:28:04 2011
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.openejb.jee;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class TrimStringAdapter extends XmlAdapter<String, String> {
+ @Override
+ public String unmarshal(String s) throws Exception {
+ return s == null? null: s.trim();
+ }
+
+ @Override
+ public String marshal(String s) throws Exception {
+ return s;
+ }
+}
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TrimStringAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TrimStringAdapter.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TrimStringAdapter.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
