svn commit: r1647779 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils: Version.java VersionCommunicationsJdJp.java

[de...@apache.org]

Author: degenaro
Date: Wed Dec 24 13:37:19 2014
New Revision: 1647779

URL: http://svn.apache.org/r1647779
Log:
UIMA-4069 DUCC Job Driver (JD) system classpath

version 1.2.0-beta+ (for now)

Added:
    uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/VersionCommunicationsJdJp.java   (with props)
Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Version.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Version.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Version.java?rev=1647779&r1=1647778&r2=1647779&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Version.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Version.java Wed Dec 24 13:37:19 2014
@@ -39,9 +39,9 @@ package org.apache.uima.ducc.common.util
 public class Version
 {
     private static final int major = 1;       // Major version
-    private static final int minor = 1;       // Minor - may be API changes, or new function
+    private static final int minor = 2;       // Minor - may be API changes, or new function
     private static final int ptf   = 0;       // Fix level, fully compatible with previous, no relevent new function
-    private static final String id = null;    // A short decoration, optional
+    private static final String id = "beta";    // A short decoration, optional
 
     public final static String version()
     {

Added: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/VersionCommunicationsJdJp.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/VersionCommunicationsJdJp.java?rev=1647779&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/VersionCommunicationsJdJp.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/VersionCommunicationsJdJp.java Wed Dec 24 13:37:19 2014
@@ -0,0 +1,36 @@
+/*
+ * 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.uima.ducc.common.utils;
+
+public class VersionCommunicationsJdJp {
+
+	public static int get() {
+		int retVal = 0;
+		String jd_configuration_class = DuccPropertiesResolver.getInstance().getFileProperty(DuccPropertiesResolver.ducc_jd_configuration_class);
+		if(jd_configuration_class != null) {
+			if(jd_configuration_class.trim().equals("org.apache.uima.ducc.jd.config.JobDriverConfiguration")) {
+				retVal = 1;
+			}
+			else if(jd_configuration_class.trim().equals("org.apache.uima.ducc.transport.configuration.jd.JobDriverConfiguration")) {
+				retVal = 2;
+			}
+		}
+		return retVal;
+	}
+}

Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/VersionCommunicationsJdJp.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/VersionCommunicationsJdJp.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain