You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2017/10/03 18:22:54 UTC

[6/7] jena git commit: Remove Fuseki+TDB2 special build

Remove Fuseki+TDB2 special build


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b7299165
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b7299165
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b7299165

Branch: refs/heads/jena-tdb2
Commit: b729916523e6691f64bda3ae8c4fbb032ad92fc2
Parents: d64b4d5
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Oct 3 17:39:23 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Oct 3 17:39:23 2017 +0100

----------------------------------------------------------------------
 jena-db/jena-fuseki-tdb2/pom.xml                | 123 -------------------
 .../org/apache/jena/cmd_x/FusekiTDB2Cmd.java    |  36 ------
 2 files changed, 159 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/b7299165/jena-db/jena-fuseki-tdb2/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-fuseki-tdb2/pom.xml b/jena-db/jena-fuseki-tdb2/pom.xml
deleted file mode 100644
index 40efffa..0000000
--- a/jena-db/jena-fuseki-tdb2/pom.xml
+++ /dev/null
@@ -1,123 +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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <name>Apache Jena (${project.artifactId})</name>
-  <artifactId>jena-fuseki-tdb2-server</artifactId>
-
-  <parent>
-    <groupId>org.apache.jena</groupId>
-    <artifactId>jena-db</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
-  </parent> 
-
-  <packaging>jar</packaging>
-  <description>Apache Jena Fuseki combined with Apache Jena/TDB2</description>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-tdb2</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
-    </dependency>
-
-    <!-- Include commands as well! -->
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-tdb2-cmds</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-cmds</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-fuseki-basic</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>runtime</scope>
-    </dependency> 
-
-  </dependencies>
-
-  <build>
-    <plugins>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <configuration>
-          <shadedArtifactAttached>false</shadedArtifactAttached>
-          <transformers>
-            <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-              <mainClass>org.apache.jena.fuseki.cmds.FusekiBasicCmd</mainClass>
-            </transformer>
-            <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-            <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
-            <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
-              <addHeader>false</addHeader>
-            </transformer>
-          </transformers>
-          <filters>
-            <filter>
-              <artifact>*:*</artifact>
-              <excludes>
-                <!-- Some jars are signed but shading breaks that.
-                     Don't include signing files.
-                -->
-                <exclude>META-INF/*.SF</exclude>
-                <exclude>META-INF/*.DSA</exclude>
-                <exclude>META-INF/*.RSA</exclude>
-              </excludes>
-            </filter>
-          </filters>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <!--<phase /><!- - Switch off -->
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-    </plugins>
-
-  </build>
-  
-</project>

http://git-wip-us.apache.org/repos/asf/jena/blob/b7299165/jena-db/jena-fuseki-tdb2/src/main/java/org/apache/jena/cmd_x/FusekiTDB2Cmd.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-fuseki-tdb2/src/main/java/org/apache/jena/cmd_x/FusekiTDB2Cmd.java b/jena-db/jena-fuseki-tdb2/src/main/java/org/apache/jena/cmd_x/FusekiTDB2Cmd.java
deleted file mode 100644
index 79896dc..0000000
--- a/jena-db/jena-fuseki-tdb2/src/main/java/org/apache/jena/cmd_x/FusekiTDB2Cmd.java
+++ /dev/null
@@ -1,36 +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.
- */
-
-package org.apache.jena.cmd_x;
-
-import org.apache.jena.fuseki.Fuseki;
-import org.apache.jena.fuseki.FusekiLogging;
-
-public class FusekiTDB2Cmd {
-
-    public static void main(String... args) {
-        FusekiLogging.setLogging() ;
-        Fuseki.serverLog.info("Fuseki-TDB2 integration");
-        
-        // Full server.
-        //org.apache.jena.fuseki.cmd.FusekiCmd.main(args);
-        // Basic server
-        org.apache.jena.fuseki.cmds.FusekiBasicCmd.main(args);
-    }
-
-}