You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by sa...@apache.org on 2016/09/24 10:23:26 UTC
[01/10] ode git commit: ODE-1060: Embedded Tomee initial commit
Repository: ode
Updated Branches:
refs/heads/ode-1.3.x 2ca67aaaf -> 44a1f7df4
http://git-wip-us.apache.org/repos/asf/ode/blob/cd6efc8e/tomee/src/main/java/org/apache/ode/tomee/TomeeLauncher.java
----------------------------------------------------------------------
diff --git a/tomee/src/main/java/org/apache/ode/tomee/TomeeLauncher.java b/tomee/src/main/java/org/apache/ode/tomee/TomeeLauncher.java
new file mode 100644
index 0000000..068423a
--- /dev/null
+++ b/tomee/src/main/java/org/apache/ode/tomee/TomeeLauncher.java
@@ -0,0 +1,141 @@
+/*
+ * 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.ode.tomee;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Properties;
+
+import org.apache.tomee.embedded.Configuration;
+import org.apache.tomee.embedded.Container;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TomeeLauncher {
+ private static final Logger log = LoggerFactory.getLogger(TomeeLauncher.class);
+
+ private Properties properties = new Properties();
+ private File odeTomeeHomeDir = null;
+ private File odeTomeeConfDir = null;
+
+ Container container = null;
+
+ public TomeeLauncher(String homeDir) {
+ this.odeTomeeHomeDir = new File(homeDir);
+ }
+
+ public void initialize() throws Exception {
+ log.info("Class {} loaded by {}",TomeeLauncher.class, TomeeLauncher.class.getClassLoader());
+
+ if(!odeTomeeHomeDir.exists()) {
+ throw new Exception("ODE home directory doesn't exist");
+ }
+
+ this.odeTomeeConfDir = new File(odeTomeeHomeDir,"conf");
+
+ if(!odeTomeeConfDir.exists()) {
+ throw new Exception("Tomee conf directory doesn't exist");
+ }
+
+ properties = loadConfigFile(new File(odeTomeeConfDir,Constants.ODE_TOMEE_CONFIG));
+
+ Configuration configuration = setupConfiguration(properties);
+ setupContiner(configuration);
+ }
+
+ protected Configuration setupConfiguration(Properties properties) {
+ Configuration configuration = new Configuration();
+
+ configuration.setDir(properties.getProperty(Constants.DIR, new File(odeTomeeHomeDir,"work").getAbsolutePath()));
+ configuration.setHost(properties.getProperty(Constants.HOST,"localhost"));
+ configuration.setHttp2(Boolean.valueOf(properties.getProperty(Constants.HTTP2,"false")));
+ configuration.setHttpPort(Integer.valueOf(properties.getProperty(Constants.HTTP_PORT,"8080")));
+ configuration.setHttpsPort(Integer.valueOf(properties.getProperty(Constants.HTTPS_PORT,"8443")));
+ configuration.setKeepServerXmlAsThis(Boolean.valueOf(properties.getProperty(Constants.KEEP_SERVER_XML_AS_THIS,"true")));
+ configuration.setKeyAlias(properties.getProperty(Constants.KEY_ALIAS));
+ configuration.setKeystoreFile(properties.getProperty(Constants.KEY_STORE_FILE));
+ configuration.setKeystorePass(properties.getProperty(Constants.KEY_STAORE_PASS));
+ configuration.setKeystoreType(properties.getProperty(Constants.KEY_STORE_TYPE,"JKS"));
+
+ Properties tomeeSystemProperties = loadConfigFile(new File(odeTomeeConfDir,Constants.TOMEE_SYSTEM_CONFIG));
+
+ tomeeSystemProperties.setProperty("openejb.conf.file", new File(odeTomeeConfDir,Constants.TOMEE_XML).getAbsolutePath());
+
+ configuration.setProperties(tomeeSystemProperties);
+ configuration.setQuickSession(Boolean.valueOf(properties.getProperty(Constants.QUICK_SESSION,"false")));
+ configuration.setServerXml(properties.getProperty(Constants.SERVER_XML,new File(odeTomeeConfDir,Constants.SERVER_XML).getAbsolutePath()));
+ configuration.setSkipHttp(Boolean.valueOf(properties.getProperty(Constants.SKIP_HTTP,"false")));
+ configuration.setSsl(Boolean.valueOf(properties.getProperty(Constants.SSL,"false")));
+ configuration.setSslProtocol(properties.getProperty(Constants.SSL_PROPTOCOL));
+ configuration.setStopPort(Integer.valueOf(properties.getProperty(Constants.STOP_PORT,"8005")));
+ configuration.setWebResourceCached(Boolean.valueOf(properties.getProperty(Constants.WEB_RESOURCE_CACHED,"false")));
+ configuration.setWebXml(properties.getProperty(Constants.WEB_XML,new File(odeTomeeConfDir,Constants.WEB_XML).getAbsolutePath()));
+
+ return configuration;
+ }
+
+ protected Container setupContiner(Configuration configuration) {
+ this.container = new Container();
+ container.setup(configuration);
+ return container;
+ }
+
+ public void start() throws Exception {
+ if(container != null) {
+ container.start();
+ }
+ }
+
+ public void stop() throws Exception {
+ if(container != null)
+ container.stop();
+ }
+
+ public void deploy(File application, String context) throws Exception {
+ container.deploy(context, application, true);
+ container.await();
+ }
+
+ private Properties loadConfigFile(File configFile) {
+ FileInputStream io = null;
+ Properties properties = new Properties();
+
+ if(configFile != null && configFile.exists()) {
+ try {
+ io = new FileInputStream(configFile);
+ properties.load(io);
+ } catch (FileNotFoundException e) {
+ log.warn("Configuration file not found {}", configFile);
+ } catch (IOException e) {
+ log.warn("Error reading configuration file {}", configFile);
+ } finally {
+ if(io != null) {
+ try {
+ io.close();
+ } catch (IOException e) {
+ }
+ }
+ }
+ }
+ return properties;
+ }
+}
[10/10] ode git commit: ODE-1060: put javadoc for snapshots
Posted by sa...@apache.org.
ODE-1060: put javadoc for snapshots
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/44a1f7df
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/44a1f7df
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/44a1f7df
Branch: refs/heads/ode-1.3.x
Commit: 44a1f7df4653ed0586fc77e85038ba8d9c0dbc31
Parents: 3406020
Author: sathwik <sa...@apache.org>
Authored: Sat Sep 24 13:19:57 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Sat Sep 24 13:19:57 2016 +0530
----------------------------------------------------------------------
ci-build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/44a1f7df/ci-build.sh
----------------------------------------------------------------------
diff --git a/ci-build.sh b/ci-build.sh
index e76f3c0..09c8e05 100755
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -38,7 +38,7 @@ FINAL_COMMAND="$CREATE_USER_COMMAND && $BUNDLER_COMMAND && $BUILDR_COMMAND"
## For release set these arguments with proper values
-## export JAVADOC=ON
+export JAVADOC=off
## export BUILDR_ENV=production
## export NEXT_VERSION=
## export GNUPGHOME="$HOME/.gnupg"
[04/10] ode git commit: ODE-1060: Removed conflicting velocity jar
from ODE war
Posted by sa...@apache.org.
ODE-1060: Removed conflicting velocity jar from ODE war
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/8e40c679
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/8e40c679
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/8e40c679
Branch: refs/heads/ode-1.3.x
Commit: 8e40c679d7d666837cbe99df1f7410fc68093616
Parents: bc2c1c6
Author: sathwik <sa...@apache.org>
Authored: Thu Aug 11 16:02:12 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Thu Aug 11 16:02:12 2016 +0530
----------------------------------------------------------------------
Rakefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/8e40c679/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index d8bcd21..5339577 100644
--- a/Rakefile
+++ b/Rakefile
@@ -707,7 +707,8 @@ define "ode" do
tomee_libs = projects("tomee"), TOMEE, DERBY, DERBY_TOOLS, SLF4J, LOG4J2
#liraries to be rmomved from ODE war
- rm_libs = GERONIMO, JAVAX.transaction, JAVAX.connector, JAVAX.ejb, JAVAX.javamail, JAVAX.jms, JAVAX.persistence, JAVAX.resource, DERBY, DERBY_TOOLS, SLF4J, LOG4J2, OPENJPA, TRANQL
+ rm_libs = GERONIMO, JAVAX.transaction, JAVAX.connector, JAVAX.ejb, JAVAX.javamail, JAVAX.jms, JAVAX.persistence, JAVAX.resource, DERBY, DERBY_TOOLS, SLF4J, LOG4J2, OPENJPA, TRANQL,
+ artifacts(AXIS2_MODULES.libs).keep_if {|a| a.group == 'velocity' && a.id == 'velocity'}
# extract ode war
exploded_ode = unzip(_(:target, 'ode') => project("ode:axis2-war").package(:war)).target
[07/10] ode git commit: ODE-1060: added logging categories for tomee
container
Posted by sa...@apache.org.
ODE-1060: added logging categories for tomee container
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/3d31943f
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/3d31943f
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/3d31943f
Branch: refs/heads/ode-1.3.x
Commit: 3d31943f636e6343f8bd6584f059ba11e4e62757
Parents: 30d959c
Author: sathwik <sa...@apache.org>
Authored: Wed Aug 17 09:20:15 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Wed Aug 17 09:20:15 2016 +0530
----------------------------------------------------------------------
tomee-server/src/main/server/conf/log4j2.xml | 53 ++++++++++++++++----
.../src/main/server/conf/system.properties | 3 +-
2 files changed, 46 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/3d31943f/tomee-server/src/main/server/conf/log4j2.xml
----------------------------------------------------------------------
diff --git a/tomee-server/src/main/server/conf/log4j2.xml b/tomee-server/src/main/server/conf/log4j2.xml
index 788eba4..1c0a11f 100644
--- a/tomee-server/src/main/server/conf/log4j2.xml
+++ b/tomee-server/src/main/server/conf/log4j2.xml
@@ -3,33 +3,68 @@
<File name="FILE" fileName="${sys:ode.server.home}/logs/ode.log" append="false">
<PatternLayout pattern="%d{ABSOLUTE} %-5p [%c] %m%n"/>
</File>
- <Console name="STDOUT" target="SYSTEM_OUT">
+ <File name="TOMEE_FILE" fileName="${sys:ode.server.home}/logs/tomee.log" append="false">
<PatternLayout pattern="%d{ABSOLUTE} %-5p [%c] %m%n"/>
- </Console>
+ </File>
<Async name="Async">
- <!--<AppenderRef ref="FILE"/> -->
- <AppenderRef ref="STDOUT"/>
+ <AppenderRef ref="FILE"/>
+ <AppenderRef ref="TOMEE_FILE"/>
</Async>
</Appenders>
<Loggers>
- <Logger name="org.apache.ode" level="info" additivity="false">
+ <Logger name="org.apache.ode" level="INFO" additivity="false">
+ <AppenderRef ref="FILE"/>
+ </Logger>
+ <Logger name="org.apache.axis2" level="INFO" additivity="false">
<AppenderRef ref="FILE"/>
</Logger>
- <Logger name="org.apache.axis2" level="info" additivity="false">
+ <Logger name="org.apache.xml" level="OFF" additivity="false">
<AppenderRef ref="FILE"/>
</Logger>
- <Logger name="org.hibernate" level="info" additivity="false">
+ <Logger name="org.opensaml" level="OFF" additivity="false">
<AppenderRef ref="FILE"/>
</Logger>
- <Logger name="org.apache.openjpa" level="info" additivity="false">
+ <Logger name="org.hibernate" level="INFO" additivity="false">
<AppenderRef ref="FILE"/>
</Logger>
<Logger name="org.springframework" level="error" additivity="false">
<AppenderRef ref="FILE"/>
</Logger>
- <Root level="error">
+ <!-- Tomee container logs -->
+ <Logger name="OpenEJB" level="INFO" additivity="false">
+ <AppenderRef ref="TOMEE_FILE"/>
+ </Logger>
+ <Logger name="Transaction" level="INFO" additivity="false">
+ <AppenderRef ref="TOMEE_FILE"/>
+ </Logger>
+ <Logger name="org.apache.geronimo" level="INFO" additivity="false">
+ <AppenderRef ref="TOMEE_FILE"/>
+ </Logger>
+ <Logger name="org.apache.activemq" level="INFO" additivity="false">
+ <AppenderRef ref="TOMEE_FILE"/>
+ </Logger>
+ <Logger name="openjpa" level="INFO" additivity="false">
+ <AppenderRef ref="TOMEE_FILE"/>
+ </Logger>
+ <Logger name="org.apache.catalina" level="INFO" additivity="false">
+ <AppenderRef ref="TOMEE_FILE"/>
+ </Logger>
+ <Logger name="org.apache.tomcat" level="INFO" additivity="false">
+ <AppenderRef ref="TOMEE_FILE"/>
+ </Logger>
+ <Logger name="org.apache.coyote" level="INFO" additivity="false">
+ <AppenderRef ref="TOMEE_FILE"/>
+ </Logger>
+ <Logger name="org.apache.jasper" level="INFO" additivity="false">
+ <AppenderRef ref="TOMEE_FILE"/>
+ </Logger>
+ <Logger name="org.apache.naming" level="INFO" additivity="false">
+ <AppenderRef ref="TOMEE_FILE"/>
+ </Logger>
+
+ <Root level="INFO">
<AppenderRef ref="Async"/>
</Root>
</Loggers>
http://git-wip-us.apache.org/repos/asf/ode/blob/3d31943f/tomee-server/src/main/server/conf/system.properties
----------------------------------------------------------------------
diff --git a/tomee-server/src/main/server/conf/system.properties b/tomee-server/src/main/server/conf/system.properties
index d9c450f..f400286 100644
--- a/tomee-server/src/main/server/conf/system.properties
+++ b/tomee-server/src/main/server/conf/system.properties
@@ -1 +1,2 @@
-openejb.additional.exclude=derby-10.5.3.0_1.jar,derbytools-10.5.3.0_1.jar,jaxb-impl-2.2.6.jar,jibx-run-1.2.1.jar,openejb-core-7.0.1.jar,tomee-embedded-7.0.1.jar,xalan-2.7.1.jar
\ No newline at end of file
+openejb.additional.exclude=derby-,derbytools-
+openejb.log.factory=slf4j
\ No newline at end of file
[03/10] ode git commit: ODE-1060: improved Rakefile to remove jars
from ODE war
Posted by sa...@apache.org.
ODE-1060: improved Rakefile to remove jars from ODE war
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/bc2c1c6f
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/bc2c1c6f
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/bc2c1c6f
Branch: refs/heads/ode-1.3.x
Commit: bc2c1c6fe2e7aa8fed826b3a02625c26e51bdf4f
Parents: cd6efc8
Author: sathwik <sa...@apache.org>
Authored: Wed Aug 10 22:04:39 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Wed Aug 10 22:04:39 2016 +0530
----------------------------------------------------------------------
Rakefile | 39 ++++++++-------------------------------
dependencies.rb | 3 +--
2 files changed, 9 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/bc2c1c6f/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index f8b279c..d8bcd21 100644
--- a/Rakefile
+++ b/Rakefile
@@ -703,51 +703,28 @@ define "ode" do
desc "tomee-server"
define "tomee-server" do
- libs = projects("axis2", "bpel-api", "bpel-compiler", "bpel-connector", "bpel-dao",
- "bpel-epr", "bpel-obj", "bpel-ql", "bpel-runtime", "scheduler-simple",
- "bpel-schemas", "bpel-store", "dao-hibernate", "jacob", "jca-ra", "jca-server",
- "utils", "dao-jpa", "agents","tomee"),
- AXIS2_ALL, AXIS2_MODULES.libs, ANNONGEN, BACKPORT, COMMONS.codec, COMMONS.fileupload, COMMONS.io, COMMONS.httpclient, COMMONS.lang, COMMONS.pool,
- DERBY, DERBY_TOOLS, GERONIMO.kernel, H2::REQUIRES, JAXEN, JAVAX.activation, JIBX, LOG4J2, SAXON, SPRING, TRANQL, WOODSTOX, WSDL4J, WS_COMMONS, XALAN,
- XERCES, XMLBEANS, SLF4J, TOMEE
-
- # dependecies of ODE removed as it is provided by TOMEE
- #COMMONS.beanutils,COMMONS.collections, GERONIMO.connector,GERONIMO.transaction, OPENJPA, JAVAX.persistence, JAVAX.ejb, JAVAX.javamail, JAVAX.connector, JAVAX.jms, JAVAX.transaction, JAVAX.stream,
tomee_libs = projects("tomee"), TOMEE, DERBY, DERBY_TOOLS, SLF4J, LOG4J2
+ #liraries to be rmomved from ODE war
+ rm_libs = GERONIMO, JAVAX.transaction, JAVAX.connector, JAVAX.ejb, JAVAX.javamail, JAVAX.jms, JAVAX.persistence, JAVAX.resource, DERBY, DERBY_TOOLS, SLF4J, LOG4J2, OPENJPA, TRANQL
+
+ # extract ode war
exploded_ode = unzip(_(:target, 'ode') => project("ode:axis2-war").package(:war)).target
package(:zip).enhance do |zip|
zip.include path_to(:src,:main,:server,'*')
zip.include(tomee_libs,:path=>"lib")
- zip.include(:path=>"logs")
zip.merge project("dao-jpa-ojpa-derby").package(:zip),:path=>"database"
zip.merge project("dao-hibernate-db").package(:zip),:path=>"database"
exploded_ode.invoke
- # remove conflicting jar from ODE
- rm _(:target, "ode/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.jar")
- rm _(:target, "ode/WEB-INF/lib/geronimo-transaction-2.0.1.jar")
- rm _(:target, "ode/WEB-INF/lib/geronimo-spec-jms-1.1-rc4.jar")
- rm _(:target, "ode/WEB-INF/lib/geronimo-javamail_1.4_spec-1.7.1.jar")
- rm _(:target, "ode/WEB-INF/lib/geronimo-connector-2.0.1.jar")
- rm _(:target, "ode/WEB-INF/lib/geronimo-ejb_2.1_spec-1.1.jar")
- rm _(:target, "ode/WEB-INF/lib/geronimo-j2ee-connector_1.5_spec-1.0.jar")
- rm _(:target, "ode/WEB-INF/lib/geronimo-kernel-2.0.1.jar")
- rm _(:target, "ode/WEB-INF/lib/persistence-api-1.0.jar")
- rm _(:target, "ode/WEB-INF/lib/openjpa-1.2.3.jar")
- rm _(:target, "ode/WEB-INF/lib/derby-10.5.3.0_1.jar")
- rm _(:target, "ode/WEB-INF/lib/derbytools-10.5.3.0_1.jar")
- remove_entry_secure _(:target, "ode/WEB-INF/classes/")
- rm _(:target, "ode/WEB-INF/lib/log4j-api-2.3.jar")
- rm _(:target, "ode/WEB-INF/lib/log4j-core-2.3.jar")
- rm _(:target, "ode/WEB-INF/lib/log4j-slf4j-impl-2.3.jar")
- rm _(:target, "ode/WEB-INF/lib/log4j-web-2.3.jar")
- rm _(:target, "ode/WEB-INF/lib/slf4j-api-1.7.12.jar")
- rm _(:target, "ode/WEB-INF/lib/jcl-over-slf4j-1.7.12.jar")
+ #remove conflicting artifacts from ODE war
+ artifacts(rm_libs).each {|a| rm _(:target, "ode/WEB-INF/lib/"+Artifact.hash_to_file_name(a.to_hash)) }
+ #remove classes folder, as there is nothing
+ remove_entry_secure _(:target, "ode/WEB-INF/classes/")
# add resources to web.xml
resourcesxml = Nokogiri::XML <<-eos
http://git-wip-us.apache.org/repos/asf/ode/blob/bc2c1c6f/dependencies.rb
----------------------------------------------------------------------
diff --git a/dependencies.rb b/dependencies.rb
index 2dd012e..6b0ce84 100644
--- a/dependencies.rb
+++ b/dependencies.rb
@@ -269,9 +269,8 @@ TOMEE = struct(
"bval-jsr",
:under=>"org.apache.bval", :version=>"1.1.1"
),
- #:jaxb => ["javax.xml.bind:jaxb-api:jar:2.2.6","com.sun.xml.bind:jaxb-impl:jar:2.2.6"],
:ecj => "org.eclipse.jdt.core.compiler:ecj:jar:4.4",
- :velovity => "org.apache.velocity:velocity:jar:1.6.4",
+ :velocity => "org.apache.velocity:velocity:jar:1.6.4",
:oro => "oro:oro:jar:2.0.8",
:openjpa => ["org.apache.openjpa:openjpa:jar:2.4.1","net.sourceforge.serp:serp:jar:1.15.1"]
[06/10] ode git commit: ODE-1060: Check for home system property
Posted by sa...@apache.org.
ODE-1060: Check for home system property
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/30d959c8
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/30d959c8
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/30d959c8
Branch: refs/heads/ode-1.3.x
Commit: 30d959c8c1e689026142adba32f40881db6b61fd
Parents: 18f6ec6
Author: sathwik <sa...@apache.org>
Authored: Fri Aug 12 20:38:04 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Fri Aug 12 20:38:04 2016 +0530
----------------------------------------------------------------------
.../main/java/org/apache/ode/tomee/Main.java | 37 +++++++++++---------
1 file changed, 21 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/30d959c8/tomee/src/main/java/org/apache/ode/tomee/Main.java
----------------------------------------------------------------------
diff --git a/tomee/src/main/java/org/apache/ode/tomee/Main.java b/tomee/src/main/java/org/apache/ode/tomee/Main.java
index 852e23c..71e9eb7 100644
--- a/tomee/src/main/java/org/apache/ode/tomee/Main.java
+++ b/tomee/src/main/java/org/apache/ode/tomee/Main.java
@@ -24,25 +24,30 @@ import java.io.File;
public class Main {
public static void main(String[] args) {
String home = System.getProperty("ode.server.home");
- final TomeeLauncher launcher = new TomeeLauncher(home);
- try {
- launcher.initialize();
- launcher.start();
- Runtime.getRuntime().addShutdownHook(new Thread() {
- public void run() {
- try {
- launcher.stop();
- System.out.println("Continer stopped");
- } catch (final Exception e) {
- e.printStackTrace();
+ if(home != null) {
+ final TomeeLauncher launcher = new TomeeLauncher(home);
+ try {
+ launcher.initialize();
+ launcher.start();
+
+ Runtime.getRuntime().addShutdownHook(new Thread() {
+ public void run() {
+ try {
+ launcher.stop();
+ System.out.println("Continer stopped");
+ } catch (final Exception e) {
+ e.printStackTrace();
+ }
}
- }
- });
+ });
- launcher.deploy(new File(home,"webapps/ode"), "ode");
- } catch (Exception e) {
- e.printStackTrace();
+ launcher.deploy(new File(home,"webapps/ode"), "ode");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } else {
+ System.out.println("Cannot start the container. Kindly set system property ode.server.home");
}
}
}
\ No newline at end of file
[02/10] ode git commit: ODE-1060: Embedded Tomee initial commit
Posted by sa...@apache.org.
ODE-1060: Embedded Tomee initial commit
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/cd6efc8e
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/cd6efc8e
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/cd6efc8e
Branch: refs/heads/ode-1.3.x
Commit: cd6efc8e200c8fb15bac78cf5a013159d7b13c69
Parents: 2ca67aa
Author: sathwik <sa...@apache.org>
Authored: Wed Aug 10 09:39:05 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Wed Aug 10 09:39:05 2016 +0530
----------------------------------------------------------------------
Gemfile | 1 +
Rakefile | 89 ++
axis2-war/src/main/webapp/WEB-INF/web.xml | 7 +-
dependencies.rb | 120 ++
tomee-server/src/main/server/conf/context.xml | 30 +
tomee-server/src/main/server/conf/log4j2.xml | 37 +
.../src/main/server/conf/ode-tomee.properties | 18 +
tomee-server/src/main/server/conf/server.xml | 164 +++
.../src/main/server/conf/system.properties | 1 +
tomee-server/src/main/server/conf/tomee.xml | 19 +
tomee-server/src/main/server/conf/web.xml | 1218 ++++++++++++++++++
.../java/org/apache/ode/tomee/Constants.java | 46 +
.../main/java/org/apache/ode/tomee/Main.java | 42 +
.../org/apache/ode/tomee/TomeeLauncher.java | 141 ++
14 files changed, 1932 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/cd6efc8e/Gemfile
----------------------------------------------------------------------
diff --git a/Gemfile b/Gemfile
index 4933b40..2c2476e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,3 +7,4 @@ gem 'rspec-expectations', '= 2.14.3'
gem 'rspec-mocks', '= 2.14.3'
gem 'rspec-core', '= 2.14.5'
gem 'rspec', '= 2.14.1'
+gem 'nokogiri', '>= 1.6.6.2'
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode/blob/cd6efc8e/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index 82e68bd..f8b279c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -21,6 +21,7 @@ require "buildr/openjpa"
require "buildr/javacc"
require "buildr/jetty"
require "buildr/hibernate"
+require "nokogiri"
require File.join(File.dirname(__FILE__), 'repositories.rb')
require File.join(File.dirname(__FILE__), 'dependencies.rb')
@@ -693,8 +694,94 @@ define "ode" do
pp transitive(['org.apache.axis2:axis2-webapp:jar:1.5.6', 'org.apache.rampart:rampart-project:jar:1.5.2']).group_by {|s| "#{s.group}:#{s.id}:#{s.classifier}:#{s.type}" }.map {|i,v| v.sort_by(&:version).first.to_spec}.sort
end
+
+ desc "tomee"
+ define "tomee" do
+ compile.with TOMEE, SLF4J
+ package :jar
+ end
+
+ desc "tomee-server"
+ define "tomee-server" do
+ libs = projects("axis2", "bpel-api", "bpel-compiler", "bpel-connector", "bpel-dao",
+ "bpel-epr", "bpel-obj", "bpel-ql", "bpel-runtime", "scheduler-simple",
+ "bpel-schemas", "bpel-store", "dao-hibernate", "jacob", "jca-ra", "jca-server",
+ "utils", "dao-jpa", "agents","tomee"),
+ AXIS2_ALL, AXIS2_MODULES.libs, ANNONGEN, BACKPORT, COMMONS.codec, COMMONS.fileupload, COMMONS.io, COMMONS.httpclient, COMMONS.lang, COMMONS.pool,
+ DERBY, DERBY_TOOLS, GERONIMO.kernel, H2::REQUIRES, JAXEN, JAVAX.activation, JIBX, LOG4J2, SAXON, SPRING, TRANQL, WOODSTOX, WSDL4J, WS_COMMONS, XALAN,
+ XERCES, XMLBEANS, SLF4J, TOMEE
+
+ # dependecies of ODE removed as it is provided by TOMEE
+ #COMMONS.beanutils,COMMONS.collections, GERONIMO.connector,GERONIMO.transaction, OPENJPA, JAVAX.persistence, JAVAX.ejb, JAVAX.javamail, JAVAX.connector, JAVAX.jms, JAVAX.transaction, JAVAX.stream,
+
+ tomee_libs = projects("tomee"), TOMEE, DERBY, DERBY_TOOLS, SLF4J, LOG4J2
+
+ exploded_ode = unzip(_(:target, 'ode') => project("ode:axis2-war").package(:war)).target
+
+ package(:zip).enhance do |zip|
+ zip.include path_to(:src,:main,:server,'*')
+ zip.include(tomee_libs,:path=>"lib")
+ zip.include(:path=>"logs")
+ zip.merge project("dao-jpa-ojpa-derby").package(:zip),:path=>"database"
+ zip.merge project("dao-hibernate-db").package(:zip),:path=>"database"
+
+ exploded_ode.invoke
+
+ # remove conflicting jar from ODE
+ rm _(:target, "ode/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.jar")
+ rm _(:target, "ode/WEB-INF/lib/geronimo-transaction-2.0.1.jar")
+ rm _(:target, "ode/WEB-INF/lib/geronimo-spec-jms-1.1-rc4.jar")
+ rm _(:target, "ode/WEB-INF/lib/geronimo-javamail_1.4_spec-1.7.1.jar")
+ rm _(:target, "ode/WEB-INF/lib/geronimo-connector-2.0.1.jar")
+ rm _(:target, "ode/WEB-INF/lib/geronimo-ejb_2.1_spec-1.1.jar")
+ rm _(:target, "ode/WEB-INF/lib/geronimo-j2ee-connector_1.5_spec-1.0.jar")
+ rm _(:target, "ode/WEB-INF/lib/geronimo-kernel-2.0.1.jar")
+ rm _(:target, "ode/WEB-INF/lib/persistence-api-1.0.jar")
+ rm _(:target, "ode/WEB-INF/lib/openjpa-1.2.3.jar")
+ rm _(:target, "ode/WEB-INF/lib/derby-10.5.3.0_1.jar")
+ rm _(:target, "ode/WEB-INF/lib/derbytools-10.5.3.0_1.jar")
+ remove_entry_secure _(:target, "ode/WEB-INF/classes/")
+ rm _(:target, "ode/WEB-INF/lib/log4j-api-2.3.jar")
+ rm _(:target, "ode/WEB-INF/lib/log4j-core-2.3.jar")
+ rm _(:target, "ode/WEB-INF/lib/log4j-slf4j-impl-2.3.jar")
+ rm _(:target, "ode/WEB-INF/lib/log4j-web-2.3.jar")
+ rm _(:target, "ode/WEB-INF/lib/slf4j-api-1.7.12.jar")
+ rm _(:target, "ode/WEB-INF/lib/jcl-over-slf4j-1.7.12.jar")
+
+
+ # add resources to web.xml
+ resourcesxml = Nokogiri::XML <<-eos
+ <resource-ref>
+ <res-ref-name>jdbc/ode</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ <res-sharing-scope>Shareable</res-sharing-scope>
+ </resource-ref>
+ eos
+
+ webxml = Nokogiri::XML(File.open(_(:target, "ode/WEB-INF/web.xml")))
+ webxml.xpath('//xmlns:web-app').first.add_child(resourcesxml.root)
+
+ File.open(_(:target, "ode/WEB-INF/web.xml"),'w') {|f| webxml.write_xml_to f}
+
+ # add TomcatFactory to ode-axis2.properties
+ File.open(_(:target, "ode/WEB-INF/conf/ode-axis2.properties"), 'a') do |file|
+ file.puts "\node-axis2.tx.factory.class=org.apache.ode.axis2.util.TomcatFactory"
+ file.puts "ode-axis2.db.mode=EXTERNAL"
+ file.puts "ode-axis2.db.ext.dataSource=java:comp/env/jdbc/ode"
+ file.puts "ode-axis2.dao.factory=org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl"
+ file.puts "ode-axis2.threads.pool.size=20"
+ file.puts "ode-axis2.http.connection-manager.max-per-host=100"
+ file.puts "ode-axis2.http.connection-manager.max-total=100"
+ end
+
+ zip.include.path("webapps").include _(:target, "ode")
+ end
+ end
end
+
+
define "apache-ode" do
[:version, :group, :manifest, :meta_inf].each { |prop| send "#{prop}=", project("ode").send(prop) }
@@ -752,6 +839,8 @@ define "apache-ode" do
define "distro" do
parent.distro(self, "-war") { |zip| zip.include project("ode:axis2-war").package(:war), :as=>"ode.war" }
parent.distro(self, "-jbi") { |zip| zip.include project("ode:jbi").package(:zip) }
+ parent.distro(self, "-war") { |zip| zip.include project("ode:tomee-server").package(:zip) }
+
# Preparing third party licenses
build do
http://git-wip-us.apache.org/repos/asf/ode/blob/cd6efc8e/axis2-war/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/axis2-war/src/main/webapp/WEB-INF/web.xml b/axis2-war/src/main/webapp/WEB-INF/web.xml
index 62a4fe8..42e2062 100644
--- a/axis2-war/src/main/webapp/WEB-INF/web.xml
+++ b/axis2-war/src/main/webapp/WEB-INF/web.xml
@@ -27,6 +27,11 @@
version="2.5">
<display-name>Apache-Axis2</display-name>
+ <context-param>
+ <param-name>isLog4jAutoInitializationDisabled</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
<listener>
<listener-class>org.apache.logging.log4j.web.Log4jServletContextListener</listener-class>
</listener>
@@ -47,8 +52,8 @@
</filter-mapping>
<servlet>
- <servlet-name>AxisServlet</servlet-name>
<display-name>Apache-Axis Servlet</display-name>
+ <servlet-name>AxisServlet</servlet-name>
<servlet-class>org.apache.ode.axis2.hooks.ODEAxisServlet</servlet-class>
<!--<init-param>-->
<!--<param-name>axis2.xml.path</param-name>-->
http://git-wip-us.apache.org/repos/asf/ode/blob/cd6efc8e/dependencies.rb
----------------------------------------------------------------------
diff --git a/dependencies.rb b/dependencies.rb
index ce90232..2dd012e 100644
--- a/dependencies.rb
+++ b/dependencies.rb
@@ -156,3 +156,123 @@ XBEAN = [
"org.apache.xbean:xbean-classloader:jar:3.4.3"
]
XMLBEANS = "org.apache.xmlbeans:xmlbeans:jar:2.6.0"
+
+TOMEE = struct(
+ :tomee => [
+ group(
+ "tomee-embedded",
+ "tomee-catalina",
+ "tomee-common",
+ "tomee-loader",
+ "tomee-jdbc",
+ "tomee-juli",
+ "tomee-util",
+ :under=>"org.apache.tomee", :version=>"7.0.1"
+ )
+ ],
+ :openejb => [
+ group(
+ "openejb-server",
+ "openejb-ejbd",
+ "openejb-http",
+ "openejb-core",
+ "openejb-api",
+ "openejb-javaagent",
+ "openejb-jee",
+ "openejb-jee-accessors",
+ "openejb-loader",
+ "openejb-jpa-integration",
+ "openejb-client",
+ "mbean-annotation-api",
+ :under=>"org.apache.tomee", :version=>"7.0.1"
+ ),
+ "org.apache.openejb.patch:openejb-jstl:jar:1.2",
+ "org.apache.openejb.shade:quartz-openejb-shade:jar:2.2.1"
+ ],
+ :tomcat => [
+ group(
+ "tomcat-websocket-api",
+ "tomcat-jdbc",
+ "tomcat-dbcp",
+ "tomcat-catalina",
+ "tomcat-servlet-api",
+ "tomcat-jsp-api",
+ "tomcat-api",
+ "tomcat-jni",
+ "tomcat-util",
+ "tomcat-util-scan",
+ "tomcat-catalina-ha",
+ "tomcat-tribes",
+ "tomcat-coyote",
+ "tomcat-jasper",
+ "tomcat-el-api",
+ "tomcat-jasper-el",
+ "tomcat-websocket",
+ "tomcat-juli",
+ :under=>"org.apache.tomcat", :version=>"8.5.3"
+ )
+ ],
+ :javaee_api => "org.apache.tomee:javaee-api:jar:tomcat:7.0",
+ :commons => ["org.apache.commons:commons-lang3:jar:3.4",
+ "org.apache.commons:commons-dbcp2:jar:2.1",
+ "org.apache.commons:commons-pool2:jar:2.3"
+ ],
+ :commons_cli => "commons-cli:commons-cli:jar:1.2",
+ :commons_collections => "commons-collections:commons-collections:jar:3.2.2",
+ :commons_beanutils => "commons-beanutils:commons-beanutils-core:jar:1.8.3",
+ :commons_lang => "commons-lang:commons-lang:jar:2.4",
+ :sxc => [
+ group(
+ "sxc-jaxb-core",
+ "sxc-runtime",
+ :under=>"org.metatype.sxc", :version=>"0.8"
+ )
+ ],
+ :activemq => [group(
+ "activemq-ra",
+ "activemq-kahadb-store",
+ "activemq-broker",
+ "activemq-client",
+ "activemq-openwire-legacy",
+ "activemq-jdbc-store",
+ :under=>"org.apache.activemq", :version=>"5.13.3"
+ ),
+ "org.apache.activemq.protobuf:activemq-protobuf:jar:1.1"
+ ],
+ :geronimo => ["org.apache.geronimo.components:geronimo-transaction:jar:3.1.3",
+ "org.apache.geronimo.javamail:geronimo-javamail_1.4_mail:jar:1.9.0-alpha-2",
+ "org.apache.geronimo.components:geronimo-connector:jar:3.1.3",
+ ],
+ :howl => "org.objectweb.howl:howl:jar:1.0.1-1",
+ :xbean => group(
+ "xbean-asm5-shaded",
+ "xbean-finder-shaded",
+ "xbean-naming",
+ "xbean-reflect",
+ "xbean-bundleutils",
+ :under=>"org.apache.xbean", :version=>"4.5"
+ ),
+ :hsqldb => "org.hsqldb:hsqldb:jar:2.3.2",
+ :swizzle => "org.codehaus.swizzle:swizzle-stream:jar:1.6.2",
+ :openwebbeans => group(
+ "openwebbeans-impl",
+ "openwebbeans-spi",
+ "openwebbeans-ejb",
+ "openwebbeans-ee",
+ "openwebbeans-ee-common",
+ "openwebbeans-web",
+ "openwebbeans-el22",
+ :under=>"org.apache.openwebbeans", :version=>"1.6.3"
+ ),
+ :bval => group(
+ "bval-core",
+ "bval-jsr",
+ :under=>"org.apache.bval", :version=>"1.1.1"
+ ),
+ #:jaxb => ["javax.xml.bind:jaxb-api:jar:2.2.6","com.sun.xml.bind:jaxb-impl:jar:2.2.6"],
+ :ecj => "org.eclipse.jdt.core.compiler:ecj:jar:4.4",
+ :velovity => "org.apache.velocity:velocity:jar:1.6.4",
+ :oro => "oro:oro:jar:2.0.8",
+ :openjpa => ["org.apache.openjpa:openjpa:jar:2.4.1","net.sourceforge.serp:serp:jar:1.15.1"]
+
+)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode/blob/cd6efc8e/tomee-server/src/main/server/conf/context.xml
----------------------------------------------------------------------
diff --git a/tomee-server/src/main/server/conf/context.xml b/tomee-server/src/main/server/conf/context.xml
new file mode 100644
index 0000000..966a2a9
--- /dev/null
+++ b/tomee-server/src/main/server/conf/context.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+ 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.
+-->
+<!-- The contents of this file will be loaded for each web application -->
+<Context>
+
+ <!-- Default set of monitored resources. If one of these changes, the -->
+ <!-- web application will be reloaded. -->
+ <WatchedResource>WEB-INF/web.xml</WatchedResource>
+ <WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
+
+ <!-- Uncomment this to disable session persistence across Tomcat restarts -->
+ <!--
+ <Manager pathname="" />
+ -->
+</Context>
http://git-wip-us.apache.org/repos/asf/ode/blob/cd6efc8e/tomee-server/src/main/server/conf/log4j2.xml
----------------------------------------------------------------------
diff --git a/tomee-server/src/main/server/conf/log4j2.xml b/tomee-server/src/main/server/conf/log4j2.xml
new file mode 100644
index 0000000..788eba4
--- /dev/null
+++ b/tomee-server/src/main/server/conf/log4j2.xml
@@ -0,0 +1,37 @@
+<Configuration>
+ <Appenders>
+ <File name="FILE" fileName="${sys:ode.server.home}/logs/ode.log" append="false">
+ <PatternLayout pattern="%d{ABSOLUTE} %-5p [%c] %m%n"/>
+ </File>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ABSOLUTE} %-5p [%c] %m%n"/>
+ </Console>
+ <Async name="Async">
+ <!--<AppenderRef ref="FILE"/> -->
+ <AppenderRef ref="STDOUT"/>
+ </Async>
+ </Appenders>
+
+ <Loggers>
+ <Logger name="org.apache.ode" level="info" additivity="false">
+ <AppenderRef ref="FILE"/>
+ </Logger>
+ <Logger name="org.apache.axis2" level="info" additivity="false">
+ <AppenderRef ref="FILE"/>
+ </Logger>
+ <Logger name="org.hibernate" level="info" additivity="false">
+ <AppenderRef ref="FILE"/>
+ </Logger>
+ <Logger name="org.apache.openjpa" level="info" additivity="false">
+ <AppenderRef ref="FILE"/>
+ </Logger>
+ <Logger name="org.springframework" level="error" additivity="false">
+ <AppenderRef ref="FILE"/>
+ </Logger>
+
+ <Root level="error">
+ <AppenderRef ref="Async"/>
+ </Root>
+ </Loggers>
+
+</Configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode/blob/cd6efc8e/tomee-server/src/main/server/conf/ode-tomee.properties
----------------------------------------------------------------------
diff --git a/tomee-server/src/main/server/conf/ode-tomee.properties b/tomee-server/src/main/server/conf/ode-tomee.properties
new file mode 100644
index 0000000..f42f64d
--- /dev/null
+++ b/tomee-server/src/main/server/conf/ode-tomee.properties
@@ -0,0 +1,18 @@
+# dir=work
+# host=localhost
+# http2=false
+# httpPort=8080
+# httpsPort=8443
+# keepServerXmlAsThis=true
+# keyAlias=
+# keystoreFile=
+# keystorePass=
+# keystoreType=
+# quickSession=false
+# serverXml=server.xml
+# skipHttp=false
+# ssl=
+# sslProtocol=
+# stopPort=8005
+# webResourceCached=
+# webXml=web.xml
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode/blob/cd6efc8e/tomee-server/src/main/server/conf/server.xml
----------------------------------------------------------------------
diff --git a/tomee-server/src/main/server/conf/server.xml b/tomee-server/src/main/server/conf/server.xml
new file mode 100644
index 0000000..a240977
--- /dev/null
+++ b/tomee-server/src/main/server/conf/server.xml
@@ -0,0 +1,164 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+ 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.
+-->
+<!-- Note: A "Server" is not itself a "Container", so you may not
+ define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+ <!-- TomEE plugin for Tomcat -->
+ <Listener className="org.apache.tomee.catalina.ServerListener" />
+ <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+ <!-- Security listener. Documentation at /docs/config/listeners.html
+ <Listener className="org.apache.catalina.security.SecurityListener" />
+ -->
+ <!--APR library loader. Documentation at /docs/apr.html -->
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+ <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+ <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+ <!-- Global JNDI resources
+ Documentation at /docs/jndi-resources-howto.html
+ -->
+ <GlobalNamingResources>
+ <!-- Editable user database that can also be used by
+ UserDatabaseRealm to authenticate users
+ -->
+ <Resource name="UserDatabase" auth="Container"
+ type="org.apache.catalina.UserDatabase"
+ description="User database that can be updated and saved"
+ factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+ pathname="conf/tomcat-users.xml" />
+ </GlobalNamingResources>
+
+ <!-- A "Service" is a collection of one or more "Connectors" that share
+ a single "Container" Note: A "Service" is not itself a "Container",
+ so you may not define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/service.html
+ -->
+ <Service name="Catalina">
+
+ <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+ <!--
+ <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+ maxThreads="150" minSpareThreads="4"/>
+ -->
+
+
+ <!-- A "Connector" represents an endpoint by which requests are received
+ and responses are returned. Documentation at :
+ Java HTTP Connector: /docs/config/http.html
+ Java AJP Connector: /docs/config/ajp.html
+ APR (HTTP/AJP) Connector: /docs/apr.html
+ Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+ -->
+ <Connector port="8080" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443" xpoweredBy="false" server="Apache TomEE" />
+ <!-- A "Connector" using the shared thread pool-->
+ <!--
+ <Connector executor="tomcatThreadPool"
+ port="8080" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443" />
+ -->
+ <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
+ This connector uses the NIO implementation with the JSSE engine. When
+ using the JSSE engine, the JSSE configuration attributes must be used.
+ -->
+ <!--
+ <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+ maxThreads="150" SSLEnabled="true">
+ <SSLHostConfig>
+ <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+ type="RSA" xpoweredBy="false" server="Apache TomEE" />
+ </SSLHostConfig>
+ </Connector>
+ -->
+ <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+ This connector uses the APR/native implementation. When using the
+ APR/native implementation or the OpenSSL engine with NIO or NIO2 then
+ the OpenSSL configuration attributes must be used.
+ -->
+ <!--
+ <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+ maxThreads="150" SSLEnabled="true" >
+ <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" xpoweredBy="false" server="Apache TomEE" />
+ <SSLHostConfig>
+ <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+ certificateFile="conf/localhost-rsa-cert.pem"
+ certificateChainFile="conf/localhost-rsa-chain.pem"
+ type="RSA" />
+ </SSLHostConfig>
+ </Connector>
+ -->
+
+ <!-- Define an AJP 1.3 Connector on port 8009 -->
+ <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+
+
+ <!-- An Engine represents the entry point (within Catalina) that processes
+ every request. The Engine implementation for Tomcat stand alone
+ analyzes the HTTP headers included with the request, and passes them
+ on to the appropriate Host (virtual host).
+ Documentation at /docs/config/engine.html -->
+
+ <!-- You should set jvmRoute to support load-balancing via AJP ie :
+ <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+ -->
+ <Engine name="Catalina" defaultHost="localhost">
+
+ <!--For clustering, please take a look at documentation at:
+ /docs/cluster-howto.html (simple how to)
+ /docs/config/cluster.html (reference documentation) -->
+ <!--
+ <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+ -->
+
+ <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+ via a brute-force attack -->
+ <Realm className="org.apache.catalina.realm.LockOutRealm">
+ <!-- This Realm uses the UserDatabase configured in the global JNDI
+ resources under the key "UserDatabase". Any edits
+ that are performed against this UserDatabase are immediately
+ available for use by the Realm. -->
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ resourceName="UserDatabase"/>
+ </Realm>
+
+ <Host name="localhost" appBase="webapps"
+ unpackWARs="true" autoDeploy="true">
+
+ <!-- SingleSignOn valve, share authentication between web applications
+ Documentation at: /docs/config/valve.html -->
+ <!--
+ <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+ -->
+
+ <!-- Access log processes all example.
+ Documentation at: /docs/config/valve.html
+ Note: The pattern used is equivalent to using pattern="common" -->
+ <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+ prefix="localhost_access_log" suffix=".txt"
+ pattern="%h %l %u %t "%r" %s %b" />
+
+ </Host>
+ </Engine>
+ </Service>
+</Server>
http://git-wip-us.apache.org/repos/asf/ode/blob/cd6efc8e/tomee-server/src/main/server/conf/system.properties
----------------------------------------------------------------------
diff --git a/tomee-server/src/main/server/conf/system.properties b/tomee-server/src/main/server/conf/system.properties
new file mode 100644
index 0000000..d9c450f
--- /dev/null
+++ b/tomee-server/src/main/server/conf/system.properties
@@ -0,0 +1 @@
+openejb.additional.exclude=derby-10.5.3.0_1.jar,derbytools-10.5.3.0_1.jar,jaxb-impl-2.2.6.jar,jibx-run-1.2.1.jar,openejb-core-7.0.1.jar,tomee-embedded-7.0.1.jar,xalan-2.7.1.jar
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode/blob/cd6efc8e/tomee-server/src/main/server/conf/tomee.xml
----------------------------------------------------------------------
diff --git a/tomee-server/src/main/server/conf/tomee.xml b/tomee-server/src/main/server/conf/tomee.xml
new file mode 100644
index 0000000..e9fbd0c
--- /dev/null
+++ b/tomee-server/src/main/server/conf/tomee.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tomee>
+
+<TransactionManager type="TransactionManager">
+</TransactionManager>
+
+<Resource id="jdbc/ode" type="DataSource">
+ jdbcDriver=org.apache.derby.jdbc.EmbeddedDriver
+ jdbcUrl=jdbc:derby:database/derby-jpadb
+ userName=sa
+ password=
+ defaultAutoCommit=false
+ jtaManaged=true
+ initialSize=5
+ maxActive=20
+ defaultTransactionIsolation=2
+</Resource>
+
+</tomee>
http://git-wip-us.apache.org/repos/asf/ode/blob/cd6efc8e/tomee-server/src/main/server/conf/web.xml
----------------------------------------------------------------------
diff --git a/tomee-server/src/main/server/conf/web.xml b/tomee-server/src/main/server/conf/web.xml
new file mode 100644
index 0000000..55b581d
--- /dev/null
+++ b/tomee-server/src/main/server/conf/web.xml
@@ -0,0 +1,1218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
+ <!-- ======================== Introduction ============================== -->
+ <!-- This document defines default values for *all* web applications -->
+ <!-- loaded into this instance of Tomcat. As each application is -->
+ <!-- deployed, this file is processed, followed by the -->
+ <!-- "/WEB-INF/web.xml" deployment descriptor from your own -->
+ <!-- applications. -->
+ <!-- -->
+ <!-- WARNING: Do not configure application-specific resources here! -->
+ <!-- They should go in the "/WEB-INF/web.xml" file in your application. -->
+
+
+ <!-- ================== Built In Servlet Definitions ==================== -->
+
+
+ <!-- The default servlet for all web applications, that serves static -->
+ <!-- resources. It processes all requests that are not mapped to other -->
+ <!-- servlets with servlet mappings (defined either here or in your own -->
+ <!-- web.xml file). This servlet supports the following initialization -->
+ <!-- parameters (default values are in square brackets): -->
+ <!-- -->
+ <!-- debug Debugging detail level for messages logged -->
+ <!-- by this servlet. [0] -->
+ <!-- -->
+ <!-- fileEncoding Encoding to be used to read static resources -->
+ <!-- [platform default] -->
+ <!-- -->
+ <!-- input Input buffer size (in bytes) when reading -->
+ <!-- resources to be served. [2048] -->
+ <!-- -->
+ <!-- listings Should directory listings be produced if there -->
+ <!-- is no welcome file in this directory? [false] -->
+ <!-- WARNING: Listings for directories with many -->
+ <!-- entries can be slow and may consume -->
+ <!-- significant proportions of server resources. -->
+ <!-- -->
+ <!-- output Output buffer size (in bytes) when writing -->
+ <!-- resources to be served. [2048] -->
+ <!-- -->
+ <!-- readonly Is this context "read only", so HTTP -->
+ <!-- commands like PUT and DELETE are -->
+ <!-- rejected? [true] -->
+ <!-- -->
+ <!-- readmeFile File to display together with the directory -->
+ <!-- contents. [null] -->
+ <!-- -->
+ <!-- sendfileSize If the connector used supports sendfile, this -->
+ <!-- represents the minimal file size in KB for -->
+ <!-- which sendfile will be used. Use a negative -->
+ <!-- value to always disable sendfile. [48] -->
+ <!-- -->
+ <!-- useAcceptRanges Should the Accept-Ranges header be included -->
+ <!-- in responses where appropriate? [true] -->
+ <!-- -->
+ <!-- For directory listing customization. Checks localXsltFile, then -->
+ <!-- globalXsltFile, then defaults to original behavior. -->
+ <!-- -->
+ <!-- localXsltFile Make directory listings an XML doc and -->
+ <!-- pass the result to this style sheet residing -->
+ <!-- in that directory. This overrides -->
+ <!-- contextXsltFile and globalXsltFile[null] -->
+ <!-- -->
+ <!-- contextXsltFile Make directory listings an XML doc and -->
+ <!-- pass the result to this style sheet which is -->
+ <!-- relative to the context root. This overrides -->
+ <!-- globalXsltFile[null] -->
+ <!-- -->
+ <!-- globalXsltFile Site wide configuration version of -->
+ <!-- localXsltFile This argument is expected -->
+ <!-- to be a physical file. [null] -->
+ <!-- -->
+ <!-- -->
+
+ <servlet>
+ <servlet-name>default</servlet-name>
+ <servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ <init-param>
+ <param-name>listings</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+
+ <!-- The JSP page compiler and execution servlet, which is the mechanism -->
+ <!-- used by Tomcat to support JSP pages. Traditionally, this servlet -->
+ <!-- is mapped to the URL pattern "*.jsp". This servlet supports the -->
+ <!-- following initialization parameters (default values are in square -->
+ <!-- brackets): -->
+ <!-- -->
+ <!-- checkInterval If development is false and checkInterval is -->
+ <!-- greater than zero, background compilations are -->
+ <!-- enabled. checkInterval is the time in seconds -->
+ <!-- between checks to see if a JSP page (and its -->
+ <!-- dependent files) needs to be recompiled. [0] -->
+ <!-- -->
+ <!-- classdebuginfo Should the class file be compiled with -->
+ <!-- debugging information? [true] -->
+ <!-- -->
+ <!-- classpath What class path should I use while compiling -->
+ <!-- generated servlets? [Created dynamically -->
+ <!-- based on the current web application] -->
+ <!-- -->
+ <!-- compiler Which compiler Ant should use to compile JSP -->
+ <!-- pages. See the jasper documentation for more -->
+ <!-- information. -->
+ <!-- -->
+ <!-- compilerSourceVM Compiler source VM. [1.6] -->
+ <!-- -->
+ <!-- compilerTargetVM Compiler target VM. [1.6] -->
+ <!-- -->
+ <!-- development Is Jasper used in development mode? If true, -->
+ <!-- the frequency at which JSPs are checked for -->
+ <!-- modification may be specified via the -->
+ <!-- modificationTestInterval parameter. [true] -->
+ <!-- -->
+ <!-- displaySourceFragment -->
+ <!-- Should a source fragment be included in -->
+ <!-- exception messages? [true] -->
+ <!-- -->
+ <!-- dumpSmap Should the SMAP info for JSR45 debugging be -->
+ <!-- dumped to a file? [false] -->
+ <!-- False if suppressSmap is true -->
+ <!-- -->
+ <!-- enablePooling Determines whether tag handler pooling is -->
+ <!-- enabled. This is a compilation option. It will -->
+ <!-- not alter the behaviour of JSPs that have -->
+ <!-- already been compiled. [true] -->
+ <!-- -->
+ <!-- engineOptionsClass Allows specifying the Options class used to -->
+ <!-- configure Jasper. If not present, the default -->
+ <!-- EmbeddedServletOptions will be used. -->
+ <!-- -->
+ <!-- errorOnUseBeanInvalidClassAttribute -->
+ <!-- Should Jasper issue an error when the value of -->
+ <!-- the class attribute in an useBean action is -->
+ <!-- not a valid bean class? [true] -->
+ <!-- -->
+ <!-- fork Tell Ant to fork compiles of JSP pages so that -->
+ <!-- a separate JVM is used for JSP page compiles -->
+ <!-- from the one Tomcat is running in. [true] -->
+ <!-- -->
+ <!-- genStringAsCharArray -->
+ <!-- Should text strings be generated as char -->
+ <!-- arrays, to improve performance in some cases? -->
+ <!-- [false] -->
+ <!-- -->
+ <!-- ieClassId The class-id value to be sent to Internet -->
+ <!-- Explorer when using <jsp:plugin> tags. -->
+ <!-- [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93] -->
+ <!-- -->
+ <!-- javaEncoding Java file encoding to use for generating java -->
+ <!-- source files. [UTF8] -->
+ <!-- -->
+ <!-- keepgenerated Should we keep the generated Java source code -->
+ <!-- for each page instead of deleting it? [true] -->
+ <!-- -->
+ <!-- mappedfile Should we generate static content with one -->
+ <!-- print statement per input line, to ease -->
+ <!-- debugging? [true] -->
+ <!-- -->
+ <!-- maxLoadedJsps The maximum number of JSPs that will be loaded -->
+ <!-- for a web application. If more than this -->
+ <!-- number of JSPs are loaded, the least recently -->
+ <!-- used JSPs will be unloaded so that the number -->
+ <!-- of JSPs loaded at any one time does not exceed -->
+ <!-- this limit. A value of zero or less indicates -->
+ <!-- no limit. [-1] -->
+ <!-- -->
+ <!-- jspIdleTimeout The amount of time in seconds a JSP can be -->
+ <!-- idle before it is unloaded. A value of zero -->
+ <!-- or less indicates never unload. [-1] -->
+ <!-- -->
+ <!-- modificationTestInterval -->
+ <!-- Causes a JSP (and its dependent files) to not -->
+ <!-- be checked for modification during the -->
+ <!-- specified time interval (in seconds) from the -->
+ <!-- last time the JSP was checked for -->
+ <!-- modification. A value of 0 will cause the JSP -->
+ <!-- to be checked on every access. -->
+ <!-- Used in development mode only. [4] -->
+ <!-- -->
+ <!-- recompileOnFail If a JSP compilation fails should the -->
+ <!-- modificationTestInterval be ignored and the -->
+ <!-- next access trigger a re-compilation attempt? -->
+ <!-- Used in development mode only and is disabled -->
+ <!-- by default as compilation may be expensive and -->
+ <!-- could lead to excessive resource usage. -->
+ <!-- [false] -->
+ <!-- -->
+ <!-- scratchdir What scratch directory should we use when -->
+ <!-- compiling JSP pages? [default work directory -->
+ <!-- for the current web application] -->
+ <!-- -->
+ <!-- suppressSmap Should the generation of SMAP info for JSR45 -->
+ <!-- debugging be suppressed? [false] -->
+ <!-- -->
+ <!-- trimSpaces Should white spaces in template text between -->
+ <!-- actions or directives be trimmed? [false] -->
+ <!-- -->
+ <!-- xpoweredBy Determines whether X-Powered-By response -->
+ <!-- header is added by generated servlet. [false] -->
+
+ <servlet>
+ <servlet-name>jsp</servlet-name>
+ <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
+ <init-param>
+ <param-name>fork</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <init-param>
+ <param-name>xpoweredBy</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <init-param>
+ <param-name>development</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <load-on-startup>3</load-on-startup>
+ </servlet>
+
+
+ <!-- NOTE: An SSI Filter is also available as an alternative SSI -->
+ <!-- implementation. Use either the Servlet or the Filter but NOT both. -->
+ <!-- -->
+ <!-- Server Side Includes processing servlet, which processes SSI -->
+ <!-- directives in HTML pages consistent with similar support in web -->
+ <!-- servers like Apache. Traditionally, this servlet is mapped to the -->
+ <!-- URL pattern "*.shtml". This servlet supports the following -->
+ <!-- initialization parameters (default values are in square brackets): -->
+ <!-- -->
+ <!-- buffered Should output from this servlet be buffered? -->
+ <!-- (0=false, 1=true) [0] -->
+ <!-- -->
+ <!-- debug Debugging detail level for messages logged -->
+ <!-- by this servlet. [0] -->
+ <!-- -->
+ <!-- expires The number of seconds before a page with SSI -->
+ <!-- directives will expire. [No default] -->
+ <!-- -->
+ <!-- isVirtualWebappRelative -->
+ <!-- Should "virtual" paths be interpreted as -->
+ <!-- relative to the context root, instead of -->
+ <!-- the server root? (0=false, 1=true) [0] -->
+ <!-- -->
+ <!-- inputEncoding The encoding to assume for SSI resources if -->
+ <!-- one is not available from the resource. -->
+ <!-- [Platform default] -->
+ <!-- -->
+ <!-- outputEncoding The encoding to use for the page that results -->
+ <!-- from the SSI processing. [UTF-8] -->
+ <!-- -->
+ <!-- allowExec Is use of the exec command enabled? [false] -->
+
+<!--
+ <servlet>
+ <servlet-name>ssi</servlet-name>
+ <servlet-class>
+ org.apache.catalina.ssi.SSIServlet
+ </servlet-class>
+ <init-param>
+ <param-name>buffered</param-name>
+ <param-value>1</param-value>
+ </init-param>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ <init-param>
+ <param-name>expires</param-name>
+ <param-value>666</param-value>
+ </init-param>
+ <init-param>
+ <param-name>isVirtualWebappRelative</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ <load-on-startup>4</load-on-startup>
+ </servlet>
+-->
+
+
+ <!-- Common Gateway Includes (CGI) processing servlet, which supports -->
+ <!-- execution of external applications that conform to the CGI spec -->
+ <!-- requirements. Typically, this servlet is mapped to the URL pattern -->
+ <!-- "/cgi-bin/*", which means that any CGI applications that are -->
+ <!-- executed must be present within the web application. This servlet -->
+ <!-- supports the following initialization parameters (default values -->
+ <!-- are in square brackets): -->
+ <!-- -->
+ <!-- cgiPathPrefix The CGI search path will start at -->
+ <!-- webAppRootDir + File.separator + this prefix. -->
+ <!-- [WEB-INF/cgi] -->
+ <!-- -->
+ <!-- debug Debugging detail level for messages logged -->
+ <!-- by this servlet. [0] -->
+ <!-- -->
+ <!-- executable Name of the executable used to run the -->
+ <!-- script. [perl] -->
+ <!-- -->
+ <!-- parameterEncoding Name of parameter encoding to be used with -->
+ <!-- CGI servlet. -->
+ <!-- [System.getProperty("file.encoding","UTF-8")] -->
+ <!-- -->
+ <!-- passShellEnvironment Should the shell environment variables (if -->
+ <!-- any) be passed to the CGI script? [false] -->
+ <!-- -->
+ <!-- stderrTimeout The time (in milliseconds) to wait for the -->
+ <!-- reading of stderr to complete before -->
+ <!-- terminating the CGI process. [2000] -->
+
+<!--
+ <servlet>
+ <servlet-name>cgi</servlet-name>
+ <servlet-class>org.apache.catalina.servlets.CGIServlet</servlet-class>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ <init-param>
+ <param-name>cgiPathPrefix</param-name>
+ <param-value>WEB-INF/cgi</param-value>
+ </init-param>
+ <load-on-startup>5</load-on-startup>
+ </servlet>
+-->
+
+
+ <!-- ================ Built In Servlet Mappings ========================= -->
+
+
+ <!-- The servlet mappings for the built in servlets defined above. Note -->
+ <!-- that, by default, the CGI and SSI servlets are *not* mapped. You -->
+ <!-- must uncomment these mappings (or add them to your application's own -->
+ <!-- web.xml deployment descriptor) to enable these services -->
+
+ <!-- The mapping for the default servlet -->
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+
+ <!-- The mappings for the JSP servlet -->
+ <servlet-mapping>
+ <servlet-name>jsp</servlet-name>
+ <url-pattern>*.jsp</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>jsp</servlet-name>
+ <url-pattern>*.jspx</url-pattern>
+ </servlet-mapping>
+
+ <!-- The mapping for the SSI servlet -->
+<!--
+ <servlet-mapping>
+ <servlet-name>ssi</servlet-name>
+ <url-pattern>*.shtml</url-pattern>
+ </servlet-mapping>
+-->
+
+ <!-- The mapping for the CGI Gateway servlet -->
+
+<!--
+ <servlet-mapping>
+ <servlet-name>cgi</servlet-name>
+ <url-pattern>/cgi-bin/*</url-pattern>
+ </servlet-mapping>
+-->
+
+
+ <!-- ================== Built In Filter Definitions ===================== -->
+
+ <!-- NOTE: An SSI Servlet is also available as an alternative SSI -->
+ <!-- implementation. Use either the Servlet or the Filter but NOT both. -->
+ <!-- -->
+ <!-- Server Side Includes processing filter, which processes SSI -->
+ <!-- directives in HTML pages consistent with similar support in web -->
+ <!-- servers like Apache. Traditionally, this filter is mapped to the -->
+ <!-- URL pattern "*.shtml", though it can be mapped to "*" as it will -->
+ <!-- selectively enable/disable SSI processing based on mime types. For -->
+ <!-- this to work you will need to uncomment the .shtml mime type -->
+ <!-- definition towards the bottom of this file. -->
+ <!-- The contentType init param allows you to apply SSI processing to JSP -->
+ <!-- pages, javascript, or any other content you wish. This filter -->
+ <!-- supports the following initialization parameters (default values are -->
+ <!-- in square brackets): -->
+ <!-- -->
+ <!-- contentType A regex pattern that must be matched before -->
+ <!-- SSI processing is applied. -->
+ <!-- [text/x-server-parsed-html(;.*)?] -->
+ <!-- -->
+ <!-- debug Debugging detail level for messages logged -->
+ <!-- by this servlet. [0] -->
+ <!-- -->
+ <!-- expires The number of seconds before a page with SSI -->
+ <!-- directives will expire. [No default] -->
+ <!-- -->
+ <!-- isVirtualWebappRelative -->
+ <!-- Should "virtual" paths be interpreted as -->
+ <!-- relative to the context root, instead of -->
+ <!-- the server root? (0=false, 1=true) [0] -->
+ <!-- -->
+ <!-- allowExec Is use of the exec command enabled? [false] -->
+
+<!--
+ <filter>
+ <filter-name>ssi</filter-name>
+ <filter-class>
+ org.apache.catalina.ssi.SSIFilter
+ </filter-class>
+ <init-param>
+ <param-name>contentType</param-name>
+ <param-value>text/x-server-parsed-html(;.*)?</param-value>
+ </init-param>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ <init-param>
+ <param-name>expires</param-name>
+ <param-value>666</param-value>
+ </init-param>
+ <init-param>
+ <param-name>isVirtualWebappRelative</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ </filter>
+-->
+
+
+ <!-- ==================== Built In Filter Mappings ====================== -->
+
+ <!-- The mapping for the SSI Filter -->
+<!--
+ <filter-mapping>
+ <filter-name>ssi</filter-name>
+ <url-pattern>*.shtml</url-pattern>
+ </filter-mapping>
+-->
+
+
+ <!-- ==================== Default Session Configuration ================= -->
+ <!-- You can set the default session timeout (in minutes) for all newly -->
+ <!-- created sessions by modifying the value below. -->
+
+ <session-config>
+ <session-timeout>30</session-timeout>
+ </session-config>
+
+
+ <!-- ===================== Default MIME Type Mappings =================== -->
+ <!-- When serving static resources, Tomcat will automatically generate -->
+ <!-- a "Content-Type" header based on the resource's filename extension, -->
+ <!-- based on these mappings. Additional mappings can be added here (to -->
+ <!-- apply to all web applications), or in your own application's web.xml -->
+ <!-- deployment descriptor. -->
+
+ <mime-mapping>
+ <extension>abs</extension>
+ <mime-type>audio/x-mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ai</extension>
+ <mime-type>application/postscript</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>aif</extension>
+ <mime-type>audio/x-aiff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>aifc</extension>
+ <mime-type>audio/x-aiff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>aiff</extension>
+ <mime-type>audio/x-aiff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>aim</extension>
+ <mime-type>application/x-aim</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>art</extension>
+ <mime-type>image/x-jg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>asf</extension>
+ <mime-type>video/x-ms-asf</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>asx</extension>
+ <mime-type>video/x-ms-asf</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>au</extension>
+ <mime-type>audio/basic</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>avi</extension>
+ <mime-type>video/x-msvideo</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>avx</extension>
+ <mime-type>video/x-rad-screenplay</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>bcpio</extension>
+ <mime-type>application/x-bcpio</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>bin</extension>
+ <mime-type>application/octet-stream</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>bmp</extension>
+ <mime-type>image/bmp</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>body</extension>
+ <mime-type>text/html</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>cdf</extension>
+ <mime-type>application/x-cdf</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>cer</extension>
+ <mime-type>application/x-x509-ca-cert</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>class</extension>
+ <mime-type>application/java</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>cpio</extension>
+ <mime-type>application/x-cpio</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>csh</extension>
+ <mime-type>application/x-csh</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>css</extension>
+ <mime-type>text/css</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>dib</extension>
+ <mime-type>image/bmp</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>doc</extension>
+ <mime-type>application/msword</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>dtd</extension>
+ <mime-type>application/xml-dtd</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>dv</extension>
+ <mime-type>video/x-dv</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>dvi</extension>
+ <mime-type>application/x-dvi</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>eps</extension>
+ <mime-type>application/postscript</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>etx</extension>
+ <mime-type>text/x-setext</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>exe</extension>
+ <mime-type>application/octet-stream</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>gif</extension>
+ <mime-type>image/gif</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>gtar</extension>
+ <mime-type>application/x-gtar</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>gz</extension>
+ <mime-type>application/x-gzip</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>hdf</extension>
+ <mime-type>application/x-hdf</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>hqx</extension>
+ <mime-type>application/mac-binhex40</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>htc</extension>
+ <mime-type>text/x-component</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>htm</extension>
+ <mime-type>text/html</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>html</extension>
+ <mime-type>text/html</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>hqx</extension>
+ <mime-type>application/mac-binhex40</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ief</extension>
+ <mime-type>image/ief</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jad</extension>
+ <mime-type>text/vnd.sun.j2me.app-descriptor</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jar</extension>
+ <mime-type>application/java-archive</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>java</extension>
+ <mime-type>text/plain</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jnlp</extension>
+ <mime-type>application/x-java-jnlp-file</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jpe</extension>
+ <mime-type>image/jpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jpeg</extension>
+ <mime-type>image/jpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jpg</extension>
+ <mime-type>image/jpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>js</extension>
+ <mime-type>text/javascript</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jsf</extension>
+ <mime-type>text/plain</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jspf</extension>
+ <mime-type>text/plain</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>kar</extension>
+ <mime-type>audio/x-midi</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>latex</extension>
+ <mime-type>application/x-latex</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>m3u</extension>
+ <mime-type>audio/x-mpegurl</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mac</extension>
+ <mime-type>image/x-macpaint</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>man</extension>
+ <mime-type>application/x-troff-man</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mathml</extension>
+ <mime-type>application/mathml+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>me</extension>
+ <mime-type>application/x-troff-me</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mid</extension>
+ <mime-type>audio/x-midi</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>midi</extension>
+ <mime-type>audio/x-midi</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mif</extension>
+ <mime-type>application/x-mif</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mov</extension>
+ <mime-type>video/quicktime</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>movie</extension>
+ <mime-type>video/x-sgi-movie</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mp1</extension>
+ <mime-type>audio/x-mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mp2</extension>
+ <mime-type>audio/x-mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mp3</extension>
+ <mime-type>audio/x-mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mp4</extension>
+ <mime-type>video/mp4</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mpa</extension>
+ <mime-type>audio/x-mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mpe</extension>
+ <mime-type>video/mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mpeg</extension>
+ <mime-type>video/mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mpega</extension>
+ <mime-type>audio/x-mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mpg</extension>
+ <mime-type>video/mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mpv2</extension>
+ <mime-type>video/mpeg2</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ms</extension>
+ <mime-type>application/x-wais-source</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>nc</extension>
+ <mime-type>application/x-netcdf</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>oda</extension>
+ <mime-type>application/oda</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Database -->
+ <extension>odb</extension>
+ <mime-type>application/vnd.oasis.opendocument.database</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Chart -->
+ <extension>odc</extension>
+ <mime-type>application/vnd.oasis.opendocument.chart</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Formula -->
+ <extension>odf</extension>
+ <mime-type>application/vnd.oasis.opendocument.formula</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Drawing -->
+ <extension>odg</extension>
+ <mime-type>application/vnd.oasis.opendocument.graphics</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Image -->
+ <extension>odi</extension>
+ <mime-type>application/vnd.oasis.opendocument.image</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Master Document -->
+ <extension>odm</extension>
+ <mime-type>application/vnd.oasis.opendocument.text-master</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Presentation -->
+ <extension>odp</extension>
+ <mime-type>application/vnd.oasis.opendocument.presentation</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Spreadsheet -->
+ <extension>ods</extension>
+ <mime-type>application/vnd.oasis.opendocument.spreadsheet</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Text -->
+ <extension>odt</extension>
+ <mime-type>application/vnd.oasis.opendocument.text</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Drawing Template -->
+ <extension>otg </extension>
+ <mime-type>application/vnd.oasis.opendocument.graphics-template</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- HTML Document Template -->
+ <extension>oth</extension>
+ <mime-type>application/vnd.oasis.opendocument.text-web</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Presentation Template -->
+ <extension>otp</extension>
+ <mime-type>application/vnd.oasis.opendocument.presentation-template</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Spreadsheet Template -->
+ <extension>ots</extension>
+ <mime-type>application/vnd.oasis.opendocument.spreadsheet-template </mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Text Template -->
+ <extension>ott</extension>
+ <mime-type>application/vnd.oasis.opendocument.text-template</mime-type>
+ </mime-mapping>
+ <!-- xiph mime types -->
+ <mime-mapping>
+ <extension>ogx</extension>
+ <mime-type>application/ogg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ogv</extension>
+ <mime-type>video/ogg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>oga</extension>
+ <mime-type>audio/ogg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ogg</extension>
+ <mime-type>audio/ogg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>spx</extension>
+ <mime-type>audio/ogg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>flac</extension>
+ <mime-type>audio/flac</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>anx</extension>
+ <mime-type>application/annodex</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>axa</extension>
+ <mime-type>audio/annodex</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>axv</extension>
+ <mime-type>video/annodex</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xspf</extension>
+ <mime-type>application/xspf+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pbm</extension>
+ <mime-type>image/x-portable-bitmap</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pct</extension>
+ <mime-type>image/pict</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pdf</extension>
+ <mime-type>application/pdf</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pgm</extension>
+ <mime-type>image/x-portable-graymap</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pic</extension>
+ <mime-type>image/pict</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pict</extension>
+ <mime-type>image/pict</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pls</extension>
+ <mime-type>audio/x-scpls</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>png</extension>
+ <mime-type>image/png</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pnm</extension>
+ <mime-type>image/x-portable-anymap</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pnt</extension>
+ <mime-type>image/x-macpaint</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ppm</extension>
+ <mime-type>image/x-portable-pixmap</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ppt</extension>
+ <mime-type>application/vnd.ms-powerpoint</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pps</extension>
+ <mime-type>application/vnd.ms-powerpoint</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ps</extension>
+ <mime-type>application/postscript</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>psd</extension>
+ <mime-type>image/x-photoshop</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>qt</extension>
+ <mime-type>video/quicktime</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>qti</extension>
+ <mime-type>image/x-quicktime</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>qtif</extension>
+ <mime-type>image/x-quicktime</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ras</extension>
+ <mime-type>image/x-cmu-raster</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>rdf</extension>
+ <mime-type>application/rdf+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>rgb</extension>
+ <mime-type>image/x-rgb</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>rm</extension>
+ <mime-type>application/vnd.rn-realmedia</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>roff</extension>
+ <mime-type>application/x-troff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>rtf</extension>
+ <mime-type>application/rtf</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>rtx</extension>
+ <mime-type>text/richtext</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>sh</extension>
+ <mime-type>application/x-sh</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>shar</extension>
+ <mime-type>application/x-shar</mime-type>
+ </mime-mapping>
+<!--
+ <mime-mapping>
+ <extension>shtml</extension>
+ <mime-type>text/x-server-parsed-html</mime-type>
+ </mime-mapping>
+-->
+ <mime-mapping>
+ <extension>smf</extension>
+ <mime-type>audio/x-midi</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>sit</extension>
+ <mime-type>application/x-stuffit</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>snd</extension>
+ <mime-type>audio/basic</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>src</extension>
+ <mime-type>application/x-wais-source</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>sv4cpio</extension>
+ <mime-type>application/x-sv4cpio</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>sv4crc</extension>
+ <mime-type>application/x-sv4crc</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>svg</extension>
+ <mime-type>image/svg+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>svgz</extension>
+ <mime-type>image/svg+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>swf</extension>
+ <mime-type>application/x-shockwave-flash</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>t</extension>
+ <mime-type>application/x-troff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>tar</extension>
+ <mime-type>application/x-tar</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>tcl</extension>
+ <mime-type>application/x-tcl</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>tex</extension>
+ <mime-type>application/x-tex</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>texi</extension>
+ <mime-type>application/x-texinfo</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>texinfo</extension>
+ <mime-type>application/x-texinfo</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>tif</extension>
+ <mime-type>image/tiff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>tiff</extension>
+ <mime-type>image/tiff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>tr</extension>
+ <mime-type>application/x-troff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>tsv</extension>
+ <mime-type>text/tab-separated-values</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>txt</extension>
+ <mime-type>text/plain</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ulw</extension>
+ <mime-type>audio/basic</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ustar</extension>
+ <mime-type>application/x-ustar</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>vxml</extension>
+ <mime-type>application/voicexml+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xbm</extension>
+ <mime-type>image/x-xbitmap</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xht</extension>
+ <mime-type>application/xhtml+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xhtml</extension>
+ <mime-type>application/xhtml+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xls</extension>
+ <mime-type>application/vnd.ms-excel</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xml</extension>
+ <mime-type>application/xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xpm</extension>
+ <mime-type>image/x-xpixmap</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xsl</extension>
+ <mime-type>application/xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xslt</extension>
+ <mime-type>application/xslt+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xul</extension>
+ <mime-type>application/vnd.mozilla.xul+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xwd</extension>
+ <mime-type>image/x-xwindowdump</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>vsd</extension>
+ <mime-type>application/x-visio</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>wav</extension>
+ <mime-type>audio/x-wav</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- Wireless Bitmap -->
+ <extension>wbmp</extension>
+ <mime-type>image/vnd.wap.wbmp</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- WML Source -->
+ <extension>wml</extension>
+ <mime-type>text/vnd.wap.wml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- Compiled WML -->
+ <extension>wmlc</extension>
+ <mime-type>application/vnd.wap.wmlc</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- WML Script Source -->
+ <extension>wmls</extension>
+ <mime-type>text/vnd.wap.wmlscript</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- Compiled WML Script -->
+ <extension>wmlscriptc</extension>
+ <mime-type>application/vnd.wap.wmlscriptc</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>wmv</extension>
+ <mime-type>video/x-ms-wmv</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>wrl</extension>
+ <mime-type>x-world/x-vrml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>wspolicy</extension>
+ <mime-type>application/wspolicy+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>Z</extension>
+ <mime-type>application/x-compress</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>z</extension>
+ <mime-type>application/x-compress</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>zip</extension>
+ <mime-type>application/zip</mime-type>
+ </mime-mapping>
+
+ <!-- ==================== Default Welcome File List ===================== -->
+ <!-- When a request URI refers to a directory, the default servlet looks -->
+ <!-- for a "welcome file" within that directory and, if present, to the -->
+ <!-- corresponding resource URI for display. -->
+ <!-- If none welcome file are present, the default servlet either serves -->
+ <!-- a directory listing (see default servlet configuration on how to -->
+ <!-- customize) or returns a 404 status, depending on the value of the -->
+ <!-- listings setting. -->
+ <!-- -->
+ <!-- If you define welcome files in your own application's web.xml -->
+ <!-- deployment descriptor, that list *replaces* the list configured -->
+ <!-- here, so be sure to include any of the default values that you wish -->
+ <!-- use within your application. -->
+
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+
+</web-app>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode/blob/cd6efc8e/tomee/src/main/java/org/apache/ode/tomee/Constants.java
----------------------------------------------------------------------
diff --git a/tomee/src/main/java/org/apache/ode/tomee/Constants.java b/tomee/src/main/java/org/apache/ode/tomee/Constants.java
new file mode 100644
index 0000000..3ac4792
--- /dev/null
+++ b/tomee/src/main/java/org/apache/ode/tomee/Constants.java
@@ -0,0 +1,46 @@
+/*
+ * 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.ode.tomee;
+
+public interface Constants {
+
+ public static final String TOMEE_XML = "tomee.xml";
+ public static final String TOMEE_SYSTEM_CONFIG = "system.properties";
+ public static final String ODE_TOMEE_CONFIG = "ode-tomee.properties";
+
+ public static final String DIR = "dir";
+ public static final String HOST = "host";
+ public static final String HTTP2 = "http2";
+ public static final String HTTP_PORT = "httpPort";
+ public static final String HTTPS_PORT = "httpsPort";
+ public static final String KEEP_SERVER_XML_AS_THIS = "keepServerXmlAsThis";
+ public static final String KEY_ALIAS = "keyAlias";
+ public static final String KEY_STORE_FILE = "keystoreFile";
+ public static final String KEY_STAORE_PASS = "keystorePass";
+ public static final String KEY_STORE_TYPE = "keystoreType";
+ public static final String QUICK_SESSION = "quickSession";
+ public static final String SERVER_XML = "serverXml";
+ public static final String SKIP_HTTP = "skipHttp";
+ public static final String SSL = "ssl";
+ public static final String SSL_PROPTOCOL = "sslProtocol";
+ public static final String STOP_PORT = "stopPort";
+ public static final String WEB_RESOURCE_CACHED = "webResourceCached";
+ public static final String WEB_XML = "webXml";
+}
http://git-wip-us.apache.org/repos/asf/ode/blob/cd6efc8e/tomee/src/main/java/org/apache/ode/tomee/Main.java
----------------------------------------------------------------------
diff --git a/tomee/src/main/java/org/apache/ode/tomee/Main.java b/tomee/src/main/java/org/apache/ode/tomee/Main.java
new file mode 100644
index 0000000..f5088aa
--- /dev/null
+++ b/tomee/src/main/java/org/apache/ode/tomee/Main.java
@@ -0,0 +1,42 @@
+/*
+ * 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.ode.tomee;
+
+import java.io.File;
+
+public class Main {
+ public static void main(String[] args) {
+ String home = System.getProperty("ode.server.home");
+ TomeeLauncher launcher = new TomeeLauncher(home);
+ try {
+ launcher.initialize();
+ launcher.start();
+ launcher.deploy(new File(home,"webapps/ode"), "ode");
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ launcher.stop();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
\ No newline at end of file
[05/10] ode git commit: ODE-1060: Registered shutdown hook
Posted by sa...@apache.org.
ODE-1060: Registered shutdown hook
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/18f6ec66
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/18f6ec66
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/18f6ec66
Branch: refs/heads/ode-1.3.x
Commit: 18f6ec661151ee1ae030ef2052b15d143a6d0e0c
Parents: 8e40c67
Author: sathwik <sa...@apache.org>
Authored: Fri Aug 12 19:59:34 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Fri Aug 12 19:59:34 2016 +0530
----------------------------------------------------------------------
.../main/java/org/apache/ode/tomee/Main.java | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/18f6ec66/tomee/src/main/java/org/apache/ode/tomee/Main.java
----------------------------------------------------------------------
diff --git a/tomee/src/main/java/org/apache/ode/tomee/Main.java b/tomee/src/main/java/org/apache/ode/tomee/Main.java
index f5088aa..852e23c 100644
--- a/tomee/src/main/java/org/apache/ode/tomee/Main.java
+++ b/tomee/src/main/java/org/apache/ode/tomee/Main.java
@@ -24,19 +24,25 @@ import java.io.File;
public class Main {
public static void main(String[] args) {
String home = System.getProperty("ode.server.home");
- TomeeLauncher launcher = new TomeeLauncher(home);
+ final TomeeLauncher launcher = new TomeeLauncher(home);
try {
launcher.initialize();
launcher.start();
+
+ Runtime.getRuntime().addShutdownHook(new Thread() {
+ public void run() {
+ try {
+ launcher.stop();
+ System.out.println("Continer stopped");
+ } catch (final Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+
launcher.deploy(new File(home,"webapps/ode"), "ode");
} catch (Exception e) {
e.printStackTrace();
- } finally {
- try {
- launcher.stop();
- } catch (Exception e) {
- e.printStackTrace();
- }
}
}
}
\ No newline at end of file
[08/10] ode git commit: fix for NoSuchElement Exception during
deployment
Posted by sa...@apache.org.
fix for NoSuchElement Exception during deployment
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/818fbf7d
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/818fbf7d
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/818fbf7d
Branch: refs/heads/ode-1.3.x
Commit: 818fbf7da2eb67117760f79568cb9b2f4f23d42a
Parents: 3d31943
Author: sathwik <sa...@apache.org>
Authored: Wed Sep 14 11:26:28 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Wed Sep 14 11:26:28 2016 +0530
----------------------------------------------------------------------
.../main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/818fbf7d/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
----------------------------------------------------------------------
diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
index f161d6e..e4c2fe0 100644
--- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
+++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
@@ -109,7 +109,7 @@ public class BPELDAOConnectionImpl implements BpelDAOConnection {
public ProcessDAO getProcess(QName processId) {
List l = _em.createQuery("select x from ProcessDAOImpl x where x._processId = ?1")
.setParameter(1, processId.toString()).getResultList();
- if (l.size() == 0) return null;
+ if (l.isEmpty()) return null;
ProcessDAOImpl p = (ProcessDAOImpl) l.get(0);
return p;
}
[09/10] ode git commit: ODE-1060: Added env parameters needs for
release
Posted by sa...@apache.org.
ODE-1060: Added env parameters needs for release
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/34060209
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/34060209
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/34060209
Branch: refs/heads/ode-1.3.x
Commit: 340602096737ad79eadd77d0581badac48ede4ec
Parents: 818fbf7
Author: sathwik <sa...@apache.org>
Authored: Sat Sep 24 11:48:22 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Sat Sep 24 11:48:22 2016 +0530
----------------------------------------------------------------------
ci-build.sh | 35 ++++++++++++++++++++++++++++++-----
1 file changed, 30 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/34060209/ci-build.sh
----------------------------------------------------------------------
diff --git a/ci-build.sh b/ci-build.sh
index 76adcc9..e76f3c0 100755
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -15,7 +15,7 @@
#!/bin/sh
-docker pull vanto/apache-buildr:latest-jruby-jdk7
+docker pull sathwik/apache-buildr:latest-jruby-jdk7
export JAVA_OPTS="-Xmx1024M -XX:MaxPermSize=512M"
BUILDR_ARGS="$@"
@@ -25,12 +25,37 @@ HOMEDIR="/home/$CONTAINER_USERNAME"
GROUP_ID=$(id -g)
USER_ID=$( id -u)
-CREATE_USER_COMMAND="groupadd -f -g $GROUP_ID $CONTAINER_GROUPNAME && useradd -u $USER_ID -g $CONTAINER_GROUPNAME $CONTAINER_USERNAME && mkdir --parent $HOMEDIR && chown -R $CONTAINER_USERNAME:$CONTAINER_GROUPNAME $HOMEDIR"
+CREATE_USER_COMMAND="groupadd -f -g $GROUP_ID $CONTAINER_GROUPNAME \
+&& useradd -u $USER_ID -g $CONTAINER_GROUPNAME $CONTAINER_USERNAME \
+&& mkdir --parent $HOMEDIR \
+&& chown -R $CONTAINER_USERNAME:$CONTAINER_GROUPNAME $HOMEDIR"
-BUNDLER_COMMAND="/opt/jruby/bin/jruby -S bundler install --gemfile=/workspace/Gemfile"
+BUNDLER_COMMAND="jruby -S bundler install --gemfile=/workspace/Gemfile"
-BUILDR_COMMAND="su $CONTAINER_USERNAME -c '/opt/jruby/bin/jruby -S buildr $BUILDR_ARGS'"
+BUILDR_COMMAND="su $CONTAINER_USERNAME -c 'buildr $BUILDR_ARGS'"
FINAL_COMMAND="$CREATE_USER_COMMAND && $BUNDLER_COMMAND && $BUILDR_COMMAND"
-docker run --rm -e JAVADOC=no -e JAVA_OPTS -v `pwd`:/workspace -v $HOME/.m2:/home/dummy/.m2 -v $HOME/.buildr:/home/dummy/.buildr -v /tmp:/tmp --entrypoint bash vanto/apache-buildr:latest-jruby-jdk7 -c "$FINAL_COMMAND"
+
+## For release set these arguments with proper values
+## export JAVADOC=ON
+## export BUILDR_ENV=production
+## export NEXT_VERSION=
+## export GNUPGHOME="$HOME/.gnupg"
+## export GPG_USER=
+## export GPG_PASS=
+
+#mount volume for release -v $GNUPGHOME:/home/dummy/.gnupg
+
+docker run --rm \
+ -e JAVADOC=$JAVADOC \
+ -e NEXT_VERSION=$NEXT_VERSION \
+ -e GPG_USER=$GPG_USER \
+ -e GPG_PASS=$GPG_PASS \
+ -e BUILDR_ENV=$BUILDR_ENV \
+ -e JAVA_OPTS \
+ -v `pwd`:/workspace \
+ -v $HOME/.m2:/home/dummy/.m2 \
+ -v $HOME/.buildr:/home/dummy/.buildr \
+ -v /tmp:/tmp \
+ --entrypoint bash sathwik/apache-buildr:latest-jruby-jdk7 -c "$FINAL_COMMAND";