You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/01/20 08:14:57 UTC
[4/4] git commit: MARMOTTA-422: remove deprecared
marmotta-webapp-bigdata launcher
MARMOTTA-422: remove deprecared marmotta-webapp-bigdata launcher
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/6b4fc9dd
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/6b4fc9dd
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/6b4fc9dd
Branch: refs/heads/develop
Commit: 6b4fc9dd435b6df0f7fb4e4c810ccbf1b2a6c753
Parents: 80bb222
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Jan 20 08:14:13 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Jan 20 08:14:13 2014 +0100
----------------------------------------------------------------------
launchers/marmotta-webapp-bigdata/assembly.xml | 63 -
launchers/marmotta-webapp-bigdata/pom.xml | 268 --
.../src/main/doc/README.txt | 111 -
.../src/main/resources/META-INF/beans.xml | 28 -
.../src/main/resources/logback.xml | 39 -
.../src/main/webapp/META-INF/LICENSE | 2821 ------------------
.../src/main/webapp/META-INF/NOTICE | 42 -
.../src/main/webapp/META-INF/jetty-web.xml | 27 -
.../src/main/webapp/WEB-INF/jetty-web.xml | 36 -
.../src/main/webapp/WEB-INF/web.xml | 159 -
.../src/main/webapp/index.jsp | 25 -
.../src/test/resources/META-INF/beans.xml | 26 -
.../resources/META-INF/test-persistence.xml | 83 -
.../src/test/resources/WEB-INF/test-web.xml | 188 --
.../src/test/resources/arquillian.xml | 27 -
.../src/test/resources/ehcache.xml | 377 ---
.../src/test/resources/jndi.properties | 14 -
.../src/test/resources/logback.xml | 68 -
.../src/test/resources/test-config.properties | 71 -
launchers/pom.xml | 10 -
20 files changed, 4483 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/assembly.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/assembly.xml b/launchers/marmotta-webapp-bigdata/assembly.xml
deleted file mode 100644
index fdeccf1..0000000
--- a/launchers/marmotta-webapp-bigdata/assembly.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--
- ~ 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.
- -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-
- <id>webapp</id>
-
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
-
- <!-- unpack to apache-marmotta-x.x.x directory -->
- <includeBaseDirectory>true</includeBaseDirectory>
-
-
- <files>
- <file>
- <source>${project.basedir}/src/main/webapp/META-INF/LICENSE</source>
- <destName>LICENSE.txt</destName>
- <outputDirectory>/</outputDirectory>
- <fileMode>0644</fileMode>
- </file>
- <file>
- <source>${project.basedir}/src/main/doc/README.txt</source>
- <outputDirectory>/</outputDirectory>
- <fileMode>0644</fileMode>
- <filtered>true</filtered>
- </file>
- <file>
- <source>${project.basedir}/../../DISCLAIMER.txt</source>
- <outputDirectory>/</outputDirectory>
- <fileMode>0644</fileMode>
- <filtered>true</filtered>
- </file>
- <file>
- <source>${project.basedir}/src/main/webapp/META-INF/NOTICE</source>
- <destName>NOTICE.txt</destName>
- <outputDirectory>/</outputDirectory>
- <fileMode>0644</fileMode>
- </file>
- <file>
- <source>${project.build.directory}/marmotta.war</source>
- <outputDirectory>/</outputDirectory>
- <fileMode>0644</fileMode>
- </file>
- </files>
-</assembly>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/pom.xml b/launchers/marmotta-webapp-bigdata/pom.xml
deleted file mode 100644
index 656af87..0000000
--- a/launchers/marmotta-webapp-bigdata/pom.xml
+++ /dev/null
@@ -1,268 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-parent</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
- </parent>
-
- <artifactId>marmotta-webapp-bigdata</artifactId>
- <packaging>war</packaging>
-
- <name>Apache Marmotta Web Application (BigData Bundle)</name>
- <description>Web Application bundle (WAR file) containing Apache Marmotta. This package is bundled with the GPL
- licensed BigData backend and therefore not build by default.
- </description>
-
- <properties>
- <!-- these are used for the goals tomcat6/7:run or jetty:run -->
- <marmotta.home>${java.io.tmpdir}${file.separator}marmotta</marmotta.home>
- <marmotta.context>/</marmotta.context>
- <marmotta.port>8080</marmotta.port>
- </properties>
-
- <repositories>
- <repository>
- <id>bigdata.releases</id>
- <url>http://www.systap.com/maven/releases/</url>
- </repository>
- </repositories>
-
- <build>
- <finalName>marmotta</finalName>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- </archive>
- <archiveClasses>false</archiveClasses>
- </configuration>
- </plugin>
- <plugin> <!-- generate JRebel Configuration -->
- <groupId>org.zeroturnaround</groupId>
- <artifactId>jrebel-maven-plugin</artifactId>
- <configuration>
- <relativePath>../</relativePath>
- <rootPath>${rebel.root}</rootPath>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <path>${marmotta.context}</path>
- <port>${marmotta.port}</port>
- <systemProperties>
- <marmotta.home>${marmotta.home}</marmotta.home>
- </systemProperties>
- <!-- <contextReloadable>true</contextReloadable> -->
- <!-- <backgroundProcessorDelay>10</backgroundProcessorDelay> -->
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.jasig.maven</groupId>
- <artifactId>maven-notice-plugin</artifactId>
- <version>1.0.4</version>
- <configuration>
- <noticeTemplate>NOTICE.template</noticeTemplate>
- <licenseMapping>
- <param>../../license-mappings.xml</param>
- </licenseMapping>
- <noticeMessage>* {0}, under {1}</noticeMessage>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>cleanall</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>${marmotta.home}</directory>
- <followSymlinks>true</followSymlinks>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>marmotta-release</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- <finalName>apache-marmotta-${project.version}</finalName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <dependencies>
- <!-- Marmotta Modules, include the ones needed by the application -->
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-ldpath</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-backend-bigdata</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-sparql</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-security</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-user</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-ldcache-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-ldcache-file</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- Servlet / CDI Environment -->
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>com.bigdata</groupId>
- <artifactId>bigdata</artifactId>
- <version>1.2.3</version>
- <exclusions>
- <exclusion>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-runtime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
-
- </exclusions>
- </dependency>
-
- <!-- CORS filter -->
- <dependency>
- <groupId>com.thetransactioncompany</groupId>
- <artifactId>cors-filter</artifactId>
- </dependency>
-
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/main/doc/README.txt
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/main/doc/README.txt b/launchers/marmotta-webapp-bigdata/src/main/doc/README.txt
deleted file mode 100644
index 739c2fc..0000000
--- a/launchers/marmotta-webapp-bigdata/src/main/doc/README.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-Apache Marmotta Web Application
-===============================
-
-This package contains a special version for the binary web application of the
-Apache Marmotta Platform packaged with the high-performance BigData triple
-store implementation.
-
-The package can be deployed in any Java Application Server (with Servlet API 2.5 or
-higher). Apache Marmotta is tested on the following servers:
-- Apache Tomcat 6.x and 7.x
-- Jetty 6.x
-
-However, most other servers should also work without problems.
-
-The following sections give a short introduction how to deploy the Marmotta
-Web Application in your server. More detailed instructions are available at:
-
-http://marmotta.apache.org/installation.html
-
-
-1. Requirements
----------------
-
-The following minimum requirements need to be satisfied to run the Apache
-Marmotta Web Application:
-
-Hardware:
-- Dual-Core CPU
-- 1GB main memory
-- 100MB hard disk
-
-Software:
-- Java JDK 6 or higher
-- Java Application Server (Apache Tomcat 6.x/7.x or Jetty 6.x)
-
-If no database is available, Apache Marmotta will use an embedded H2 database
-for storing its data. This should only be used for testing and demonstration
-purposes and is strongly discouraged for production deployments.
-
-
-2. Deployment
--------------
-
-To deploy the Apache Marmotta Web Application in your application server,
-follow the following steps:
-
-1. download and install the application server and the database you intend
- to use (PostgreSQL or MySQL)
-2a. set the environment variable MARMOTTA_HOME to the directory where
- Apache Marmotta should store its persistent runtime data; this can also
- be done permanently in the startup scripts of the application server
-2b. alternatively, configure a context definition for your web application
- that sets the init parameter "marmotta.home" to the directory where
- Apache Marmotta should store its persistent runtime data (see below)
-3. configure the application server with sufficient main memory
- (1GB heap space, 256MB permgen space)
-4. copy marmotta.war to the deployment root of your application server
- (Tomcat and Jetty: the webapps/ subdirectory)
-5. start up your application server using the startup script or similar
- provided by the distribution
-
-Examples:
-
-Environment variables for home directory and application server memory:
-
-> export MARMOTTA_HOME=<PATH-TO-HOME>
-> export JAVA_OPTS="-Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m"
-
-Tomcat context definition for handing over the home directory init parameter
-(in conf/Catalina/localhost/marmotta.xml):
-
-<Context docBase="/path/to/marmotta.war" unpackWAR="false" useNaming="true">
- <Parameter name="marmotta.home" value="/data/marmotta" override="false"/>
-</Context>
-
-
-3. Configuration
-----------------
-
-3.1 Access Admin Interface
-
-You can now access the Apache Marmotta Web Application through your browser,
-e.g. by accessing the URL:
-
- http://localhost:8080/marmotta
-
-Note that the host name and port you are using for the first access of your
-installation decide on how Linked Data resources will be created later. If
-you plan a production deployment, you should therefore directly deploy on
-the server you are going to use and access it via the host name it will
-have in the future.
-
-
-3.2 Change Database Configuration
-
-In case you are not going to use the embedded H2 database, the first step you
-should do is to configure a different database. The database can be changed
-in the "configuration" section of the Marmotta Core module (scroll down to
-the bottom of the configuration page).
-
-Apache Marmotta can only connect to an existing database with an existing
-user and password. It will create the necessary database tables the first
-time it accesses the database, in case they do not exist yet. On first start
-the database should therefore be empty, or otherwise you will have old data
-in your installation.
-
-Special note for MySQL: for legal reasons, we cannot distribute the MySQL
-Java drivers that are needed to access a MySQL database. In case you aim
-to use MySQL, please download the MySQL JDBC connector manually and place
-it either in the application server lib/ directory or in the WEB-INF/lib
-directory of Apache Marmotta.
http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/main/resources/META-INF/beans.xml b/launchers/marmotta-webapp-bigdata/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index 461858e..0000000
--- a/launchers/marmotta-webapp-bigdata/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,28 +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.
-
--->
-<beans
- 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/beans_1_0.xsd">
-
-</beans>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/main/resources/logback.xml b/launchers/marmotta-webapp-bigdata/src/main/resources/logback.xml
deleted file mode 100644
index c775855..0000000
--- a/launchers/marmotta-webapp-bigdata/src/main/resources/logback.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-
- 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.
-
--->
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
-<!-- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern> -->
- <pattern>%d{HH:mm:ss.SSS} %-5level - %msg%n</pattern>
-<!-- <pattern>%d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%n</pattern> -->
- </encoder>
- </appender>
-
- <logger name="org.apache.marmotta.platform.core" level="INFO" />
-
- <logger name="org.apache.marmotta.platform.reasoner" level="INFO" />
-
- <root level="info">
- <appender-ref ref="STDOUT" />
- </root>
-</configuration>