ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1301534 - in /ace/trunk: ace-deployment-task/src/test/java/org/apache/ace/deployment/task/ ace-gateway-log-store/ ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/ ace-gateway-log-store/src/main/java/org/apache/ace/gate...
Date Fri, 16 Mar 2012 14:10:14 GMT
Author: marrs
Date: Fri Mar 16 14:10:13 2012
New Revision: 1301534

URL: http://svn.apache.org/viewvc?rev=1301534&view=rev
Log:
ACE-63 more refactoring changes

Added:
    ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/
    ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/
    ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/
    ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/LogStore.java
      - copied, changed from r1301481, ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/LogStore.java
    ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/impl/
    ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/impl/Activator.java
      - copied, changed from r1301481, ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/impl/Activator.java
    ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/impl/LogStoreImpl.java
      - copied, changed from r1301481, ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/impl/LogStoreImpl.java
    ace/trunk/ace-gateway-log-store/src/test/java/org/apache/ace/target/
    ace/trunk/ace-gateway-log-store/src/test/java/org/apache/ace/target/log/
    ace/trunk/ace-gateway-log-store/src/test/java/org/apache/ace/target/log/store/
    ace/trunk/ace-gateway-log-store/src/test/java/org/apache/ace/target/log/store/impl/
    ace/trunk/ace-gateway-log-store/src/test/java/org/apache/ace/target/log/store/impl/GatewayLogStoreTest.java
      - copied, changed from r1301481, ace/trunk/ace-gateway-log-store/src/test/java/org/apache/ace/gateway/log/store/impl/GatewayLogStoreTest.java
    ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/
    ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/
    ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/Activator.java
      - copied, changed from r1301481, ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/Activator.java
    ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogConfigurator.java   (contents, props changed)
      - copied, changed from r1301481, ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogConfigurator.java
    ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogImpl.java
      - copied, changed from r1301481, ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogImpl.java
    ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogSyncConfigurator.java   (contents, props changed)
      - copied, changed from r1301481, ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogSyncConfigurator.java
    ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/task/
    ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/task/Connection.java
      - copied, changed from r1301481, ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/task/Connection.java
    ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/task/LogSyncTask.java
      - copied, changed from r1301481, ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/task/LogSyncTask.java
    ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/target/
    ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/target/log/
    ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/target/log/task/
    ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/target/log/task/LogSyncTaskTest.java
      - copied, changed from r1301481, ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/gateway/log/task/LogSyncTaskTest.java
Removed:
    ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/LogStore.java
    ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/impl/
    ace/trunk/ace-gateway-log-store/src/test/java/org/apache/ace/gateway/log/store/impl/
    ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/Activator.java
    ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogConfigurator.java
    ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogImpl.java
    ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogSyncConfigurator.java
    ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/task/
    ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/gateway/log/task/
Modified:
    ace/trunk/ace-deployment-task/src/test/java/org/apache/ace/deployment/task/DeploymentUpdateTaskTest.java
    ace/trunk/ace-gateway-log-store/pom.xml
    ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.properties
    ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.xml
    ace/trunk/ace-gateway-log/pom.xml
    ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.properties
    ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.xml
    ace/trunk/ace-identification-ifconfig/src/main/java/org/apache/ace/identification/ifconfig/IfconfigIdentification.java
    ace/trunk/ace-identification-property/src/main/java/org/apache/ace/identification/property/constants/IdentificationConstants.java
    ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.properties
    ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.xml
    ace/trunk/ace-identification-property/src/test/java/org/apache/ace/identification/property/PropertyBasedIdentificationTest.java
    ace/trunk/ace-identification-property/src/test/java/org/apache/ace/identification/property/SimpleIdentificationTest.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/Options.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java
    ace/trunk/ace-managementagent/src/main/java/org/apache/ace/managementagent/Activator.java

Modified: ace/trunk/ace-deployment-task/src/test/java/org/apache/ace/deployment/task/DeploymentUpdateTaskTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-deployment-task/src/test/java/org/apache/ace/deployment/task/DeploymentUpdateTaskTest.java?rev=1301534&r1=1301533&r2=1301534&view=diff
==============================================================================
--- ace/trunk/ace-deployment-task/src/test/java/org/apache/ace/deployment/task/DeploymentUpdateTaskTest.java (original)
+++ ace/trunk/ace-deployment-task/src/test/java/org/apache/ace/deployment/task/DeploymentUpdateTaskTest.java Fri Mar 16 14:10:13 2012
@@ -32,8 +32,8 @@ import java.net.URLStreamHandler;
 
 import org.apache.ace.deployment.Deployment;
 import org.apache.ace.discovery.Discovery;
-import org.apache.ace.gateway.log.store.LogStore;
 import org.apache.ace.identification.Identification;
+import org.apache.ace.target.log.store.LogStore;
 import org.apache.ace.test.utils.TestUtils;
 import org.osgi.framework.Version;
 import org.osgi.service.log.LogService;

