Author: dblevins
Date: Sat Mar 2 04:43:00 2013
New Revision: 1451833
URL: http://svn.apache.org/r1451833
Log:
yank sxc changes
Removed:
tomee/tomee/branches/tomee-1.5.x/container/openejb-jee-accessors/
Modified:
tomee/tomee/branches/tomee-1.5.x/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
tomee/tomee/branches/tomee-1.5.x/container/pom.xml
Modified:
tomee/tomee/branches/tomee-1.5.x/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.x/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1451833&r1=1451832&r2=1451833&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.5.x/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
(original)
+++
tomee/tomee/branches/tomee-1.5.x/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
Sat Mar 2 04:43:00 2013
@@ -34,13 +34,6 @@ import org.apache.openejb.jee.oejb2.Open
import org.apache.openejb.jee.oejb3.JaxbOpenejbJar3;
import org.apache.openejb.jee.oejb3.OpenejbJar;
import org.apache.openejb.loader.IO;
-import org.apache.openejb.sxc.ApplicationClientXml;
-import org.apache.openejb.sxc.EjbJarXml;
-import org.apache.openejb.sxc.FacesConfigXml;
-import org.apache.openejb.sxc.HandlerChainsXml;
-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.xml.sax.Attributes;
import org.xml.sax.InputSource;
@@ -516,7 +509,7 @@ public class ReadDescriptors implements
public static ApplicationClient readApplicationClient(final URL url)
throws OpenEJBException {
final ApplicationClient applicationClient;
try {
- applicationClient = ApplicationClientXml.unmarshal(url);
+ applicationClient = (ApplicationClient)
JaxbJavaee.unmarshalJavaee(ApplicationClient.class, IO.read(url));
} catch (SAXException e) {
throw new OpenEJBException("Cannot parse the
application-client.xml file: " + url.toExternalForm(), e);
} catch (JAXBException e) {
@@ -536,13 +529,15 @@ public class ReadDescriptors implements
final String id = getId(new
ByteArrayInputStream(content.getBytes()));
return new EjbJar(id);
}
- return EjbJarXml.unmarshal(new
ByteArrayInputStream(content.getBytes()));
+ return (EjbJar) JaxbJavaee.unmarshalJavaee(EjbJar.class, new
ByteArrayInputStream(content.getBytes()));
} catch (SAXException e) {
throw new OpenEJBException("Cannot parse the ejb-jar.xml"); //
file: " + url.toExternalForm(), e);
+ } catch (JAXBException e) {
+ throw new OpenEJBException("Cannot unmarshall the ejb-jar.xml");
// file: " + url.toExternalForm(), e);
} catch (IOException e) {
throw new OpenEJBException("Cannot read the ejb-jar.xml"); //
file: " + url.toExternalForm(), e);
} catch (Exception e) {
- throw new OpenEJBException("Encountered error parsing the
ejb-jar.xml"); // file: " + url.toExternalForm(), e);
+ throw new OpenEJBException("Encountered unknown error parsing the
ejb-jar.xml"); // file: " + url.toExternalForm(), e);
}
}
@@ -617,8 +612,9 @@ public class ReadDescriptors implements
}
public static Webservices readWebservices(final URL url) throws
OpenEJBException {
+ final Webservices webservices;
try {
- return WebservicesXml.unmarshal(url);
+ webservices = (Webservices)
JaxbJavaee.unmarshalJavaee(Webservices.class, IO.read(url));
} catch (SAXException e) {
throw new OpenEJBException("Cannot parse the webservices.xml file:
" + url.toExternalForm(), e);
} catch (JAXBException e) {
@@ -628,11 +624,13 @@ public class ReadDescriptors implements
} catch (Exception e) {
throw new OpenEJBException("Encountered unknown error parsing the
webservices.xml file: " + url.toExternalForm(), e);
}
+ return webservices;
}
public static HandlerChains readHandlerChains(final URL url) throws
OpenEJBException {
+ final HandlerChains handlerChains;
try {
- return HandlerChainsXml.unmarshal(url);
+ handlerChains = (HandlerChains)
JaxbJavaee.unmarshalHandlerChains(HandlerChains.class, IO.read(url));
} catch (SAXException e) {
throw new OpenEJBException("Cannot parse the webservices.xml file:
" + url.toExternalForm(), e);
} catch (JAXBException e) {
@@ -642,6 +640,7 @@ public class ReadDescriptors implements
} catch (Exception e) {
throw new OpenEJBException("Encountered unknown error parsing the
webservices.xml file: " + url.toExternalForm(), e);
}
+ return handlerChains;
}
public static JavaWsdlMapping readJaxrpcMapping(final URL url) throws
OpenEJBException {
@@ -707,7 +706,7 @@ public class ReadDescriptors implements
public static WebApp readWebApp(final URL url) throws OpenEJBException {
final WebApp webApp;
try {
- webApp = (WebApp) WebXml.unmarshal(url);
+ webApp = (WebApp) JaxbJavaee.unmarshalJavaee(WebApp.class,
IO.read(url));
} catch (SAXException e) {
throw new OpenEJBException("Cannot parse the web.xml file: " +
url.toExternalForm(), e);
} catch (JAXBException e) {
@@ -731,8 +730,9 @@ public class ReadDescriptors implements
return taglib;
}
+ final TldTaglib tldTaglib;
try {
- return TldTaglibXml.unmarshal(url);
+ tldTaglib = (TldTaglib)
JaxbJavaee.unmarshalTaglib(TldTaglib.class, IO.read(url));
} catch (SAXException e) {
throw new OpenEJBException("Cannot parse the JSP tag library
definition file: " + url.toExternalForm(), e);
} catch (JAXBException e) {
@@ -742,6 +742,7 @@ public class ReadDescriptors implements
} catch (Exception e) {
throw new OpenEJBException("Encountered unknown error parsing the
JSP tag library definition file: " + url.toExternalForm(), e);
}
+ return tldTaglib;
}
public static FacesConfig readFacesConfig(final URL url) throws
OpenEJBException {
@@ -755,7 +756,7 @@ public class ReadDescriptors implements
if (isEmpty(new ByteArrayInputStream(content.getBytes()),
"faces-config")) {
return new FacesConfig();
}
- return FacesConfigXml.unmarshal(new
ByteArrayInputStream(content.getBytes()));
+ return (FacesConfig) JaxbJavaee.unmarshalJavaee(FacesConfig.class,
new ByteArrayInputStream(content.getBytes()));
} catch (SAXException e) {
throw new OpenEJBException("Cannot parse the faces configuration
file: " + url.toExternalForm(), e);
} catch (JAXBException e) {
Modified: tomee/tomee/branches/tomee-1.5.x/container/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.x/container/pom.xml?rev=1451833&r1=1451832&r2=1451833&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.5.x/container/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.5.x/container/pom.xml Sat Mar 2 04:43:00 2013
@@ -32,7 +32,6 @@
<module>openejb-loader</module>
<module>openejb-javaagent</module>
<module>openejb-jee</module>
- <module>openejb-jee-accessors</module>
<module>openejb-junit</module>
<module>openejb-jpa-integration</module>
</modules>
