src/java/org/rti/rivertrak/ApplicationConfig.java
@@ -2,7 +2,7 @@ |
package org.rti.rivertrak; |
|
import csip.Config; |
-import csip.ContextConfig; |
+ |
import java.util.Set; |
import javax.servlet.ServletContext; |
import javax.ws.rs.core.Application; |
@@ -23,8 +23,8 @@ |
public Set<Class<?>> getClasses() { |
Set<Class<?>> resources = new java.util.HashSet<>(); |
addRestResourceClasses(resources); |
- ContextConfig.filterServices(context, resources); |
- Config.register(resources); |
+ |
+ Config.register(resources, context); |
return resources; |
} |
|
src/java/org/rti/rivertrak/V1_0.java
@@ -6,9 +6,9 @@ |
package org.rti.rivertrak; |
|
import csip.Config; |
-import csip.Executable; |
+import csip.api.server.Executable; |
import csip.ModelDataService; |
-import csip.ServiceException; |
+import csip.api.server.ServiceException; |
import csip.annotations.Category; |
import csip.annotations.Description; |
import csip.annotations.Documentation; |
test/service_tests/STest.java
@@ -1,7 +1,7 @@ |
|
package service_tests; |
|
-import csip.Client; |
+import csip.utils.Client; |
import java.io.File; |
import org.codehaus.jettison.json.JSONObject; |
import org.junit.Assert; |