Modified: ace/trunk/ace-gateway-log-store/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log-store/pom.xml?rev=1301534&r1=1301533&r2=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log-store/pom.xml (original)
+++ ace/trunk/ace-gateway-log-store/pom.xml Fri Mar 16 14:10:13 2012
@@ -32,7 +32,7 @@
     <artifactId>org.apache.ace.gateway.log.store</artifactId>
     <packaging>bundle</packaging>
 
-    <name>Apache ACE :: Gateway :: Log :: Store</name>
+    <name>Apache ACE :: Target :: Log :: Store</name>
     <description />
 
     <scm>
@@ -43,19 +43,19 @@
     
     <properties>
         <export.package>
-            org.apache.ace.gateway.log.store;version=${project.version}
+            org.apache.ace.target.log.store;version=${project.version}
         </export.package>
         <import.package>
-            org.apache.ace.gateway.log.store;version=${project.version},
+            org.apache.ace.target.log.store;version=${project.version},
             org.apache.ace.identification;version=${project.version},
             org.apache.ace.log;version=${project.version},
             *
         </import.package>
         <private.package>
-            org.apache.ace.gateway.log.store.impl
+            org.apache.ace.target.log.store.impl
         </private.package>
         <bundle.activator>
-            org.apache.ace.gateway.log.store.impl.Activator
+            org.apache.ace.target.log.store.impl.Activator
         </bundle.activator>
     </properties>
 

