You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/01/31 17:53:09 UTC
svn commit: r1238694 - in /openejb/trunk/openejb:
container/openejb-core/src/main/java/org/apache/openejb/config/sys/
tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/
tomee/tomee-common/src/main/java/org/apache/tomee/installer/
Author: rmannibucau
Date: Tue Jan 31 16:53:08 2012
New Revision: 1238694
URL: http://svn.apache.org/viewvc?rev=1238694&view=rev
Log:
TOMEE-131 using tomee as root tag in tomee.xml
Added:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Tomee.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java?rev=1238694&r1=1238693&r2=1238694&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java Tue Jan 31 16:53:08 2012
@@ -19,6 +19,7 @@ package org.apache.openejb.config.sys;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.jee.JAXBContextFactory;
import org.apache.openejb.config.ConfigUtils;
+import org.apache.openejb.loader.SystemInstance;
import org.apache.xbean.finder.ResourceFinder;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
@@ -83,6 +84,8 @@ public abstract class JaxbOpenejb {
return (T) createServicesJar();
} else if (type == TransactionManager.class) {
return (T) createTransactionManager();
+ } else if (type == Tomee.class) {
+ return (T) createTomee();
}
throw new IllegalArgumentException("Unknown type " + type.getName());
}
@@ -102,6 +105,8 @@ public abstract class JaxbOpenejb {
return (T) createJndiProvider();
} else if (type.equals("Openejb")) {
return (T) createOpenejb();
+ } else if (type.equals("Tomee")) {
+ return (T) createTomee();
} else if (type.equals("ProxyFactory")) {
return (T) createProxyFactory();
} else if (type.equals("Resource")) {
@@ -217,7 +222,7 @@ public abstract class JaxbOpenejb {
} else {
in = new FileInputStream(configFile);
}
- Openejb openejb = unmarshal(Openejb.class, in);
+ Openejb openejb = (Openejb) unmarshal(SystemInstance.get().getOptions().get("openejb.configuration.class", Openejb.class), in);
return openejb;
} catch (MalformedURLException e) {
throw new OpenEJBException("Unable to resolve location " + configFile, e);
@@ -385,6 +390,10 @@ public abstract class JaxbOpenejb {
return new Openejb();
}
+ private static Tomee createTomee() {
+ return new Tomee();
+ }
+
public static ProxyFactory createProxyFactory() {
return new ProxyFactory();
}
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java?rev=1238694&r1=1238693&r2=1238694&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java Tue Jan 31 16:53:08 2012
@@ -105,6 +105,10 @@ public class ObjectFactory {
return new Openejb();
}
+ public Tomee createTomee() {
+ return new Tomee();
+ }
+
/**
* Create an instance of {@link org.apache.openejb.config.sys.TransactionManager }
*/
Added: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Tomee.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Tomee.java?rev=1238694&view=auto
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Tomee.java (added)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Tomee.java Tue Jan 31 16:53:08 2012
@@ -0,0 +1,30 @@
+/*
+ * 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.config.sys;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "tomee")
+public class Tomee extends Openejb {
+}
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1238694&r1=1238693&r2=1238694&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java Tue Jan 31 16:53:08 2012
@@ -30,6 +30,7 @@ import org.apache.catalina.startup.Catal
import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.WebAppBuilder;
import org.apache.openejb.config.NewLoaderLogic;
+import org.apache.openejb.config.sys.Tomee;
import org.apache.openejb.core.ServerFederation;
import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.loader.Loader;
@@ -163,6 +164,7 @@ public class TomcatLoader implements Loa
final File tomeeXml = new File(conf, "tomee.xml");
if (tomeeXml.exists()) { // use tomee.xml instead of openejb.xml
SystemInstance.get().setProperty("openejb.configuration", tomeeXml.getAbsolutePath());
+ SystemInstance.get().setProperty("openejb.configuration.class", Tomee.class.getName());
}
//Look for custom system properties
Modified: openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1238694&r1=1238693&r2=1238694&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java (original)
+++ openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java Tue Jan 31 16:53:08 2012
@@ -408,7 +408,7 @@ public class Installer {
// read in the openejb.xml file from the openejb core jar
String openEjbXml = Installers.readEntry(coreJar, "default.openejb.conf", alerts);
if (openEjbXml != null) {
- if (Installers.writeAll(openEjbXmlFile, openEjbXml, alerts)) {
+ if (Installers.writeAll(openEjbXmlFile, openEjbXml.replace("<openejb>", "<tomee>").replace("</openejb>", "</tomee>"), alerts)) {
alerts.addInfo("Copy tomee.xml to conf");
}
}