Skip to content

Commit 555567f

Browse files
committed
OSCAR-0
Had to make updates due to the common poms update.
1 parent ff1eab3 commit 555567f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+89
-61
lines changed

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/OX4J.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/proxy/DownloadService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/proxy/ISOMetadataDownload.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/proxy/ISOMetadataRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/proxy/ISOMetadataView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/proxy/PreviewCoverage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/proxy/Proxy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/proxy/Reader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/proxy/Response.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/proxy/URLReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/Cover.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/CoverType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/DataLayer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/LayerType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/MarkerLayer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/Overlay.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/Position.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/SelectionLayer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/SelectionStyle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/Theme.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/ThemeLayer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/WMTS.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/exceptions/ValidationException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/interfaces/Iconified.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/interfaces/Validatable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/interfaces/WebFeatureService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/services/CatalogueService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/services/ExtractionService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/services/I_Service.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/services/SelectionService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/services/Service.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/services/ServiceEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/theme/services/Services.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/util/OXUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/util/ScaleSet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/util/comparator/ThemeDisplayOrder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/util/comparator/ThemeName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/main/java/com/caris/oscarexchange4j/util/serializers/ThemeSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/test/java/com/caris/oscarexchange4j/TestOX4J.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

oscarexchange4j/src/test/java/com/caris/oscarexchange4j/proxy/ISOMetadataDownloadTest.java

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* CARIS oscar - Open Spatial Component ARchitecture
33
*
4-
* Copyright 2014 CARIS <http://www.caris.com>
4+
* Copyright 2016 CARIS <http://www.caris.com>
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
2020
import java.io.IOException;
2121

2222
import javax.servlet.ServletOutputStream;
23+
import javax.servlet.WriteListener;
2324
import javax.servlet.http.HttpServletRequest;
2425
import javax.servlet.http.HttpServletResponse;
2526

@@ -63,14 +64,22 @@ public void setup() throws IOException {
6364
response.setHeader("Pragma", "no-cache");
6465
response.setHeader("Content-Disposition",
6566
"attachment;filename=test.xml");
66-
67-
EasyMock.expect(response.getOutputStream()).andReturn(
68-
new ServletOutputStream() {
69-
@Override
70-
public void write(int b) throws IOException {
71-
72-
}
73-
});
67+
68+
EasyMock.expect(response.getOutputStream()).andReturn(new ServletOutputStream() {
69+
70+
@Override
71+
public void write(int b) throws IOException {
72+
}
73+
74+
@Override
75+
public void setWriteListener(WriteListener writeListener) {
76+
}
77+
78+
@Override
79+
public boolean isReady() {
80+
return false;
81+
}
82+
});
7483

7584
EasyMock.replay(request, response);
7685
}

0 commit comments

Comments
 (0)