You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2014/11/26 13:35:27 UTC
[2/6] marmotta git commit: MARMOTTA-572,
MARMOTTA-473: removed jetty-web.xml from META-INF
MARMOTTA-572, MARMOTTA-473: removed jetty-web.xml from META-INF
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/e199430a
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/e199430a
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/e199430a
Branch: refs/heads/develop
Commit: e199430aad6649845eb32aae4318edb8a09ebdda
Parents: 462019c
Author: Jakob Frank <ja...@apache.org>
Authored: Wed Nov 26 12:50:32 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Wed Nov 26 12:51:31 2014 +0100
----------------------------------------------------------------------
.../src/main/webapp/META-INF/jetty-web.xml | 30 --------------------
.../src/main/webapp/META-INF/jetty-web.xml | 27 ------------------
2 files changed, 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e199430a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/META-INF/jetty-web.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/META-INF/jetty-web.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/META-INF/jetty-web.xml
deleted file mode 100644
index a5c38d0..0000000
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/META-INF/jetty-web.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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.
-
--->
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext">
- <Call class="org.jboss.weld.environment.jetty.WeldServletHandler" name="process">
- <Arg><Ref id="webAppCtx"/></Arg>
- </Call>
-</Configure>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e199430a/launchers/marmotta-webapp/src/main/webapp/META-INF/jetty-web.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/webapp/META-INF/jetty-web.xml b/launchers/marmotta-webapp/src/main/webapp/META-INF/jetty-web.xml
deleted file mode 100644
index db9e86e..0000000
--- a/launchers/marmotta-webapp/src/main/webapp/META-INF/jetty-web.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.
-
--->
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext">
- <Call class="org.jboss.weld.environment.jetty.WeldServletHandler" name="process">
- <Arg><Ref id="webAppCtx"/></Arg>
- </Call>
-</Configure>