svn commit: r1596312 - in /tika/trunk/tika-server/src/main: java/org/apache/tika/server/TikaServerCli.java resources/tikaserver-version.properties

[se...@apache.org]

Author: sergeyb
Date: Tue May 20 16:36:31 2014
New Revision: 1596312

URL: http://svn.apache.org/r1596312
Log:
[TIKA-1272] Removing redundant Tika server properties file, patch from Lewis John McGibbney applied

Modified:
    tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java
    tika/trunk/tika-server/src/main/resources/tikaserver-version.properties

Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java?rev=1596312&r1=1596311&r2=1596312&view=diff
==============================================================================
--- tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java (original)
+++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java Tue May 20 16:36:31 2014
@@ -52,15 +52,8 @@ public class TikaServerCli {
   }
 
   public static void main(String[] args) {
-    Properties properties = new Properties();
-    try {
-      properties.load(TikaServerCli.class.getClassLoader().getResourceAsStream("tikaserver-version.properties"));
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-
-    logger.info("Starting Tikaserver "+properties.getProperty("tikaserver.version"));
-    logger.info("Starting Tika Server " + new Tika().toString());
+    
+    logger.info("Starting " + new Tika().toString() + " server");
 
     try {
       Options options = getOptions();

Modified: tika/trunk/tika-server/src/main/resources/tikaserver-version.properties
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/resources/tikaserver-version.properties?rev=1596312&r1=1596311&r2=1596312&view=diff
==============================================================================
--- tika/trunk/tika-server/src/main/resources/tikaserver-version.properties (original)
+++ tika/trunk/tika-server/src/main/resources/tikaserver-version.properties Tue May 20 16:36:31 2014
@@ -1,18 +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.
-#
-
-tikaserver.version=${project.version}