Copied: ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/LogStore.java (from r1301481, ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/LogStore.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/LogStore.java?p2=ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/LogStore.java&p1=ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/LogStore.java&r1=1301481&r2=1301534&rev=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/LogStore.java (original)
+++ ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/LogStore.java Fri Mar 16 14:10:13 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.ace.gateway.log.store;
+package org.apache.ace.target.log.store;
 
 import java.io.IOException;
 import java.util.Dictionary;
@@ -25,7 +25,7 @@ import java.util.List;
 import org.apache.ace.log.LogEvent;
 
 /**
- * Server log store interface for the gateways. Implementations of this service interface provide a persisted storage for
+ * Server log store interface for the targets. Implementations of this service interface provide a persisted storage for
  * log data.
  */
 public interface LogStore

Copied: ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/impl/Activator.java (from r1301481, ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/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?p2=ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/impl/Activator.java&p1=ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/impl/Activator.java&r1=1301481&r2=1301534&rev=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/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 14:10:13 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.ace.gateway.log.store.impl;
+package org.apache.ace.target.log.store.impl;
 
 import java.io.File;
 import java.util.Dictionary;
@@ -24,8 +24,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.ace.gateway.log.store.LogStore;
 import org.apache.ace.identification.Identification;
+import org.apache.ace.target.log.store.LogStore;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyActivatorBase;
 import org.apache.felix.dm.DependencyManager;

Copied: ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/impl/LogStoreImpl.java (from r1301481, ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/impl/LogStoreImpl.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/impl/LogStoreImpl.java?p2=ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/impl/LogStoreImpl.java&p1=ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/impl/LogStoreImpl.java&r1=1301481&r2=1301534&rev=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/impl/LogStoreImpl.java (original)
+++ ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/target/log/store/impl/LogStoreImpl.java Fri Mar 16 14:10:13 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.ace.gateway.log.store.impl;
+package org.apache.ace.target.log.store.impl;
 
 import java.io.EOFException;
 import java.io.File;
@@ -26,9 +26,9 @@ import java.util.ArrayList;
 import java.util.Dictionary;
 import java.util.List;
 
-import org.apache.ace.gateway.log.store.LogStore;
 import org.apache.ace.identification.Identification;
 import org.apache.ace.log.LogEvent;
+import org.apache.ace.target.log.store.LogStore;
 import org.osgi.service.log.LogService;
 
 /**

Modified: ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1301534&r1=1301533&r2=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.properties Fri Mar 16 14:10:13 2012
@@ -1,5 +1,5 @@
-service.name=Apache ACE :: Gateway :: Log :: Store
-service.desc=Log store for a gateway.
+service.name=Apache ACE :: Target :: Log :: Store
+service.desc=Log store for a target.
 
 name.name=Log Store Name
 name.desc=The name of the log store.

Modified: ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=1301534&r1=1301533&r2=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.xml (original)
+++ ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.xml Fri Mar 16 14:10:13 2012
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0"
   localization="OSGI-INF/metatype/metatype">
-  <metatype:OCD id="org.apache.ace.gateway.log.store" name="%service.name" description="%service.desc">
+  <metatype:OCD id="org.apache.ace.target.log.store" name="%service.name" description="%service.desc">
     <metatype:AD id="name" type="String" name="%name.name" description="%name.desc"/>
     <metatype:AD id="ma" type="String" name="%ma.name" description="%ma.desc" required="false"/>
   </metatype:OCD>
-  <metatype:Designate pid="org.apache.ace.gateway.log.store.factory"
-      factoryPid="org.apache.ace.gateway.log.store.factory">
-    <metatype:Object ocdref="org.apache.ace.gateway.log.store"/>
+  <metatype:Designate pid="org.apache.ace.target.log.store.factory"
+      factoryPid="org.apache.ace.target.log.store.factory">
+    <metatype:Object ocdref="org.apache.ace.target.log.store"/>
   </metatype:Designate>
 </metatype:MetaData>

Copied: ace/trunk/ace-gateway-log-store/src/test/java/org/apache/ace/target/log/store/impl/GatewayLogStoreTest.java (from r1301481, ace/trunk/ace-gateway-log-store/src/test/java/org/apache/ace/gateway/log/store/impl/GatewayLogStoreTest.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log-store/src/test/java/org/apache/ace/target/log/store/impl/GatewayLogStoreTest.java?p2=ace/trunk/ace-gateway-log-store/src/test/java/org/apache/ace/target/log/store/impl/GatewayLogStoreTest.java&p1=ace/trunk/ace-gateway-log-store/src/test/java/org/apache/ace/gateway/log/store/impl/GatewayLogStoreTest.java&r1=1301481&r2=1301534&rev=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log-store/src/test/java/org/apache/ace/gateway/log/store/impl/GatewayLogStoreTest.java (original)
+++ ace/trunk/ace-gateway-log-store/src/test/java/org/apache/ace/target/log/store/impl/GatewayLogStoreTest.java Fri Mar 16 14:10:13 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.ace.gateway.log.store.impl;
+package org.apache.ace.target.log.store.impl;
 
 import static org.apache.ace.test.utils.TestUtils.UNIT;
 
@@ -26,10 +26,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.ace.gateway.log.store.LogStore;
 import org.apache.ace.identification.Identification;
 import org.apache.ace.log.AuditEvent;
 import org.apache.ace.log.LogEvent;
+import org.apache.ace.target.log.store.LogStore;
+import org.apache.ace.target.log.store.impl.LogStoreImpl;
 import org.apache.ace.test.utils.TestUtils;
 import org.osgi.service.log.LogService;
 import org.testng.annotations.AfterMethod;

Modified: ace/trunk/ace-gateway-log/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log/pom.xml?rev=1301534&r1=1301533&r2=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log/pom.xml (original)
+++ ace/trunk/ace-gateway-log/pom.xml Fri Mar 16 14:10:13 2012
@@ -32,7 +32,7 @@
     <artifactId>org.apache.ace.gateway.log</artifactId>
     <packaging>bundle</packaging>
 
-    <name>Apache ACE :: Gateway :: Log</name>
+    <name>Apache ACE :: Target :: Log</name>
     <description />
 
     <scm>
@@ -46,11 +46,11 @@
             *
         </import.package>
         <private.package>
-            org.apache.ace.gateway.log,
-            org.apache.ace.gateway.log.task
+            org.apache.ace.target.log,
+            org.apache.ace.target.log.task
         </private.package>
         <bundle.activator>
-            org.apache.ace.gateway.log.Activator
+            org.apache.ace.target.log.Activator
         </bundle.activator>
     </properties>
 

Copied: ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/Activator.java (from r1301481, ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/Activator.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/Activator.java?p2=ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/Activator.java&p1=ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/Activator.java&r1=1301481&r2=1301534&rev=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/Activator.java (original)
+++ ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/Activator.java Fri Mar 16 14:10:13 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.ace.gateway.log;
+package org.apache.ace.target.log;
 
 import java.util.Properties;
 
@@ -32,14 +32,14 @@ public class Activator extends Dependenc
         Properties props;
 
         props = new Properties();
-        props.put(Constants.SERVICE_PID, "org.apache.ace.gateway.log.factory");
+        props.put(Constants.SERVICE_PID, "org.apache.ace.target.log.factory");
         manager.add(createComponent()
             .setInterface(ManagedServiceFactory.class.getName(), props)
             .setImplementation(LogConfigurator.class)
             .add(createServiceDependency().setService(LogService.class).setRequired(false)));
 
         props = new Properties();
-        props.put(Constants.SERVICE_PID, "org.apache.ace.gateway.log.sync.factory");
+        props.put(Constants.SERVICE_PID, "org.apache.ace.target.log.sync.factory");
         manager.add(createComponent()
             .setInterface(ManagedServiceFactory.class.getName(), props)
             .setImplementation(LogSyncConfigurator.class)

Copied: ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogConfigurator.java (from r1301481, ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogConfigurator.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogConfigurator.java?p2=ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogConfigurator.java&p1=ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogConfigurator.java&r1=1301481&r2=1301534&rev=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogConfigurator.java (original)
+++ ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogConfigurator.java Fri Mar 16 14:10:13 2012
@@ -1,12 +1,12 @@
-package org.apache.ace.gateway.log;
+package org.apache.ace.target.log;
 
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.ace.gateway.log.store.LogStore;
 import org.apache.ace.log.Log;
+import org.apache.ace.target.log.store.LogStore;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.Constants;
@@ -44,7 +44,7 @@ public class LogConfigurator implements 
             Properties props = new Properties();
             props.put(LOG_NAME, name);
             String filterString;
-            filterString = "(&("+Constants.OBJECTCLASS+"="+LogStore.class.getName()+")(name=" + name + "))";
+            filterString = "(&(" + Constants.OBJECTCLASS + "=" + LogStore.class.getName() + ")(name=" + name + "))";
 
             Component log = m_manager.createComponent()
                 .setInterface(Log.class.getName(), props)

Propchange: ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogConfigurator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogImpl.java (from r1301481, ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogImpl.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogImpl.java?p2=ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogImpl.java&p1=ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogImpl.java&r1=1301481&r2=1301534&rev=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogImpl.java (original)
+++ ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogImpl.java Fri Mar 16 14:10:13 2012
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.ace.gateway.log;
+package org.apache.ace.target.log;
 
 import java.io.IOException;
 import java.util.Dictionary;
-import org.apache.ace.gateway.log.store.LogStore;
 import org.apache.ace.log.Log;
 import org.apache.ace.log.LogEvent;
+import org.apache.ace.target.log.store.LogStore;
 import org.osgi.service.log.LogService;
 
 public class LogImpl implements Log {

Copied: ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogSyncConfigurator.java (from r1301481, ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogSyncConfigurator.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogSyncConfigurator.java?p2=ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogSyncConfigurator.java&p1=ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogSyncConfigurator.java&r1=1301481&r2=1301534&rev=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogSyncConfigurator.java (original)
+++ ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogSyncConfigurator.java Fri Mar 16 14:10:13 2012
@@ -1,4 +1,4 @@
-package org.apache.ace.gateway.log;
+package org.apache.ace.target.log;
 
 import java.util.Dictionary;
 import java.util.HashMap;
@@ -6,10 +6,10 @@ import java.util.Map;
 import java.util.Properties;
 
 import org.apache.ace.discovery.Discovery;
-import org.apache.ace.gateway.log.store.LogStore;
-import org.apache.ace.gateway.log.task.LogSyncTask;
 import org.apache.ace.identification.Identification;
 import org.apache.ace.scheduler.constants.SchedulerConstants;
+import org.apache.ace.target.log.store.LogStore;
+import org.apache.ace.target.log.task.LogSyncTask;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.Constants;
@@ -53,21 +53,21 @@ public class LogSyncConfigurator impleme
             String schedulerName;
             String description;
             if (ma == null || "".equals(ma)) {
-                filterString = "(&("+Constants.OBJECTCLASS+"="+LogStore.class.getName()+")(name=" + name + "))";
-                filterForDiscovery = "(&("+Constants.OBJECTCLASS+"="+Discovery.class.getName()+")(!(ma=*)))";
-                filterForIdentification = "(&("+Constants.OBJECTCLASS+"="+Identification.class.getName()+")(!(ma=*)))";
+                filterString = "(&(" + Constants.OBJECTCLASS + "=" + LogStore.class.getName() + ")(name=" + name + "))";
+                filterForDiscovery = "(&(" + Constants.OBJECTCLASS + "=" + Discovery.class.getName() + ")(!(ma=*)))";
+                filterForIdentification = "(&(" + Constants.OBJECTCLASS + "=" + Identification.class.getName() + ")(!(ma=*)))";
                 schedulerName = name;
-                description = "Task that synchronizes log store with id=" + name + " on the gateway and server";
+                description = "Task that synchronizes log store with id=" + name + " on the target and server";
             }
             else {
                 // if there is more than one management agent ("ma" is specified) then still it's very well possible that there's only
                 // one log, so either bind to this one global log (assuming ma is not specified for it) or a ma-specific log (ma is
                 // specified)
-                filterString = "(&("+Constants.OBJECTCLASS+"="+LogStore.class.getName()+")(name=" + name + ")(|(ma=" + ma + ")(!(ma=*))))";
-                filterForDiscovery = "(&("+Constants.OBJECTCLASS+"="+Discovery.class.getName()+")(ma=" + ma + "))";
-                filterForIdentification = "(&("+Constants.OBJECTCLASS+"="+Identification.class.getName()+")(ma=" + ma + "))";
+                filterString = "(&(" + Constants.OBJECTCLASS + "=" + LogStore.class.getName() + ")(name=" + name + ")(|(ma=" + ma + ")(!(ma=*))))";
+                filterForDiscovery = "(&(" + Constants.OBJECTCLASS + "=" + Discovery.class.getName() + ")(ma=" + ma + "))";
+                filterForIdentification = "(&(" + Constants.OBJECTCLASS+"=" + Identification.class.getName() + ")(ma=" + ma + "))";
                 schedulerName = "ma=" + ma + ";name=" + name;
-                description = "Task that synchronizes log store with id=" + name + " and ma=" + ma + " on the gateway and server";
+                description = "Task that synchronizes log store with id=" + name + " and ma=" + ma + " on the target and server";
                 properties.put(MA_NAME, ma);
             }
 

Propchange: ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/LogSyncConfigurator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/task/Connection.java (from r1301481, ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/task/Connection.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/task/Connection.java?p2=ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/task/Connection.java&p1=ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/task/Connection.java&r1=1301481&r2=1301534&rev=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/task/Connection.java (original)
+++ ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/task/Connection.java Fri Mar 16 14:10:13 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.ace.gateway.log.task;
+package org.apache.ace.target.log.task;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/task/LogSyncTask.java (from r1301481, ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/task/LogSyncTask.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/task/LogSyncTask.java?p2=ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/task/LogSyncTask.java&p1=ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/task/LogSyncTask.java&r1=1301481&r2=1301534&rev=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/task/LogSyncTask.java (original)
+++ ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/target/log/task/LogSyncTask.java Fri Mar 16 14:10:13 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.ace.gateway.log.task;
+package org.apache.ace.target.log.task;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -29,19 +29,19 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apache.ace.discovery.Discovery;
-import org.apache.ace.gateway.log.store.LogStore;
 import org.apache.ace.identification.Identification;
 import org.apache.ace.log.LogDescriptor;
 import org.apache.ace.log.LogEvent;
 import org.apache.ace.range.RangeIterator;
 import org.apache.ace.range.SortedRangeSet;
+import org.apache.ace.target.log.store.LogStore;
 import org.osgi.service.log.LogService;
 
 public class LogSyncTask implements Runnable {
 
     private static final String COMMAND_QUERY = "query";
     private static final String COMMAND_SEND = "send";
-    private static final String PARAMETER_GATEWAYID = "gwid";
+    private static final String PARAMETER_TARGETID = "tid";
     private static final String PARAMETER_LOGID = "logid";
 
     // injected by dependencymanager
@@ -75,7 +75,7 @@ public class LogSyncTask implements Runn
     		return;
     	}
 
-    	String gatewayID = m_identification.getID();
+    	String targetId = m_identification.getID();
         Connection sendConnection = null;
         try {
             sendConnection = new Connection(new URL(host, m_endpoint + "/" + COMMAND_SEND));
@@ -83,7 +83,7 @@ public class LogSyncTask implements Runn
             for (int i = 0; i < logIDs.length; i++) {
                 Connection queryConnection = new Connection(new URL(host,
                         m_endpoint + "/" + COMMAND_QUERY + "?"
-                            + PARAMETER_GATEWAYID + "=" + gatewayID + "&"
+                            + PARAMETER_TARGETID + "=" + targetId + "&"
                             + PARAMETER_LOGID + "=" + logIDs[i]));
                 // TODO: make sure no actual call is made using sendConnection
                 // when there's nothing to sync
@@ -102,7 +102,7 @@ public class LogSyncTask implements Runn
 
     /**
      * Synchronizes a single log (there can be multiple log/logid's per
-     * gateway).
+     * target).
      * 
      * @param logID
      *            ID of the log to synchronize.

Modified: ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1301534&r1=1301533&r2=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.properties Fri Mar 16 14:10:13 2012
@@ -1,8 +1,8 @@
-log.service.name=Apache ACE :: Gateway :: Log Service
-log.service.desc=Log service for a gateway. It receives log entries and stores them in a log store.
+log.service.name=Apache ACE :: Target :: Log Service
+log.service.desc=Log service for a target. It receives log entries and stores them in a log store.
 
-sync.service.name=Apache ACE :: Gateway :: Log Synchronization Task
-sync.service.desc=Task that synchronizes a log store on the gateway with an upstream server.
+sync.service.name=Apache ACE :: Target :: Log Synchronization Task
+sync.service.desc=Task that synchronizes a log store on the target with an upstream server.
 
 name.name=Log Store Name
 name.desc=The name of the log store to use.

Modified: ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=1301534&r1=1301533&r2=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.xml (original)
+++ ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.xml Fri Mar 16 14:10:13 2012
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0"
   localization="OSGI-INF/metatype/metatype">
-  <metatype:OCD id="org.apache.ace.gateway.log" name="%log.service.name" description="%log.service.desc">
+  <metatype:OCD id="org.apache.ace.target.log" name="%log.service.name" description="%log.service.desc">
     <metatype:AD id="name" type="String" name="%name.name" description="%name.desc"/>
   </metatype:OCD>
-  <metatype:OCD id="org.apache.ace.gateway.log.sync" name="%sync.service.name" description="%sync.service.desc">
+  <metatype:OCD id="org.apache.ace.target.log.sync" name="%sync.service.name" description="%sync.service.desc">
     <metatype:AD id="name" type="String" name="%name.name" description="%name.desc"/>
     <metatype:AD id="ma" type="String" name="%ma.name" description="%ma.desc" required="false"/>
   </metatype:OCD>
-  <metatype:Designate pid="org.apache.ace.gateway.log.factory"
-      factoryPid="org.apache.ace.gateway.log.factory">
-    <metatype:Object ocdref="org.apache.ace.gateway.log"/>
+  <metatype:Designate pid="org.apache.ace.target.log.factory"
+      factoryPid="org.apache.ace.target.log.factory">
+    <metatype:Object ocdref="org.apache.ace.target.log"/>
   </metatype:Designate>
-  <metatype:Designate pid="org.apache.ace.gateway.log.sync.factory"
-      factoryPid="org.apache.ace.gateway.log.sync.factory">
-    <metatype:Object ocdref="org.apache.ace.gateway.log.sync"/>
+  <metatype:Designate pid="org.apache.ace.target.log.sync.factory"
+      factoryPid="org.apache.ace.target.log.sync.factory">
+    <metatype:Object ocdref="org.apache.ace.target.log.sync"/>
   </metatype:Designate>
 </metatype:MetaData>

Copied: ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/target/log/task/LogSyncTaskTest.java (from r1301481, ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/gateway/log/task/LogSyncTaskTest.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/target/log/task/LogSyncTaskTest.java?p2=ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/target/log/task/LogSyncTaskTest.java&p1=ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/gateway/log/task/LogSyncTaskTest.java&r1=1301481&r2=1301534&rev=1301534&view=diff
==============================================================================
--- ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/gateway/log/task/LogSyncTaskTest.java (original)
+++ ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/target/log/task/LogSyncTaskTest.java Fri Mar 16 14:10:13 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.ace.gateway.log.task;
+package org.apache.ace.target.log.task;
 
 import static org.apache.ace.test.utils.TestUtils.UNIT;
 
@@ -30,11 +30,13 @@ import java.util.List;
 import java.util.Properties;
 
 import org.apache.ace.discovery.Discovery;
-import org.apache.ace.gateway.log.store.LogStore;
 import org.apache.ace.identification.Identification;
 import org.apache.ace.log.LogDescriptor;
 import org.apache.ace.log.LogEvent;
 import org.apache.ace.range.SortedRangeSet;
+import org.apache.ace.target.log.store.LogStore;
+import org.apache.ace.target.log.task.Connection;
+import org.apache.ace.target.log.task.LogSyncTask;
 import org.apache.ace.test.utils.TestUtils;
 import org.osgi.service.log.LogService;
 import org.testng.annotations.BeforeMethod;

Modified: ace/trunk/ace-identification-ifconfig/src/main/java/org/apache/ace/identification/ifconfig/IfconfigIdentification.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-identification-ifconfig/src/main/java/org/apache/ace/identification/ifconfig/IfconfigIdentification.java?rev=1301534&r1=1301533&r2=1301534&view=diff
==============================================================================
--- ace/trunk/ace-identification-ifconfig/src/main/java/org/apache/ace/identification/ifconfig/IfconfigIdentification.java (original)
+++ ace/trunk/ace-identification-ifconfig/src/main/java/org/apache/ace/identification/ifconfig/IfconfigIdentification.java Fri Mar 16 14:10:13 2012
@@ -41,19 +41,19 @@ public class IfconfigIdentification impl
 
     private volatile LogService m_log; // injected by dependency manager
 
-    private String m_gatewayID = null;
+    private String m_targetID = null;
 
     public synchronized String getID() {
-        if (m_gatewayID == null) {
+        if (m_targetID == null) {
             BufferedReader reader = null;
             try {
                 Process process = Runtime.getRuntime().exec(IFCONFIG_COMMAND);
                 InputStream inputStream = process.getInputStream();
                 reader = new BufferedReader(new InputStreamReader(inputStream));
-                m_gatewayID = parseIfconfigOutput(reader).toLowerCase();
+                m_targetID = parseIfconfigOutput(reader).toLowerCase();
             }
             catch (IOException ioe) {
-                m_log.log(LogService.LOG_WARNING, "Unable to determine ifconfig based mac-address gateway identification.", ioe);
+                m_log.log(LogService.LOG_WARNING, "Unable to determine ifconfig based mac-address target identification.", ioe);
                 return null;
             }
             finally {
@@ -67,7 +67,7 @@ public class IfconfigIdentification impl
                 }
             }
         }
-        return m_gatewayID;
+        return m_targetID;
     }
 
     /**

Modified: ace/trunk/ace-identification-property/src/main/java/org/apache/ace/identification/property/constants/IdentificationConstants.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-identification-property/src/main/java/org/apache/ace/identification/property/constants/IdentificationConstants.java?rev=1301534&r1=1301533&r2=1301534&view=diff
==============================================================================
--- ace/trunk/ace-identification-property/src/main/java/org/apache/ace/identification/property/constants/IdentificationConstants.java (original)
+++ ace/trunk/ace-identification-property/src/main/java/org/apache/ace/identification/property/constants/IdentificationConstants.java Fri Mar 16 14:10:13 2012
@@ -21,5 +21,5 @@ package org.apache.ace.identification.pr
 public interface IdentificationConstants {
     public static final String IDENTIFICATION_PID = "org.apache.ace.identification.property";
     public static final String IDENTIFICATION_FACTORY_PID = "org.apache.ace.identification.property.factory";
-    public static final String IDENTIFICATION_TARGETID_KEY = "gatewayID";
+    public static final String IDENTIFICATION_TARGETID_KEY = "targetID";
 }
\ No newline at end of file

Modified: ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1301534&r1=1301533&r2=1301534&view=diff
==============================================================================
--- ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.properties Fri Mar 16 14:10:13 2012
@@ -1,5 +1,5 @@
 service.name=Apache ACE :: Target Identification
 service.desc=Configuration for the property-based ACE deployment target identification.
 
-gatewayID.name=Target ID
-gatewayID.desc=The identification of the deployment target.
+targetID.name=Target ID
+targetID.desc=The identification of the deployment target.

Modified: ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=1301534&r1=1301533&r2=1301534&view=diff
==============================================================================
--- ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.xml (original)
+++ ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.xml Fri Mar 16 14:10:13 2012
@@ -2,7 +2,7 @@
 <metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0"
     localization="OSGI-INF/metatype/metatype">
   <metatype:OCD id="org.apache.ace.identification.property" name="%service.name">
-    <metatype:AD id="gatewayID" type="String" name="%gatewayID.name" description="%gatewayID.desc"/>
+    <metatype:AD id="targetID" type="String" name="%targetID.name" description="%targetID.desc"/>
   </metatype:OCD>
   <metatype:Designate pid="org.apache.ace.identification.property">
     <metatype:Object ocdref="org.apache.ace.identification.property"/>

Modified: ace/trunk/ace-identification-property/src/test/java/org/apache/ace/identification/property/PropertyBasedIdentificationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-identification-property/src/test/java/org/apache/ace/identification/property/PropertyBasedIdentificationTest.java?rev=1301534&r1=1301533&r2=1301534&view=diff
==============================================================================
--- ace/trunk/ace-identification-property/src/test/java/org/apache/ace/identification/property/PropertyBasedIdentificationTest.java (original)
+++ ace/trunk/ace-identification-property/src/test/java/org/apache/ace/identification/property/PropertyBasedIdentificationTest.java Fri Mar 16 14:10:13 2012
@@ -45,9 +45,9 @@ public class PropertyBasedIdentification
     public void getIdWithUpdate() throws ConfigurationException {
         PropertyBasedIdentification basedIdentification = new PropertyBasedIdentification();
         Dictionary dict = new Hashtable();
-        dict.put( IdentificationConstants.IDENTIFICATION_TARGETID_KEY, "myGatewayId" );
+        dict.put( IdentificationConstants.IDENTIFICATION_TARGETID_KEY, "myTargetId" );
         basedIdentification.updated( dict );
-        assertThat( basedIdentification.getID(), is( equalTo( "myGatewayId" ) ) );
+        assertThat( basedIdentification.getID(), is( equalTo( "myTargetId" ) ) );
     }
 
     @Test(groups = { UNIT })

Modified: ace/trunk/ace-identification-property/src/test/java/org/apache/ace/identification/property/SimpleIdentificationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-identification-property/src/test/java/org/apache/ace/identification/property/SimpleIdentificationTest.java?rev=1301534&r1=1301533&r2=1301534&view=diff
==============================================================================
--- ace/trunk/ace-identification-property/src/test/java/org/apache/ace/identification/property/SimpleIdentificationTest.java (original)
+++ ace/trunk/ace-identification-property/src/test/java/org/apache/ace/identification/property/SimpleIdentificationTest.java Fri Mar 16 14:10:13 2012
@@ -31,7 +31,7 @@ import org.testng.annotations.Test;
 public class SimpleIdentificationTest {
     private PropertyBasedIdentification m_identification;
 
-    private static final String TEST_ID = "testGatewayID";
+    private static final String TEST_ID = "testTargetID";
 
     @BeforeTest(alwaysRun = true)
     protected void setUp() throws Exception {
@@ -51,6 +51,6 @@ public class SimpleIdentificationTest {
             new Properties() {
                 {put(IdentificationConstants.IDENTIFICATION_TARGETID_KEY, TEST_ID);}
             });
-        assert TEST_ID.equals(m_identification.getID()) : "gateway ID does not match configured gateway ID";
+        assert TEST_ID.equals(m_identification.getID()) : "target ID does not match configured target ID";
     }
 }

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/Options.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/Options.java?rev=1301534&r1=1301533&r2=1301534&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/Options.java (original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/Options.java Fri Mar 16 14:10:13 2012
@@ -178,12 +178,12 @@ public class Options {
             return maven("org.apache.ace.log.task");
         }
 
-        public static MavenArtifactProvisionOption gatewayLog() {
-            return maven("org.apache.ace.gateway.log");
+        public static MavenArtifactProvisionOption targetLog() {
+            return maven("org.apache.ace.gateway.log"); // TODO rename!
         }
 
-        public static MavenArtifactProvisionOption gatewayLogStore() {
-            return maven("org.apache.ace.gateway.log.store");
+        public static MavenArtifactProvisionOption targetLogStore() {
+            return maven("org.apache.ace.gateway.log.store"); // TODO rename!
         }
 
         public static MavenArtifactProvisionOption obrMetadata() {

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=1301534&r1=1301533&r2=1301534&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 14:10:13 2012
@@ -52,7 +52,7 @@ import static org.apache.ace.it.Options.
 import static org.ops4j.pax.exam.CoreOptions.*;
 
 /**
- * Integration tests for the audit log. Both a server and a gateway are setup
+ * Integration tests for the audit log. Both a server and a target are setup
  * on the same machine. The audit log is run and we check if it is indeed
  * replicated to the server.
  */
@@ -80,8 +80,8 @@ public class LogIntegrationTest extends 
                 Ace.logServlet(),
                 Ace.serverLogStore(),
                 Ace.logTask(),
-                Ace.gatewayLog(),
-                Ace.gatewayLogStore()
+                Ace.targetLog(),
+                Ace.targetLogStore()
             )
         );
     }
