Author: rmannibucau
Date: Sun Jan 20 11:45:35 2013
New Revision: 1435827
URL: http://svn.apache.org/viewvc?rev=1435827&view=rev
Log:
OPENEJB-1991 resources.xml from arquillian embedded adapter + forcing
undeployment of rest endpoints
Modified:
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
Modified:
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java?rev=1435827&r1=1435826&r2=1435827&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
Sun Jan 20 11:45:35 2013
@@ -82,6 +82,7 @@ public class OpenEJBArchiveProcessor {
private static final String BEANS_XML = "beans.xml";
private static final String VALIDATION_XML = "validation.xml";
+ private static final String RESOURCES_XML = "resources.xml";
private static final String PERSISTENCE_XML = "persistence.xml";
private static final String OPENEJB_JAR_XML = "openejb-jar.xml";
private static final String ENV_ENTRIES_PROPERTIES =
"env-entries.properties";
@@ -243,6 +244,13 @@ public class OpenEJBArchiveProcessor {
}
{
+ final Node resourcesXml =
archive.get(prefix.concat(RESOURCES_XML));
+ if (resourcesXml != null) {
+ ejbModule.getAltDDs().put(RESOURCES_XML, new
AssetSource(resourcesXml.getAsset()));
+ }
+ }
+
+ {
final Node envEntriesProperties =
archive.get(prefix.concat(ENV_ENTRIES_PROPERTIES));
if (envEntriesProperties != null) {
InputStream is = null;
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1435827&r1=1435826&r2=1435827&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
Sun Jan 20 11:45:35 2013
@@ -20,7 +20,19 @@ import org.apache.openejb.OpenEJBExcepti
import org.apache.openejb.config.sys.JaxbOpenejb;
import org.apache.openejb.config.sys.Resources;
import org.apache.openejb.core.webservices.WsdlResolver;
-import org.apache.openejb.jee.*;
+import org.apache.openejb.jee.ApplicationClient;
+import org.apache.openejb.jee.Beans;
+import org.apache.openejb.jee.Connector;
+import org.apache.openejb.jee.Connector10;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.FacesConfig;
+import org.apache.openejb.jee.HandlerChains;
+import org.apache.openejb.jee.JavaWsdlMapping;
+import org.apache.openejb.jee.JaxbJavaee;
+import org.apache.openejb.jee.Listener;
+import org.apache.openejb.jee.TldTaglib;
+import org.apache.openejb.jee.WebApp;
+import org.apache.openejb.jee.Webservices;
import org.apache.openejb.jee.bval.ValidationConfigType;
import org.apache.openejb.jee.jpa.EntityMappings;
import org.apache.openejb.jee.jpa.fragment.PersistenceFragment;
@@ -41,7 +53,11 @@ import org.apache.openejb.sxc.HandlerCha
import org.apache.openejb.sxc.TldTaglibXml;
import org.apache.openejb.sxc.WebXml;
import org.apache.openejb.sxc.WebservicesXml;
-import org.apache.openejb.util.*;
+import org.apache.openejb.util.LengthInputStream;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.Saxs;
+import org.apache.openejb.util.URLs;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -243,18 +259,17 @@ public class ReadDescriptors implements
final URL url = module.getClassLoader().getResource("META-INF/" +
name);
if (url != null) {
module.getAltDDs().put(name, url);
+ return new UrlSource(url);
}
-
- return new UrlSource(url);
}
return null;
}
public static void readResourcesXml(final Module module) {
- final URL url = getUrl(module, "resources.xml");
+ final Source url = getSource(module.getAltDDs().get("resources.xml"));
if (url != null) {
try {
- final Resources openejb =
JaxbOpenejb.unmarshal(Resources.class, IO.read(url));
+ final Resources openejb =
JaxbOpenejb.unmarshal(Resources.class, url.get());
module.initResources(openejb);
} catch (Exception e) {
logger.warning("can't read " + url.toString() + " to load
resources for module " + module.toString(), e);
Modified:
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java?rev=1435827&r1=1435826&r2=1435827&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
(original)
+++
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
Sun Jan 20 11:45:35 2013
@@ -273,7 +273,14 @@ public class CxfRsHttpListener implement
}
public void undeploy() {
- server.stop();
+ try {
+ server.stop();
+ } catch (IllegalStateException ise) {
+ LOGGER.warning("Can't stop correctly the endpoint " + server);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(ise.getMessage(), ise);
+ }
+ }
}
@Override
