Return-Path: X-Original-To: apmail-marmotta-commits-archive@minotaur.apache.org Delivered-To: apmail-marmotta-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DB01410B56 for ; Thu, 3 Oct 2013 15:07:49 +0000 (UTC) Received: (qmail 44013 invoked by uid 500); 3 Oct 2013 15:07:33 -0000 Delivered-To: apmail-marmotta-commits-archive@marmotta.apache.org Received: (qmail 43946 invoked by uid 500); 3 Oct 2013 15:07:32 -0000 Mailing-List: contact commits-help@marmotta.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@marmotta.incubator.apache.org Delivered-To: mailing list commits@marmotta.incubator.apache.org Received: (qmail 43809 invoked by uid 99); 3 Oct 2013 15:07:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Oct 2013 15:07:28 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 03 Oct 2013 15:07:23 +0000 Received: (qmail 43366 invoked by uid 99); 3 Oct 2013 15:07:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Oct 2013 15:07:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B9D4C90E85E; Thu, 3 Oct 2013 15:07:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sschaffert@apache.org To: commits@marmotta.incubator.apache.org Date: Thu, 03 Oct 2013 15:07:09 -0000 Message-Id: In-Reply-To: <920df1eb36964e14bf159fcb6f5142a4@git.apache.org> References: <920df1eb36964e14bf159fcb6f5142a4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/22] really add the webapp launcher for bigdata X-Virus-Checked: Checked by ClamAV on apache.org http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5598e30d/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/NOTICE b/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/NOTICE new file mode 100644 index 0000000..f2b7b92 --- /dev/null +++ b/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/NOTICE @@ -0,0 +1,42 @@ +Apache Marmotta Webapp +Copyright 2012-2013 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org). + +Portions of this software were originally based on the following: + + Copyright 2008-2012 Salzburg Research Forschungsgesellschaft mbH + +These have been licensed to the Apache Software Foundation under a software grant. + +This product also includes some third-party binary components: + + * H2 Database, Copyright (c) 2013 H2 Group, is licensed under the Eclipse Public + License (EPL) 1.0. The original software is available from http://www.h2database.com + + * Logback, Copyright (C) 2012 QOS.ch, is licensed under the Eclipse Public + License (EPL) 1.0. The original software is available from http://logback.qos.ch + + * Javassist, Copyright (c) 2013 Shigeru Chiba, is licensed under the Mozilla + Public License (MPL) 1.1. The original software is available from + http://www.jboss.org/javassist + + * Java Activation, Copyright (c) 2012 Oracle Corporation, is licensed under the + Common Development and Distribution License (CDDL) v1.0. The original software + is available from http://www.oracle.com + + * Java Servlet API, Copyright (c) 2012 Oracle Corporation, is licensed under the + Common Development and Distribution License (CDDL) v1.0. The original software + is available from http://www.oracle.com + + * Common Annotations (JSR-250), Copyright (c) 2012 Oracle Corporation, is licensed + under the Common Development and Distribution License (CDDL) v1.0. The original + software is available from http://www.oracle.com + + * Expression Language, Copyright (c) 2012 Oracle Corporation, is licensed under + the Common Development and Distribution License (CDDL) v1.0. The original + software is available from http://www.oracle.com + + * Javolution, Copyright (c) 2012 Javolution, is licensed under BSD license. The + original source code is available from http://javolution.org http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5598e30d/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/jetty-web.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/jetty-web.xml b/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/jetty-web.xml new file mode 100644 index 0000000..db9e86e --- /dev/null +++ b/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/jetty-web.xml @@ -0,0 +1,27 @@ + + + + + + + + + http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5598e30d/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/jetty-web.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/jetty-web.xml b/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/jetty-web.xml new file mode 100644 index 0000000..df4c63e --- /dev/null +++ b/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/jetty-web.xml @@ -0,0 +1,36 @@ + + + + + + + org.mortbay.jetty.webapp.WebInfConfiguration + org.mortbay.jetty.plus.webapp.EnvConfiguration + org.mortbay.jetty.annotations.Configuration + org.mortbay.jetty.webapp.JettyWebXmlConfiguration + org.mortbay.jetty.webapp.TagLibConfiguration + + + + + + http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5598e30d/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/web.xml b/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..6531907 --- /dev/null +++ b/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,163 @@ + + + + + + + org.apache.marmotta.platform.core.jndi.MarmottaJndiListener + + + + + org.jboss.weld.environment.servlet.Listener + + + + + org.apache.marmotta.platform.core.servlet.MarmottaPreStartupListener + + + + + org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap + + + + + marmotta.home + /tmp/marmotta + + + + + MarmottaOptionsFilter + org.apache.marmotta.platform.core.servlet.MarmottaOptionsFilter + + + MarmottaOptionsFilter + /* + + + + + + + CORS + com.thetransactioncompany.cors.CORSFilter + + + cors.supportedMethods + GET, HEAD, POST, PUT, DELETE, OPTIONS + + + + cors.supportedHeaders + Origin, Accept, Content-Type + + + + + CORS + /* + + + + + MarmottaPreStartupFilter + org.apache.marmotta.platform.core.servlet.MarmottaPreStartupFilter + + + MarmottaPreStartupFilter + /* + + + + + MarmottaResourceFilter + org.apache.marmotta.platform.core.servlet.MarmottaResourceFilter + + + kiwi.resourceCaching + true + + + + MarmottaResourceFilter + /* + + + + .xsl + + application/xslt+xml + + + + ViewStatusMessages + ch.qos.logback.classic.ViewStatusMessagesServlet + + + + ViewStatusMessages + /logging/status + + + + MarmottaWebservices + + org.jboss.resteasy.plugins.server.servlet.FilterDispatcher + + + javax.ws.rs.Application + org.apache.marmotta.platform.core.webservices.CoreApplication + + + + + MarmottaWebservices + /* + + + + resteasy.injector.factory + org.jboss.resteasy.cdi.CdiInjectorFactory + + + + + + MarmottaPostStartupFilter + + org.apache.marmotta.platform.core.servlet.MarmottaPostStartupFilter + + + + MarmottaPostStartupFilter + /* + + + http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5598e30d/launchers/marmotta-webapp-bigdata/src/main/webapp/index.jsp ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp-bigdata/src/main/webapp/index.jsp b/launchers/marmotta-webapp-bigdata/src/main/webapp/index.jsp new file mode 100644 index 0000000..a57f3d8 --- /dev/null +++ b/launchers/marmotta-webapp-bigdata/src/main/webapp/index.jsp @@ -0,0 +1,25 @@ +<%-- + + 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. + +--%> +<%@ page import="org.apache.marmotta.platform.core.api.config.ConfigurationService" %> +<%@ page import="org.apache.marmotta.platform.core.util.CDIContext" %> +<% + ConfigurationService configurationService = CDIContext.getInstance(ConfigurationService.class); + response.sendRedirect(configurationService.getBaseUri()+configurationService.getStringConfiguration("kiwi.pages.startup")); +%> http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5598e30d/launchers/marmotta-webapp-bigdata/src/test/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp-bigdata/src/test/resources/META-INF/beans.xml b/launchers/marmotta-webapp-bigdata/src/test/resources/META-INF/beans.xml new file mode 100644 index 0000000..6504987 --- /dev/null +++ b/launchers/marmotta-webapp-bigdata/src/test/resources/META-INF/beans.xml @@ -0,0 +1,26 @@ + + + + + + http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5598e30d/launchers/marmotta-webapp-bigdata/src/test/resources/META-INF/test-persistence.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp-bigdata/src/test/resources/META-INF/test-persistence.xml b/launchers/marmotta-webapp-bigdata/src/test/resources/META-INF/test-persistence.xml new file mode 100644 index 0000000..1043848 --- /dev/null +++ b/launchers/marmotta-webapp-bigdata/src/test/resources/META-INF/test-persistence.xml @@ -0,0 +1,83 @@ + + + + + + + + + + org.apache.marmotta.platform.core.model.rdf.KiWiNode + org.apache.marmotta.platform.core.model.rdf.KiWiResource + org.apache.marmotta.platform.core.model.rdf.KiWiUriResource + org.apache.marmotta.platform.core.model.rdf.KiWiAnonResource + org.apache.marmotta.platform.core.model.rdf.KiWiLiteral + org.apache.marmotta.platform.core.model.rdf.KiWiStringLiteral + org.apache.marmotta.platform.core.model.rdf.KiWiIntLiteral + org.apache.marmotta.platform.core.model.rdf.KiWiDoubleLiteral + org.apache.marmotta.platform.core.model.rdf.KiWiTextContentLiteral + org.apache.marmotta.platform.core.model.rdf.KiWiMediaContentLiteral + + org.apache.marmotta.platform.core.model.rdf.KiWiNamespace + org.apache.marmotta.platform.core.model.rdf.KiWiTriple + + org.apache.marmotta.platform.user.model.UserAccount + + + + + org.apache.marmotta.platform.versioning.model.Version + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5598e30d/launchers/marmotta-webapp-bigdata/src/test/resources/WEB-INF/test-web.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp-bigdata/src/test/resources/WEB-INF/test-web.xml b/launchers/marmotta-webapp-bigdata/src/test/resources/WEB-INF/test-web.xml new file mode 100644 index 0000000..7c88ab0 --- /dev/null +++ b/launchers/marmotta-webapp-bigdata/src/test/resources/WEB-INF/test-web.xml @@ -0,0 +1,188 @@ + + + + + + + + + BeanManager + + javax.enterprise.inject.spi.BeanManager + + + + + KiWiInitFilter + org.apache.marmotta.platform.core.servlet.KiWiResourceFilter + + kiwi.home + /tmp/kiwi-test + + + + KiWiInitFilter + /* + + + + + + org.jboss.weld.environment.servlet.Listener + + + + + + + org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap + + + + + db.url + jdbc:h2:/tmp/kiwi-test/db/kiwi2;MVCC=true;DB_CLOSE_ON_EXIT=FALSE + + + db.user + sa + + + db.password + sa + + + db.tcpServer + -tcpAllowOthers + + + org.h2.server.web.DbStarter + + + H2Console + org.h2.server.web.WebServlet + + 1 + + + H2Console + /h2/* + + + + + + + + + + + + SolrRequestFilter + org.apache.solr.servlet.SolrDispatchFilter + + path-prefix + /solr + + + + + + SolrRequestFilter + /solr/* + + + + + .xsl + + application/xslt+xml + + + + + + + + + SimpleCachingHeadersPageCachingFilter + net.sf.ehcache.constructs.web.filter.SimpleCachingHeadersPageCachingFilter + + suppressStackTraces + false + + + cacheName + PageCache + + + + + + + + KiWi Webservices + + org.jboss.resteasy.plugins.server.servlet.FilterDispatcher + + + javax.ws.rs.Application + org.apache.marmotta.platform.core.webservices.CoreApplication + + + + + KiWi Webservices + /* + + + + resteasy.injector.factory + org.jboss.resteasy.cdi.CdiInjectorFactory + + + + + ServletTestRunner + org.jboss.arquillian.protocol.servlet_3.ServletTestRunner + + + + + ServletTestRunner + /ArquillianServletRunner + + + http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5598e30d/launchers/marmotta-webapp-bigdata/src/test/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp-bigdata/src/test/resources/arquillian.xml b/launchers/marmotta-webapp-bigdata/src/test/resources/arquillian.xml new file mode 100644 index 0000000..379bb29 --- /dev/null +++ b/launchers/marmotta-webapp-bigdata/src/test/resources/arquillian.xml @@ -0,0 +1,27 @@ + + + + + + true + + + http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5598e30d/launchers/marmotta-webapp-bigdata/src/test/resources/ehcache.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp-bigdata/src/test/resources/ehcache.xml b/launchers/marmotta-webapp-bigdata/src/test/resources/ehcache.xml new file mode 100644 index 0000000..7cd8120 --- /dev/null +++ b/launchers/marmotta-webapp-bigdata/src/test/resources/ehcache.xml @@ -0,0 +1,377 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5598e30d/launchers/marmotta-webapp-bigdata/src/test/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp-bigdata/src/test/resources/jndi.properties b/launchers/marmotta-webapp-bigdata/src/test/resources/jndi.properties new file mode 100644 index 0000000..72a02c6 --- /dev/null +++ b/launchers/marmotta-webapp-bigdata/src/test/resources/jndi.properties @@ -0,0 +1,14 @@ +# +# Licensed 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. +# + http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5598e30d/launchers/marmotta-webapp-bigdata/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp-bigdata/src/test/resources/logback.xml b/launchers/marmotta-webapp-bigdata/src/test/resources/logback.xml new file mode 100644 index 0000000..19b0144 --- /dev/null +++ b/launchers/marmotta-webapp-bigdata/src/test/resources/logback.xml @@ -0,0 +1,68 @@ + + + + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + kiwi-test.log + true + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5598e30d/launchers/marmotta-webapp-bigdata/src/test/resources/test-config.properties ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp-bigdata/src/test/resources/test-config.properties b/launchers/marmotta-webapp-bigdata/src/test/resources/test-config.properties new file mode 100644 index 0000000..1ac0b04 --- /dev/null +++ b/launchers/marmotta-webapp-bigdata/src/test/resources/test-config.properties @@ -0,0 +1,71 @@ +# +# Licensed 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. +# + +##################################################################################################################### +# KiWi core configuration +##################################################################################################################### + + +# KiWi version +kiwi.version = 1.99.1 + +# KiWi home directory (for configuration files etc) +kiwi.home = /tmp/kiwi-test + +# directory where KiWi stores the search index for SOLR search +solr.home = ${kiwi.home}/solr + +# directory where KiWi stores the triple index for SPARQL queries (using Sesame) +sesame.home = ${kiwi.home}/triples + +# base URI of this KiWi installation; used for constructing resource URIs +kiwi.context = http://localhost:9090/test/ + +# base URL of the KiWi installation; used for accessing additional web services like SOLR and H2 +kiwi.host = http://localhost:9090/test/ + +##################################################################################################################### +# KiWi rendering plugins; these are applied when loading/saving content in the KiWi system +##################################################################################################################### + +savelets.source=kiwi.service.render.savelet.ExtractLinksSavelet,\ + kiwi.service.render.savelet.HtmlCleanerSavelet +savelets.text=kiwi.service.render.savelet.NavigationalLinksSavelet,\ + kiwi.service.render.savelet.RdfaSavelet,\ + kiwi.service.render.savelet.FragmentsSavelet,\ + kiwi.service.render.savelet.ComponentSavelet +savelets.media= + + +renderlets.html.source= +renderlets.html.xom=kiwi.service.render.renderlet.ComponentRenderlet,\ + kiwi.service.render.renderlet.ComponentDisplayRenderlet,\ + kiwi.service.render.renderlet.RdfaRenderlet,\ + kiwi.service.render.renderlet.HtmlLinkRenderlet,\ + kiwi.service.render.renderlet.HtmlRdfaRenderlet,\ + kiwi.service.render.renderlet.HtmlFragmentRenderlet,\ + kiwi.service.render.renderlet.ImageLinkRenderlet,\ + kiwi.service.render.renderlet.QueryRenderlet + + +renderlets.editor.source= +renderlets.editor.xom=kiwi.service.render.renderlet.ComponentRenderlet,\ + kiwi.service.render.renderlet.RdfaRenderlet,\ + kiwi.service.render.renderlet.EditorLinkRenderlet + +renderlets.annotation.source= +renderlets.annotation.xom=kiwi.service.render.renderlet.HtmlLinkRenderlet,\ + kiwi.service.render.renderlet.AnnotationLinksRenderlet + +renderlets.media=