@@ -90,13 +90,13 @@ public class LogIntegrationTest extends 
         configure(DiscoveryConstants.DISCOVERY_PID,
                 DiscoveryConstants.DISCOVERY_URL_KEY, "http://" + HOST + ":" + TestConstants.PORT);
         configure(IdentificationConstants.IDENTIFICATION_PID,
-                IdentificationConstants.IDENTIFICATION_TARGETID_KEY, GWID);
+                IdentificationConstants.IDENTIFICATION_TARGETID_KEY, TARGET_ID);
 
-        configureFactory("org.apache.ace.gateway.log.store.factory",
+        configureFactory("org.apache.ace.target.log.store.factory",
                 "name", "auditlog");
-        configureFactory("org.apache.ace.gateway.log.factory",
+        configureFactory("org.apache.ace.target.log.factory",
                 "name", "auditlog");
-        configureFactory("org.apache.ace.gateway.log.sync.factory",
+        configureFactory("org.apache.ace.target.log.sync.factory",
             "name", "auditlog");
 
         configure("org.apache.ace.deployment.servlet",
@@ -125,7 +125,7 @@ public class LogIntegrationTest extends 
     private static final String DEPLOYMENT = "/deployment";
 
     public static final String HOST = "localhost";
-    public static final String GWID = "gw-id";
+    public static final String TARGET_ID = "target-id";
 
     private volatile Log m_auditLog;
     private volatile LogStore m_serverStore;
@@ -153,7 +153,7 @@ public class LogIntegrationTest extends 
             // get and evaluate results (note that there is some concurrency that might interfere with this test)
             List<LogDescriptor> ranges2 = m_serverStore.getDescriptors();
             if (ranges2.size() > 0) {
-//              assert ranges2.size() == 1 : "We should still have audit log events for one gateway on the server, but found " + ranges2.size();
+//              assert ranges2.size() == 1 : "We should still have audit log events for one target on the server, but found " + ranges2.size();
                 LogDescriptor range = ranges2.get(0);
                 List<LogEvent> events = m_serverStore.get(range);
                 if (events.size() > 1) {
@@ -189,22 +189,22 @@ public class LogIntegrationTest extends 
         assert result.size() > 1 : "We expect at least two logs on the server.";
 
         result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=42");
-        assert result.size() == 1 : "Gateway 42 has a single audit log event.";
+        assert result.size() == 1 : "Target 42 has a single audit log event.";
 
         result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47");
-        assert result.size() == 3 : "Gateway 47 has 3 audit log events.";
+        assert result.size() == 3 : "Target 47 has 3 audit log events.";
 
         result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47&logid=1");
-        assert result.size() == 1 : "Gateway 47, logid 1 has 1 audit log event.";
+        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");
-        assert result.size() == 2 : "Gateway 47, logid 2 has 2 audit log events.";
+        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");
-        assert result.size() == 1 : "Gateway 47, logid 2, range 1 has 1 audit log event.";
+        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");
-        assert result.size() == 0 : "Gateway 47, logid 2, range 3,5 has 0 audit log event.";
+        assert result.size() == 0 : "Target 47, logid 2, range 3,5 has 0 audit log event.";
     }
 
     private List<String> getResponse(String request) throws IOException {

Modified: ace/trunk/ace-managementagent/src/main/java/org/apache/ace/managementagent/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-managementagent/src/main/java/org/apache/ace/managementagent/Activator.java?rev=1301534&r1=1301533&r2=1301534&view=diff
==============================================================================
--- ace/trunk/ace-managementagent/src/main/java/org/apache/ace/managementagent/Activator.java (original)
+++ ace/trunk/ace-managementagent/src/main/java/org/apache/ace/managementagent/Activator.java Fri Mar 16 14:10:13 2012
@@ -20,8 +20,8 @@ public class Activator extends Dependenc
         new org.apache.ace.deployment.deploymentadmin.Activator(),
         new org.apache.ace.deployment.task.Activator(),
         new org.apache.ace.discovery.property.Activator(),
-        new org.apache.ace.gateway.log.Activator(),
-        new org.apache.ace.gateway.log.store.impl.Activator(),
+        new org.apache.ace.target.log.Activator(),
+        new org.apache.ace.target.log.store.impl.Activator(),
         new org.apache.ace.identification.property.Activator(),
         new org.apache.ace.log.listener.Activator(),
         new org.apache.ace.scheduler.Activator(),



Mime
View raw message