Author: dain
Date: Wed Aug 27 16:46:59 2008
New Revision: 689672
URL: http://svn.apache.org/viewvc?rev=689672&view=rev
Log:
Disable SXC usage
Modified:
openejb/trunk/openejb3/container/openejb-core/pom.xml
openejb/trunk/openejb3/container/openejb-jee/pom.xml
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JAXBContextFactory.java
Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?rev=689672&r1=689671&r2=689672&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Wed Aug 27 16:46:59
2008
@@ -62,23 +62,25 @@
</testResource>
</testResources>
<plugins>
+<!--
<plugin>
- <groupId>com.envoisolutions.sxc</groupId>
- <artifactId>sxc-jaxb-maven-plugin</artifactId>
- <version>0.7-SNAPSHOT</version>
- <executions>
- <execution>
- <configuration>
- <classes>
- <class>org.apache.openejb.config.sys</class>
- </classes>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <groupId>com.envoisolutions.sxc</groupId>
+ <artifactId>sxc-jaxb-maven-plugin</artifactId>
+ <version>0.7-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <configuration>
+ <classes>
+ <class>org.apache.openejb.config.sys</class>
+ </classes>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Modified: openejb/trunk/openejb3/container/openejb-jee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/pom.xml?rev=689672&r1=689671&r2=689672&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-jee/pom.xml Wed Aug 27 16:46:59
2008
@@ -31,14 +31,7 @@
<name>OpenEJB :: Container :: Java EE</name>
<build>
<plugins>
- <!--<plugin>-->
- <!--<artifactId>maven-surefire-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<excludes>-->
- <!--<exclude>org/openejb/jee2/EjbJarTest.*</exclude>-->
- <!--</excludes>-->
- <!--</configuration>-->
- <!--</plugin>-->
+<!--
<plugin>
<groupId>com.envoisolutions.sxc</groupId>
<artifactId>sxc-jaxb-maven-plugin</artifactId>
@@ -63,6 +56,7 @@
</execution>
</executions>
</plugin>
+-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
@@ -75,6 +69,7 @@
</plugins>
</build>
<dependencies>
+<!--
<dependency>
<groupId>com.envoisolutions.sxc</groupId>
<artifactId>sxc-jaxb</artifactId>
@@ -86,6 +81,7 @@
</exclusion>
</exclusions>
</dependency>
+-->
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JAXBContextFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JAXBContextFactory.java?rev=689672&r1=689671&r2=689672&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JAXBContextFactory.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JAXBContextFactory.java
Wed Aug 27 16:46:59 2008
@@ -18,98 +18,97 @@
package org.apache.openejb.jee;
import java.util.Map;
-import java.util.TreeMap;
-import java.util.Collections;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
public final class JAXBContextFactory {
- private static boolean useSXC = false;
+// private static boolean useSXC = false;
public static JAXBContext newInstance(String s) throws JAXBException {
- if (useSXC) {
- try {
- Sxc.newInstance(s);
- } catch (NoClassDefFoundError e) {
- }
- }
+// if (useSXC) {
+// try {
+// Sxc.newInstance(s);
+// } catch (NoClassDefFoundError e) {
+// }
+// }
return JAXBContext.newInstance(s);
}
public static JAXBContext newInstance(String s, ClassLoader classLoader)
throws JAXBException {
- if (useSXC) {
- try {
- return Sxc.newInstance(s, classLoader);
- } catch (NoClassDefFoundError e) {
- }
- }
+// if (useSXC) {
+// try {
+// return Sxc.newInstance(s, classLoader);
+// } catch (NoClassDefFoundError e) {
+// }
+// }
return JAXBContext.newInstance(s, classLoader);
}
public static JAXBContext newInstance(String s, ClassLoader classLoader,
Map<String, ?> properties) throws JAXBException {
- if (useSXC) {
- try {
- return Sxc.newInstance(s, classLoader, properties);
- } catch (NoClassDefFoundError e) {
- }
- }
+// if (useSXC) {
+// try {
+// return Sxc.newInstance(s, classLoader, properties);
+// } catch (NoClassDefFoundError e) {
+// }
+// }
return JAXBContext.newInstance(s, classLoader, properties);
}
public static JAXBContext newInstance(Class... classes) throws
JAXBException {
- if (useSXC) {
- try {
- return Sxc.newInstance(classes);
- } catch (NoClassDefFoundError e) {
- }
- }
+// if (useSXC) {
+// try {
+// return Sxc.newInstance(classes);
+// } catch (NoClassDefFoundError e) {
+// }
+// }
+
return JAXBContext.newInstance(classes);
}
public static JAXBContext newInstance(Class[] classes, Map<String, ?>
properties) throws JAXBException {
- if (useSXC) {
- try {
- return Sxc.newInstance(classes, properties);
- } catch (NoClassDefFoundError e) {
- }
- }
+// if (useSXC) {
+// try {
+// return Sxc.newInstance(classes, properties);
+// } catch (NoClassDefFoundError e) {
+// }
+// }
return JAXBContext.newInstance(classes, properties);
}
- public static class Sxc {
- public static JAXBContext newInstance(String s) throws JAXBException {
- ClassLoader classLoader =
Thread.currentThread().getContextClassLoader();
- if (classLoader == null) classLoader =
JAXBContextFactory.class.getClassLoader();
- return com.envoisolutions.sxc.jaxb.JAXBContextImpl.newInstance(s,
classLoader, Collections.singletonMap("com.envoisolutions.sxc.generate",
"false"));
- }
-
- public static JAXBContext newInstance(String s, ClassLoader
classLoader) throws JAXBException {
- return com.envoisolutions.sxc.jaxb.JAXBContextImpl.newInstance(s,
classLoader, Collections.singletonMap("com.envoisolutions.sxc.generate",
"false"));
- }
-
- public static JAXBContext newInstance(String s, ClassLoader
classLoader, Map<String, ?> properties) throws JAXBException {
- if (properties == null) properties = new TreeMap<String, Object>();
- // hack because intellij is being stupid
- ((Map<String, Object>)
properties).put("com.envoisolutions.sxc.generate", "false");
- return com.envoisolutions.sxc.jaxb.JAXBContextImpl.newInstance(s,
classLoader, properties);
- }
-
- public static JAXBContext newInstance(Class... classes) throws
JAXBException {
- JAXBContext jaxbContext = null;
- jaxbContext =
com.envoisolutions.sxc.jaxb.JAXBContextImpl.newInstance(classes,
Collections.singletonMap("com.envoisolutions.sxc.generate", "false"));
- return jaxbContext;
- }
-
- public static JAXBContext newInstance(Class[] classes, Map<String, ?>
properties) throws JAXBException {
- if (properties == null) properties = new TreeMap<String, Object>();
- // hack because intellij is being stupid
- ((Map<String, Object>)
properties).put("com.envoisolutions.sxc.generate", "false");
- return
com.envoisolutions.sxc.jaxb.JAXBContextImpl.newInstance(classes, properties);
- }
- }
+// public static class Sxc {
+// public static JAXBContext newInstance(String s) throws JAXBException
{
+// ClassLoader classLoader =
Thread.currentThread().getContextClassLoader();
+// if (classLoader == null) classLoader =
JAXBContextFactory.class.getClassLoader();
+// return
com.envoisolutions.sxc.jaxb.JAXBContextImpl.newInstance(s, classLoader,
Collections.singletonMap("com.envoisolutions.sxc.generate", "false"));
+// }
+//
+// public static JAXBContext newInstance(String s, ClassLoader
classLoader) throws JAXBException {
+// return
com.envoisolutions.sxc.jaxb.JAXBContextImpl.newInstance(s, classLoader,
Collections.singletonMap("com.envoisolutions.sxc.generate", "false"));
+// }
+//
+// public static JAXBContext newInstance(String s, ClassLoader
classLoader, Map<String, ?> properties) throws JAXBException {
+// if (properties == null) properties = new TreeMap<String,
Object>();
+// // hack because intellij is being stupid
+// ((Map<String, Object>)
properties).put("com.envoisolutions.sxc.generate", "false");
+// return
com.envoisolutions.sxc.jaxb.JAXBContextImpl.newInstance(s, classLoader,
properties);
+// }
+//
+// public static JAXBContext newInstance(Class... classes) throws
JAXBException {
+// JAXBContext jaxbContext = null;
+// jaxbContext =
com.envoisolutions.sxc.jaxb.JAXBContextImpl.newInstance(classes,
Collections.singletonMap("com.envoisolutions.sxc.generate", "false"));
+// return jaxbContext;
+// }
+//
+// public static JAXBContext newInstance(Class[] classes, Map<String,
?> properties) throws JAXBException {
+// if (properties == null) properties = new TreeMap<String,
Object>();
+// // hack because intellij is being stupid
+// ((Map<String, Object>)
properties).put("com.envoisolutions.sxc.generate", "false");
+// return
com.envoisolutions.sxc.jaxb.JAXBContextImpl.newInstance(classes, properties);
+// }
+// }
}
