svn commit: r1301730 - in /ace/trunk: ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/impl/Activator.java ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java

[ma...@apache.org]

Author: marrs
Date: Fri Mar 16 20:04:14 2012
New Revision: 1301730

URL: http://svn.apache.org/viewvc?rev=1301730&view=rev
Log:
ACE-63 last part of the patch

Modified:
    ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/impl/Activator.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java

Modified: ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/impl/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/impl/Activator.java?rev=1301730&r1=1301729&r2=1301730&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/impl/Activator.java (original)
+++ ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/impl/Activator.java Fri Mar 16 20:04:14 2012
@@ -48,7 +48,7 @@ public class Activator extends Dependenc
         m_context = context;
         m_manager = manager;
         Properties props = new Properties();
-        props.put(Constants.SERVICE_PID, "org.apache.ace.gateway.log.store.factory");
+        props.put(Constants.SERVICE_PID, "org.apache.ace.target.log.store.factory");
         manager.add(createComponent()
             .setInterface(ManagedServiceFactory.class.getName(), props)
             .setImplementation(this)

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java?rev=1301730&r1=1301729&r2=1301730&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java (original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java Fri Mar 16 20:04:14 2012
@@ -188,22 +188,22 @@ public class LogIntegrationTest extends 
         List<String> result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/query");
         assert result.size() > 1 : "We expect at least two logs on the server.";
 
-        result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=42");
+        result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?tid=42");
         assert result.size() == 1 : "Target 42 has a single audit log event.";
 
-        result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47");
+        result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?tid=47");
         assert result.size() == 3 : "Target 47 has 3 audit log events.";
 
-        result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47&logid=1");
+        result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?tid=47&logid=1");
         assert result.size() == 1 : "Target 47, logid 1 has 1 audit log event.";
 
-        result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47&logid=2");
+        result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?tid=47&logid=2");
         assert result.size() == 2 : "Target 47, logid 2 has 2 audit log events.";
 
-        result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47&logid=2&range=1");
+        result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?tid=47&logid=2&range=1");
         assert result.size() == 1 : "Target 47, logid 2, range 1 has 1 audit log event.";
 
-        result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47&logid=2&range=3,5");
+        result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?tid=47&logid=2&range=3,5");
         assert result.size() == 0 : "Target 47, logid 2, range 3,5 has 0 audit log event.";
     }