Author: djencks
Date: Thu Jun 24 18:00:10 2010
New Revision: 957654
URL: http://svn.apache.org/viewvc?rev=957654&view=rev
Log:
OPENEJB-1298 a bunch of small bug fixes revealed by use in geronimo
Added:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/LoadOnStartupAdapter.java
(with props)
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/CookieConfig.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/DataSource.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Filter.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChain.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Listener.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ParamValue.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Servlet.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TextMap.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/UserDataConstraint.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebFragment.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=957654&r1=957653&r2=957654&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Thu Jun 24 18:00:10 2010
@@ -218,8 +218,8 @@ public class ConfigurationFactory implem
for (HandlerChain handlerChain : chains.getHandlerChain()) {
HandlerChainInfo handlerChainInfo = new HandlerChainInfo();
- handlerChainInfo.serviceNamePattern =
handlerChain.getServiceNamePattern();
- handlerChainInfo.portNamePattern =
handlerChain.getPortNamePattern();
+ handlerChainInfo.serviceNamePattern =
handlerChain.getServiceNamePattern().toString();
+ handlerChainInfo.portNamePattern =
handlerChain.getPortNamePattern().toString();
handlerChainInfo.protocolBindings.addAll(handlerChain.getProtocolBindings());
for (Handler handler : handlerChain.getHandler()) {
HandlerInfo handlerInfo = new HandlerInfo();
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java?rev=957654&r1=957653&r2=957654&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java
Thu Jun 24 18:00:10 2010
@@ -73,6 +73,7 @@ import java.util.Map;
@XmlRootElement(name = "application-client")
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "application-clientType", propOrder = {
+ "moduleName",
"descriptions",
"displayNames",
"icon",
@@ -94,6 +95,8 @@ import java.util.Map;
})
public class ApplicationClient implements JndiConsumer {
+ @XmlElement(name = "module-name", required = true)
+ protected String moduleName;
@XmlTransient
protected TextMap description = new TextMap();
@XmlTransient
@@ -155,6 +158,14 @@ public class ApplicationClient implement
return mainClass.replaceAll(".*\\.","");
}
+ public String getModuleName() {
+ return moduleName;
+ }
+
+ public void setModuleName(String moduleName) {
+ this.moduleName = moduleName;
+ }
+
@XmlElement(name = "description", required = true)
public Text[] getDescriptions() {
return description.toArray();
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/CookieConfig.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/CookieConfig.java?rev=957654&r1=957653&r2=957654&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/CookieConfig.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/CookieConfig.java
Thu Jun 24 18:00:10 2010
@@ -72,10 +72,10 @@ public class CookieConfig {
protected String path;
protected String comment;
@XmlElement(name = "http-only")
- protected boolean httpOnly;
- protected boolean secure;
+ protected Boolean httpOnly;
+ protected Boolean secure;
@XmlElement(name = "max-age")
- protected int maxAge;
+ protected Integer maxAge;
@XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlID
@@ -114,27 +114,27 @@ public class CookieConfig {
this.comment = value;
}
- public boolean getHttpOnly() {
+ public Boolean getHttpOnly() {
return httpOnly;
}
- public void setHttpOnly(boolean value) {
+ public void setHttpOnly(Boolean value) {
this.httpOnly = value;
}
- public boolean getSecure() {
+ public Boolean getSecure() {
return secure;
}
- public void setSecure(boolean value) {
+ public void setSecure(Boolean value) {
this.secure = value;
}
- public int getMaxAge() {
+ public Integer getMaxAge() {
return maxAge;
}
- public void setMaxAge(int value) {
+ public void setMaxAge(Integer value) {
this.maxAge = value;
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/DataSource.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/DataSource.java?rev=957654&r1=957653&r2=957654&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/DataSource.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/DataSource.java
Thu Jun 24 18:00:10 2010
@@ -113,7 +113,7 @@ public class DataSource {
protected Integer loginTimeout;
protected Boolean transactional;
@XmlElement(name = "isolation-level")
- protected TransportGuarantee isolationLevel;
+ protected IsolationLevel isolationLevel;
@XmlElement(name = "initial-pool-size")
protected Integer initialPoolSize;
@XmlElement(name = "max-pool-size")
@@ -231,11 +231,11 @@ public class DataSource {
this.transactional = value;
}
- public TransportGuarantee getIsolationLevel() {
+ public IsolationLevel getIsolationLevel() {
return isolationLevel;
}
- public void setIsolationLevel(TransportGuarantee value) {
+ public void setIsolationLevel(IsolationLevel value) {
this.isolationLevel = value;
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java?rev=957654&r1=957653&r2=957654&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java
Thu Jun 24 18:00:10 2010
@@ -142,19 +142,6 @@ public class EjbRef implements EjbRefere
public void setType(String type) {
}
- /**
- * The ejb-ref-name element contains the name of an EJB
- * reference. The EJB reference is an entry in the
- * Deployment Component's environment and is relative to the
- * java:comp/env context. The name must be unique within the
- * Deployment Component.
- * <p/>
- * It is recommended that name is prefixed with "ejb/".
- * <p/>
- * Example:
- * <p/>
- * <ejb-ref-name>ejb/Payroll</ejb-ref-name>
- */
public void setEjbRefName(String value) {
this.ejbRefName = value;
}
@@ -187,26 +174,6 @@ public class EjbRef implements EjbRefere
this.remote = value;
}
- /**
- * The value of the ejb-link element must be the ejb-name of an
- * enterprise bean in the same ejb-jar file or in another ejb-jar
- * file in the same Java EE application unit.
- * <p/>
- * Alternatively, the name in the ejb-link element may be
- * composed of a path name specifying the ejb-jar containing the
- * referenced enterprise bean with the ejb-name of the target
- * bean appended and separated from the path name by "#". The
- * path name is relative to the Deployment File containing
- * Deployment Component that is referencing the enterprise
- * bean. This allows multiple enterprise beans with the same
- * ejb-name to be uniquely identified.
- * <p/>
- * Examples:
- * <p/>
- * <ejb-link>EmployeeRecord</ejb-link>
- * <p/>
- * <ejb-link>../products/product.jar#ProductEJB</ejb-link>
- */
public String getEjbLink() {
return ejbLink;
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Filter.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Filter.java?rev=957654&r1=957653&r2=957654&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Filter.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Filter.java
Thu Jun 24 18:00:10 2010
@@ -103,6 +103,10 @@ public class Filter {
return description.get();
}
+ public void addDescription(Text text) {
+ description.add(text);
+ }
+
@XmlElement(name = "display-name", required = true)
public Text[] getDisplayNames() {
return displayName.toArray();
@@ -116,6 +120,10 @@ public class Filter {
return displayName.get();
}
+ public void addDisplayName(Text text) {
+ displayName.add(text);
+ }
+
public Collection<Icon> getIcons() {
if (icon == null) {
icon = new LocalCollection<Icon>();
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChain.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChain.java?rev=957654&r1=957653&r2=957654&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChain.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChain.java
Thu Jun 24 18:00:10 2010
@@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlType
import javax.xml.bind.annotation.XmlList;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.List;
@@ -64,9 +65,9 @@ import java.util.List;
})
public class HandlerChain {
@XmlElement(name = "service-name-pattern")
- protected String serviceNamePattern;
+ protected QName serviceNamePattern;
@XmlElement(name = "port-name-pattern")
- protected String portNamePattern;
+ protected QName portNamePattern;
@XmlList
@XmlElement(name = "protocol-bindings")
protected List<String> protocolBindings;
@@ -77,19 +78,19 @@ public class HandlerChain {
@XmlID
protected String id;
- public String getServiceNamePattern() {
+ public QName getServiceNamePattern() {
return serviceNamePattern;
}
- public void setServiceNamePattern(String value) {
+ public void setServiceNamePattern(QName value) {
this.serviceNamePattern = value;
}
- public String getPortNamePattern() {
+ public QName getPortNamePattern() {
return portNamePattern;
}
- public void setPortNamePattern(String value) {
+ public void setPortNamePattern(QName value) {
this.portNamePattern = value;
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java?rev=957654&r1=957653&r2=957654&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
Thu Jun 24 18:00:10 2010
@@ -107,6 +107,37 @@ public class JaxbJavaee {
}
}
+ public static <T>Object unmarshalTaglib(Class<T> type, InputStream in)
throws ParserConfigurationException, SAXException, JAXBException {
+ InputSource inputSource = new InputSource(in);
+
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setNamespaceAware(true);
+ factory.setValidating(false);
+ SAXParser parser = factory.newSAXParser();
+
+ JAXBContext ctx = JaxbJavaee.getContext(type);
+ Unmarshaller unmarshaller = ctx.createUnmarshaller();
+ unmarshaller.setEventHandler(new ValidationEventHandler(){
+ public boolean handleEvent(ValidationEvent validationEvent) {
+ System.out.println(validationEvent);
+ return false;
+ }
+ });
+
+
+ JaxbJavaee.TaglibNamespaceFilter xmlFilter = new
JaxbJavaee.TaglibNamespaceFilter(parser.getXMLReader());
+ xmlFilter.setContentHandler(unmarshaller.getUnmarshallerHandler());
+
+ SAXSource source = new SAXSource(xmlFilter, inputSource);
+
+ currentPublicId.set(new TreeSet<String>());
+ try {
+ return unmarshaller.unmarshal(source);
+ } finally {
+ currentPublicId.set(null);
+ }
+ }
+
public static class NamespaceFilter extends XMLFilterImpl {
private static final InputSource EMPTY_INPUT_SOURCE = new
InputSource(new ByteArrayInputStream(new byte[0]));
@@ -126,4 +157,50 @@ public class JaxbJavaee {
super.startElement("http://java.sun.com/xml/ns/javaee";, localName,
qname, atts);
}
}
+
+ public static class TaglibNamespaceFilter extends XMLFilterImpl {
+ private static final InputSource EMPTY_INPUT_SOURCE = new
InputSource(new ByteArrayInputStream(new byte[0]));
+
+ public TaglibNamespaceFilter(XMLReader xmlReader) {
+ super(xmlReader);
+ }
+
+ public InputSource resolveEntity(String publicId, String systemId)
throws SAXException, IOException {
+ Set<String> publicIds = currentPublicId.get();
+ if (publicIds != null) {
+ publicIds.add(publicId);
+ }
+ return EMPTY_INPUT_SOURCE;
+ }
+
+ public void startElement(String uri, String localName, String qname,
Attributes atts) throws SAXException {
+ localName = fixLocalName(localName);
+ super.startElement("http://java.sun.com/xml/ns/javaee";, localName,
qname, atts);
+ }
+
+ private String fixLocalName(String localName) {
+ if (localName.equals("tlibversion")) {
+ localName = "tlib-version";
+ } else if (localName.equals("jspversion")) {
+ localName = "jsp-version";
+ } else if (localName.equals("shortname")) {
+ localName = "short-name";
+ } else if (localName.equals("tagclass")) {
+ localName = "tag-class";
+ } else if (localName.equals("teiclass")) {
+ localName = "tei-class";
+ } else if (localName.equals("bodycontent")) {
+ localName = "body-content";
+ } else if (localName.equals("jspversion")) {
+ localName = "jsp-version";
+ }
+ return localName;
+ }
+
+ @Override
+ public void endElement(String uri, String localName, String qName)
throws SAXException {
+ localName = fixLocalName(localName);
+ super.endElement("http://java.sun.com/xml/ns/javaee";, localName,
qName);
+ }
+ }
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Listener.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Listener.java?rev=957654&r1=957653&r2=957654&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Listener.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Listener.java
Thu Jun 24 18:00:10 2010
@@ -91,6 +91,10 @@ public class Listener {
return description.get();
}
+ public void addDescription(Text text) {
+ description.add(text);
+ }
+
@XmlElement(name = "display-name", required = true)
public Text[] getDisplayNames() {
return displayName.toArray();
@@ -104,6 +108,10 @@ public class Listener {
return displayName.get();
}
+ public void addDisplayName(Text text) {
+ displayName.add(text);
+ }
+
public Collection<Icon> getIcons() {
if (icon == null) {
icon = new LocalCollection<Icon>();
Added:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/LoadOnStartupAdapter.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/LoadOnStartupAdapter.java?rev=957654&view=auto
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/LoadOnStartupAdapter.java
(added)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/LoadOnStartupAdapter.java
Thu Jun 24 18:00:10 2010
@@ -0,0 +1,44 @@
+/*
+ * 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 LoadOnStartupAdapter extends XmlAdapter<String, Integer> {
+ @Override
+ public Integer unmarshal(String value) throws Exception {
+ if (value.equalsIgnoreCase("true")) {
+ return 1;
+ }
+ if (value.equalsIgnoreCase("false")) {
+ return null;
+ }
+ return Integer.valueOf(value);
+ }
+
+ @Override
+ public String marshal(Integer v) throws Exception {
+ return v.toString();
+ }
+}
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/LoadOnStartupAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/LoadOnStartupAdapter.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/LoadOnStartupAdapter.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ParamValue.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ParamValue.java?rev=957654&r1=957653&r2=957654&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ParamValue.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ParamValue.java
Thu Jun 24 18:00:10 2010
@@ -86,6 +86,10 @@ public class ParamValue {
return description.get();
}
+ public void addDescription(Text text) {
+ description.add(text);
+ }
+
public String getParamName() {
return paramName;
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Servlet.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Servlet.java?rev=957654&r1=957653&r2=957654&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Servlet.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Servlet.java
Thu Jun 24 18:00:10 2010
@@ -99,8 +99,9 @@ public class Servlet {
protected String jspFile;
@XmlElement(name = "init-param")
protected List<ParamValue> initParam;
+ @XmlJavaTypeAdapter(type = Integer.class, value =
LoadOnStartupAdapter.class)
@XmlElement(name = "load-on-startup")
- protected java.lang.String loadOnStartup;
+ protected Integer loadOnStartup;
protected Boolean enabled;
@XmlElement(name = "async-supported")
protected Boolean asyncSupported;
@@ -128,6 +129,10 @@ public class Servlet {
return description.get();
}
+ public void addDescription(Text text) {
+ description.add(text);
+ }
+
@XmlElement(name = "display-name", required = true)
public Text[] getDisplayNames() {
return displayName.toArray();
@@ -141,6 +146,10 @@ public class Servlet {
return displayName.get();
}
+ public void addDisplayName(Text text) {
+ displayName.add(text);
+ }
+
public Collection<Icon> getIcons() {
if (icon == null) {
icon = new LocalCollection<Icon>();
@@ -190,11 +199,11 @@ public class Servlet {
return this.initParam;
}
- public String getLoadOnStartup() {
+ public Integer getLoadOnStartup() {
return loadOnStartup;
}
- public void setLoadOnStartup(String value) {
+ public void setLoadOnStartup(Integer value) {
this.loadOnStartup = value;
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TextMap.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TextMap.java?rev=957654&r1=957653&r2=957654&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TextMap.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TextMap.java
Thu Jun 24 18:00:10 2010
@@ -45,6 +45,12 @@ public class TextMap {
}
}
+ public void add(Text text) {
+ if (!string.containsKey(text.getLang())) {
+ string.put(text.getLang(), text.getValue());
+ }
+ }
+
public String get() {
return getLocal(string);
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/UserDataConstraint.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/UserDataConstraint.java?rev=957654&r1=957653&r2=957654&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/UserDataConstraint.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/UserDataConstraint.java
Thu Jun 24 18:00:10 2010
@@ -63,7 +63,7 @@ public class UserDataConstraint {
@XmlTransient
protected TextMap description = new TextMap();
@XmlElement(name = "transport-guarantee", required = true)
- protected String transportGuarantee;
+ protected TransportGuarantee transportGuarantee;
@XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlID
@@ -82,11 +82,11 @@ public class UserDataConstraint {
return description.get();
}
- public String getTransportGuarantee() {
+ public TransportGuarantee getTransportGuarantee() {
return transportGuarantee;
}
- public void setTransportGuarantee(String value) {
+ public void setTransportGuarantee(TransportGuarantee value) {
this.transportGuarantee = value;
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebFragment.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebFragment.java?rev=957654&r1=957653&r2=957654&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebFragment.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebFragment.java
Thu Jun 24 18:00:10 2010
@@ -57,9 +57,9 @@ import java.util.Map;
*
*/
-...@xmlrootelement(name = "web-app")
+...@xmlrootelement(name = "web-fragment")
@XmlAccessorType(XmlAccessType.FIELD)
-...@xmltype(name = "web-appType", propOrder = {
+...@xmltype(name = "web-fragmentType", propOrder = {
"descriptions",
"displayNames",
"icon",
@@ -169,7 +169,7 @@ public class WebFragment implements WebC
@XmlElement(name = "message-destination", required = true)
protected List<MessageDestination> messageDestination;
- @XmlElement(name = "module-name")
+ @XmlElement(name = "name")
protected String name;
@XmlElement(name = "ordering")
protected Ordering ordering;
