You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2013/04/29 18:41:57 UTC
svn commit: r1477184 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common:
authentication/ crypto/ jd/files/ main/ persistence/services/
Author: cwiklik
Date: Mon Apr 29 16:41:57 2013
New Revision: 1477184
URL: http://svn.apache.org/r1477184
Log:
UIMA-2851 Removed @Override
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/authentication/AuthenticationManager.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/crypto/Crypto.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/JobPerformanceSummary.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/JobPerformanceSummaryJsonGz.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemState.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemStateJson.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemStateJsonGz.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/services/StateServices.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/authentication/AuthenticationManager.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/authentication/AuthenticationManager.java?rev=1477184&r1=1477183&r2=1477184&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/authentication/AuthenticationManager.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/authentication/AuthenticationManager.java Mon Apr 29 16:41:57 2013
@@ -34,12 +34,12 @@ public class AuthenticationManager imple
return instance;
}
- @Override
+
public String getVersion() {
return version;
}
- @Override
+
public IAuthenticationResult isAuthenticate(String userid, String domain, String password) {
IAuthenticationResult authenticationResult = default_authenticationResult;
String ducc_pw = DuccPropertiesResolver.getInstance().getFileProperty(DuccPropertiesResolver.ducc_ws_authentication_pw);
@@ -53,7 +53,7 @@ public class AuthenticationManager imple
return authenticationResult;
}
- @Override
+
public IAuthenticationResult isGroupMember(String userid, String domain, Role role) {
AuthenticationResult authenticationResult = new AuthenticationResult();
authenticationResult.setSuccess();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/crypto/Crypto.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/crypto/Crypto.java?rev=1477184&r1=1477183&r2=1477184&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/crypto/Crypto.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/crypto/Crypto.java Mon Apr 29 16:41:57 2013
@@ -309,7 +309,7 @@ public class Crypto implements ICrypto {
return object;
}
- @Override
+
public byte[] encrypt(Object o) throws CryptoException {
try {
Key key = getPrivateKeyFromFile(filePvt);
@@ -321,7 +321,7 @@ public class Crypto implements ICrypto {
}
}
- @Override
+
public Object decrypt(byte[] byteArray) throws CryptoException {
try {
Key key = getPubicKeyFromFile(filePub);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/JobPerformanceSummary.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/JobPerformanceSummary.java?rev=1477184&r1=1477183&r2=1477184&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/JobPerformanceSummary.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/JobPerformanceSummary.java Mon Apr 29 16:41:57 2013
@@ -31,62 +31,60 @@ public class JobPerformanceSummary imple
private AtomicLong analysisTimeMin = new AtomicLong(-1);
private AtomicLong analysisTimeMax = new AtomicLong(-1);
- @Override
+
public String getName() {
return name;
}
- @Override
+
public void setName(String value) {
name = value;
}
- @Override
+
public String getUniqueName() {
return uniqueName;
}
- @Override
public void setUniqueName(String value) {
uniqueName = value;
}
- @Override
+
public long getAnalysisTime() {
return analysisTime.get();
}
- @Override
+
public void setAnalysisTime(long value) {
analysisTime.set(value);
}
- @Override
+
public long getAnalysisTimeMin() {
return analysisTimeMin.get();
}
- @Override
public void setAnalysisTimeMin(long value) {
analysisTimeMin.set(value);
}
- @Override
+
public long getAnalysisTimeMax() {
return analysisTimeMax.get();
}
- @Override
+
public void setAnalysisTimeMax(long value) {
analysisTimeMax.set(value);
}
- @Override
+
public long getNumProcessed() {
return numProcessed.get();
}
- @Override
+
public void setNumProcessed(long value) {
numProcessed.set(value);
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/JobPerformanceSummaryJsonGz.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/JobPerformanceSummaryJsonGz.java?rev=1477184&r1=1477183&r2=1477184&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/JobPerformanceSummaryJsonGz.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/JobPerformanceSummaryJsonGz.java Mon Apr 29 16:41:57 2013
@@ -47,14 +47,13 @@ public class JobPerformanceSummaryJsonGz
initialize(directory);
}
- @Override
+
public void initialize(String directory) {
this.filename = IOHelper.marryDir2File(directory,job_performance_summary_json_gz);
}
public final String encoding = "UTF-8";
-
- @Override
+
public void exportData(JobPerformanceSummaryData data) throws IOException {
BufferedWriter writer = null;
OutputStreamWriter osr = null;
@@ -104,7 +103,7 @@ public class JobPerformanceSummaryJsonGz
return size-1;
}
- @Override
+
public JobPerformanceSummaryData importData() throws IOException, ClassNotFoundException {
JobPerformanceSummaryData data = new JobPerformanceSummaryData();
BufferedReader reader = null;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemState.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemState.java?rev=1477184&r1=1477183&r2=1477184&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemState.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemState.java Mon Apr 29 16:41:57 2013
@@ -49,42 +49,42 @@ public class WorkItemState implements IW
this.seqNo = ""+seqNo;
}
- @Override
+
public String getSeqNo() {
return seqNo;
}
- @Override
+
public String getWiId() {
return wiId;
}
- @Override
+
public void setWiId(String wiId) {
this.wiId = wiId;
}
- @Override
+
public String getNode() {
return node;
}
- @Override
+
public void setNode(String node) {
this.node = node;
}
- @Override
+
public String getPid() {
return pid;
}
- @Override
+
public void setPid(String pid) {
this.pid = pid;
}
- @Override
+
public State getState() {
State retVal = state;
// legacy
@@ -112,19 +112,19 @@ public class WorkItemState implements IW
return retVal;
}
- @Override
+
public void stateStart() {
state = State.start;
millisAtStart = System.currentTimeMillis();
}
- @Override
+
public void stateQueued() {
state = State.queued;
millisAtQueued = System.currentTimeMillis();
}
- @Override
+
public void stateOperating() {
state = State.operating;
//jpIp = ip;
@@ -132,24 +132,24 @@ public class WorkItemState implements IW
millisAtOperating = System.currentTimeMillis();
}
- @Override
+
public void stateEnded() {
state = State.ended;
millisAtFinish = System.currentTimeMillis();
}
- @Override
+
public void stateError() {
state = State.error;
millisAtFinish = System.currentTimeMillis();
}
- @Override
+
public void stateRetry() {
state = State.retry;
}
- @Override
+
public long getMillisOverhead() {
long retVal = 0;
if(millisAtStart > 0) {
@@ -166,7 +166,7 @@ public class WorkItemState implements IW
return retVal;
}
- @Override
+
public long getMillisProcessing() {
long retVal = 0;
if(millisAtOperating > 0) {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemStateJson.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemStateJson.java?rev=1477184&r1=1477183&r2=1477184&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemStateJson.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemStateJson.java Mon Apr 29 16:41:57 2013
@@ -43,12 +43,12 @@ public class WorkItemStateJson implement
initialize(directory);
}
- @Override
+
public void initialize(String directory) {
this.filename = IOHelper.marryDir2File(directory,work_item_status_json);
}
- @Override
+
public void exportData(ConcurrentSkipListMap<Long, IWorkItemState> map) throws IOException {
FileWriter fw = null;
try {
@@ -64,7 +64,7 @@ public class WorkItemStateJson implement
}
}
- @Override
+
public ConcurrentSkipListMap<Long, IWorkItemState> importData() throws IOException, ClassNotFoundException {
ConcurrentSkipListMap<Long, IWorkItemState> map = null;
FileReader fr = null;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemStateJsonGz.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemStateJsonGz.java?rev=1477184&r1=1477183&r2=1477184&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemStateJsonGz.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemStateJsonGz.java Mon Apr 29 16:41:57 2013
@@ -48,14 +48,14 @@ public class WorkItemStateJsonGz impleme
initialize(directory);
}
- @Override
+
public void initialize(String directory) {
this.filename = IOHelper.marryDir2File(directory,work_item_status_json_gz);
}
public final String encoding = "UTF-8";
- @Override
+
public void exportData(ConcurrentSkipListMap<Long, IWorkItemState> map) throws IOException {
BufferedWriter writer = null;
OutputStreamWriter osr = null;
@@ -105,7 +105,7 @@ public class WorkItemStateJsonGz impleme
return size-1;
}
- @Override
+
public ConcurrentSkipListMap<Long, IWorkItemState> importData() throws IOException, ClassNotFoundException {
ConcurrentSkipListMap<Long, IWorkItemState> map = new ConcurrentSkipListMap<Long, IWorkItemState>();
BufferedReader reader = null;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java?rev=1477184&r1=1477183&r2=1477184&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java Mon Apr 29 16:41:57 2013
@@ -277,7 +277,7 @@ public class DuccAdmin extends AbstractD
}
}
- @Override
+
public void completed(ProcessCompletionResult result) {
StringBuffer sb = new StringBuffer();
if (result.exitCode != 0) {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/services/StateServices.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/services/StateServices.java?rev=1477184&r1=1477183&r2=1477184&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/services/StateServices.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/services/StateServices.java Mon Apr 29 16:41:57 2013
@@ -78,12 +78,12 @@ public class StateServices implements IS
return retVal;
}
- @Override
+
public ArrayList<String> getSvcList() {
return getList(IStateServices.svc);
}
- @Override
+
public ArrayList<String> getMetaList() {
return getList(IStateServices.meta);
}
@@ -104,7 +104,7 @@ public class StateServices implements IS
return properties;
}
- @Override
+
public StateServicesDirectory getStateServicesDirectory() throws IOException {
StateServicesDirectory ssd = new StateServicesDirectory();
ArrayList<String> svcList = getSvcList();