ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1301381 [1/4] - in /ace/trunk: ./ ace-ant-tasks/ ace-client-automation/ ace-client-automation/src/main/java/org/apache/ace/client/automation/ ace-client-repository-api/ ace-client-repository-api/src/main/java/org/apache/ace/client/reposito...
Date Fri, 16 Mar 2012 08:58:23 GMT
Author: marrs
Date: Fri Mar 16 08:58:19 2012
New Revision: 1301381

URL: http://svn.apache.org/viewvc?rev=1301381&view=rev
Log:
ACE-213 ACE-63 updated all the poms, started refactoring at the first project

Added:
    ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/AutoTargetOperator.java
      - copied, changed from r1301359, ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/AutoGatewayOperator.java
    ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/TargetObject.java
      - copied, changed from r1301359, ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/GatewayObject.java
    ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/TargetRepository.java
      - copied, changed from r1301359, ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/GatewayRepository.java
    ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulTargetObject.java
      - copied, changed from r1301359, ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulGatewayObject.java
    ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java
      - copied, changed from r1301359, ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulGatewayRepository.java
Removed:
    ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/AutoGatewayOperator.java
    ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/GatewayObject.java
    ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/GatewayRepository.java
    ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulGatewayObject.java
    ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulGatewayRepository.java
Modified:
    ace/trunk/ace-ant-tasks/build.xml
    ace/trunk/ace-ant-tasks/pom.xml
    ace/trunk/ace-client-automation/pom.xml
    ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/Activator.java
    ace/trunk/ace-client-repository-api/pom.xml
    ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/RepositoryAdminLoginContext.java
    ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/License2GatewayAssociation.java
    ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/LicenseObject.java
    ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/ArtifactRepository.java
    ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/License2GatewayAssociationRepository.java
    ace/trunk/ace-client-repository-helper-base/pom.xml
    ace/trunk/ace-client-repository-helper-bundle/pom.xml
    ace/trunk/ace-client-repository-helper-configuration/pom.xml
    ace/trunk/ace-client-repository-helper-user/pom.xml
    ace/trunk/ace-client-repository-impl/pom.xml
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GatewayObjectImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GatewayPropertyResolver.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GatewayRepositoryImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/License2GatewayAssociationImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/License2GatewayAssociationRepositoryImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/LicenseObjectImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepoPropertyResolver.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminLoginContextImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayObjectImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java
    ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/ModelTest.java
    ace/trunk/ace-client-repository-useradmin/pom.xml
    ace/trunk/ace-client-rest/pom.xml
    ace/trunk/ace-client-rest/src/main/java/org/apache/ace/client/rest/RESTClientServlet.java
    ace/trunk/ace-client-rest/src/main/java/org/apache/ace/client/rest/RepositoryObjectSerializer.java
    ace/trunk/ace-client-rest/src/main/java/org/apache/ace/client/rest/Workspace.java
    ace/trunk/ace-configurator-serveruseradmin/pom.xml
    ace/trunk/ace-configurator-useradmin-task/pom.xml
    ace/trunk/ace-configurator/pom.xml
    ace/trunk/ace-consolelogger/pom.xml
    ace/trunk/ace-deployment-api/pom.xml
    ace/trunk/ace-deployment-deploymentadmin/pom.xml
    ace/trunk/ace-deployment-provider-api/pom.xml
    ace/trunk/ace-deployment-provider-base/pom.xml
    ace/trunk/ace-deployment-provider-filebased/pom.xml
    ace/trunk/ace-deployment-provider-repositorybased/pom.xml
    ace/trunk/ace-deployment-servlet/pom.xml
    ace/trunk/ace-deployment-streamgenerator/pom.xml
    ace/trunk/ace-deployment-task/pom.xml
    ace/trunk/ace-deployment-verifier-ui/pom.xml
    ace/trunk/ace-deployment-verifier-ui/src/main/java/org/apache/ace/deployment/verifier/ui/ACEVerifierExtension.java
    ace/trunk/ace-deployment-verifier/pom.xml
    ace/trunk/ace-discovery-api/pom.xml
    ace/trunk/ace-discovery-property/pom.xml
    ace/trunk/ace-discovery-upnp/pom.xml
    ace/trunk/ace-gateway-log-store/pom.xml
    ace/trunk/ace-gateway-log/pom.xml
    ace/trunk/ace-glassfish-launcher/pom.xml
    ace/trunk/ace-http-redirector/pom.xml
    ace/trunk/ace-httplistener/pom.xml
    ace/trunk/ace-identification-api/pom.xml
    ace/trunk/ace-identification-ifconfig/pom.xml
    ace/trunk/ace-identification-property/pom.xml
    ace/trunk/ace-integrationtests/pom.xml
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/repositoryadmin/RepositoryAdminTest.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/AssemblyConfigureTest.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/MinimalGatewayTest.java
    ace/trunk/ace-karaf-features/pom.xml
    ace/trunk/ace-launcher/pom.xml
    ace/trunk/ace-location-upnp/pom.xml
    ace/trunk/ace-location-upnp/src/main/java/org/apache/ace/location/upnp/ProvisioningDevice.java
    ace/trunk/ace-log-listener/pom.xml
    ace/trunk/ace-log-servlet/pom.xml
    ace/trunk/ace-log-task/pom.xml
    ace/trunk/ace-log/pom.xml
    ace/trunk/ace-managementagent/pom.xml
    ace/trunk/ace-nodelauncher-amazon/pom.xml
    ace/trunk/ace-nodelauncher-api/pom.xml
    ace/trunk/ace-nodelauncher-ui/pom.xml
    ace/trunk/ace-nodelauncher-ui/src/main/java/org/apache/ace/nodelauncher/ui/NodeLauncherPanelFactory.java
    ace/trunk/ace-obr-metadata/pom.xml
    ace/trunk/ace-obr-servlet/pom.xml
    ace/trunk/ace-obr-storage/pom.xml
    ace/trunk/ace-range-api/pom.xml
    ace/trunk/ace-repository-api/pom.xml
    ace/trunk/ace-repository-ext/pom.xml
    ace/trunk/ace-repository-impl/pom.xml
    ace/trunk/ace-repository-servlet/pom.xml
    ace/trunk/ace-repository-task/pom.xml
    ace/trunk/ace-resourceprocessor-useradmin/pom.xml
    ace/trunk/ace-scheduler-api/pom.xml
    ace/trunk/ace-scheduler/pom.xml
    ace/trunk/ace-server-action-popupmessage/pom.xml
    ace/trunk/ace-server-action/pom.xml
    ace/trunk/ace-server-log-store/pom.xml
    ace/trunk/ace-server-log-ui/pom.xml
    ace/trunk/ace-server-log-ui/src/main/java/org/apache/ace/server/log/ui/LogViewerExtension.java
    ace/trunk/ace-tageditor/pom.xml
    ace/trunk/ace-tageditor/src/main/java/org/apache/ace/tageditor/ACETagEditorExtension.java
    ace/trunk/ace-target-defaults/pom.xml
    ace/trunk/ace-target-devgateway/DISCLAIMER
    ace/trunk/ace-target-devgateway/pom.xml
    ace/trunk/ace-target-devserver/DISCLAIMER
    ace/trunk/ace-target-devserver/pom.xml
    ace/trunk/ace-target-mgmt-ui/pom.xml
    ace/trunk/ace-target-mgmt-ui/src/main/java/org/apache/ace/target/management/ui/TargetManagementExtension.java
    ace/trunk/ace-util/pom.xml
    ace/trunk/ace-webconsole-plugin/pom.xml
    ace/trunk/ace-webui-vaadin/pom.xml
    ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/domain/NamedTargetObject.java
    ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Activator.java
    ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Associations.java
    ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java
    ace/trunk/check_staged_release.sh
    ace/trunk/pom.xml
    ace/trunk/pom/pom.xml

Modified: ace/trunk/ace-ant-tasks/build.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-ant-tasks/build.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-ant-tasks/build.xml (original)
+++ ace/trunk/ace-ant-tasks/build.xml Fri Mar 16 08:58:19 2012
@@ -20,14 +20,14 @@
 <!-- be sure to run 'mvn install' to create the library before trying this -->
 <project name="sample-build" default="build">
 	<!-- defines the deployment package task as 'dp' -->
-    <taskdef name="dp" classname="org.apache.ace.ant.deploymentpackage.DeploymentPackageTask" classpath="target/org.apache.ace.ant.tasks-0.8.1-incubator-SNAPSHOT.jar" />
+    <taskdef name="dp" classname="org.apache.ace.ant.deploymentpackage.DeploymentPackageTask" classpath="target/org.apache.ace.ant.tasks-0.8.1-SNAPSHOT.jar" />
 
     <!-- builds a deployment package based on some existing jar files -->
 	<target name="build">
 		<dp name="org.apache.ace.dp.sample" version="1.0.0" dir=".." destination="sample-dp.jar">
 			<!-- uses two completely arbitrary bundles -->
-            <orderedinclude name="ace-log-listener/target/org.apache.ace.log.listener-0.8.1-incubator-SNAPSHOT.jar" />
-			<orderedinclude name="ace-log/target/org.apache.ace.log-0.8.1-incubator-SNAPSHOT.jar" />
+            <orderedinclude name="ace-log-listener/target/org.apache.ace.log.listener-0.8.1-SNAPSHOT.jar" />
+			<orderedinclude name="ace-log/target/org.apache.ace.log-0.8.1-SNAPSHOT.jar" />
 			<include name="ace-range-api/target/*.jar" />
 		</dp>
 	</target>

Modified: ace/trunk/ace-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-ant-tasks/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-ant-tasks/pom.xml (original)
+++ ace/trunk/ace-ant-tasks/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,21 +24,21 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.ace.ant.tasks</artifactId>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <name>Apache ACE :: Ant Tasks</name>
     <description>Collection of Ant tasks for integrating Apache ACE into your development environment.</description>
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-ant-tasks</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-ant-tasks</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-ant-tasks</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-ant-tasks</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-ant-tasks</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-ant-tasks</url>
     </scm>
 
     <dependencies>

Modified: ace/trunk/ace-client-automation/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-automation/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-automation/pom.xml (original)
+++ ace/trunk/ace-client-automation/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.client.automation</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description>Client bundle that automatically registers new targets that connect with the server, approves outgoing changes and turns on automatic approval of future updates.</description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-automation</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-automation</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-automation</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-client-automation</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-client-automation</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-client-automation</url>
     </scm>
 
     <properties>

Modified: ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/Activator.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/Activator.java (original)
+++ ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/Activator.java Fri Mar 16 08:58:19 2012
@@ -20,8 +20,8 @@ package org.apache.ace.client.automation
 
 import org.apache.ace.client.repository.RepositoryAdmin;
 import org.apache.ace.client.repository.repository.DeploymentVersionRepository;
-import org.apache.ace.client.repository.repository.GatewayRepository;
-import org.apache.ace.client.repository.stateful.StatefulGatewayRepository;
+import org.apache.ace.client.repository.repository.TargetRepository;
+import org.apache.ace.client.repository.stateful.StatefulTargetRepository;
 import org.apache.felix.dm.DependencyActivatorBase;
 import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.BundleContext;
@@ -29,7 +29,7 @@ import org.osgi.service.log.LogService;
 import org.osgi.service.useradmin.UserAdmin;
 
 /**
- * Bundle activator for the gateway operator automation.
+ * Bundle activator for the target operator automation.
  */
 public class Activator extends DependencyActivatorBase {
     /**
@@ -38,11 +38,11 @@ public class Activator extends Dependenc
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {
         manager.add(createComponent()
-            .setImplementation(AutoGatewayOperator.class)
-            .add(createConfigurationDependency().setPid(AutoGatewayOperator.PID))
+            .setImplementation(AutoTargetOperator.class)
+            .add(createConfigurationDependency().setPid(AutoTargetOperator.PID))
             .add(createServiceDependency().setRequired(true).setService(UserAdmin.class))
-            .add(createServiceDependency().setRequired(true).setService(GatewayRepository.class))
-            .add(createServiceDependency().setRequired(true).setService(StatefulGatewayRepository.class))
+            .add(createServiceDependency().setRequired(true).setService(TargetRepository.class)) // TODO is this still used?
+            .add(createServiceDependency().setRequired(true).setService(StatefulTargetRepository.class))
             .add(createServiceDependency().setRequired(true).setService(DeploymentVersionRepository.class))
             .add(createServiceDependency().setRequired(true).setService(RepositoryAdmin.class))
             .add(createServiceDependency().setRequired(false).setService(LogService.class))

Copied: ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/AutoTargetOperator.java (from r1301359, ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/AutoGatewayOperator.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/AutoTargetOperator.java?p2=ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/AutoTargetOperator.java&p1=ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/AutoGatewayOperator.java&r1=1301359&r2=1301381&rev=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/AutoGatewayOperator.java (original)
+++ ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/AutoTargetOperator.java Fri Mar 16 08:58:19 2012
@@ -25,9 +25,9 @@ import java.util.List;
 import java.util.Properties;
 import org.apache.ace.client.repository.RepositoryAdmin;
 import org.apache.ace.client.repository.RepositoryAdminLoginContext;
-import org.apache.ace.client.repository.object.GatewayObject;
-import org.apache.ace.client.repository.stateful.StatefulGatewayObject;
-import org.apache.ace.client.repository.stateful.StatefulGatewayRepository;
+import org.apache.ace.client.repository.object.TargetObject;
+import org.apache.ace.client.repository.stateful.StatefulTargetObject;
+import org.apache.ace.client.repository.stateful.StatefulTargetRepository;
 import org.apache.ace.scheduler.constants.SchedulerConstants;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
@@ -39,16 +39,15 @@ import org.osgi.service.useradmin.User;
 import org.osgi.service.useradmin.UserAdmin;
 
 /**
- * Automatic gateway operator, when configured will automatically register, approve, auto-approve
- * and commit gateways to the repository. An LDAP filter can be used to filter for the correct gateways
- *
+ * Automatic target operator, when configured will automatically register, approve, auto-approve
+ * and commit targets to the repository. An LDAP filter can be used to filter for the correct targets.
  */
-public class AutoGatewayOperator implements ManagedService {
+public class AutoTargetOperator implements ManagedService {
 
     public static final String PID = "org.apache.ace.client.automation";
     public static final String SCHEDULER_NAME = "org.apache.ace.client.processauditlog";
 
-    private volatile StatefulGatewayRepository m_statefulGatewayRepos;
+    private volatile StatefulTargetRepository m_statefulTargetRepos;
     private volatile RepositoryAdmin m_reposAdmin;
     private volatile UserAdmin m_userAdmin;
     private volatile BundleContext m_bundleContext;
@@ -73,7 +72,7 @@ public class AutoGatewayOperator impleme
 
             RepositoryAdminLoginContext loginContext = m_reposAdmin.createLoginContext(user);
             loginContext.addShopRepository(url, customerName, getConfigValue( ConfigItem.STORE_REPOSITORY), false)
-            .addGatewayRepository(url, customerName, getConfigValue( ConfigItem.GATEWAY_REPOSITORY), true)
+            .addTargetRepository(url, customerName, getConfigValue( ConfigItem.TARGET_REPOSITORY), true)
             .addDeploymentRepository(url, customerName, getConfigValue( ConfigItem.DEPLOYMENT_REPOSITORY), true);
             m_reposAdmin.login(loginContext);
 
@@ -115,19 +114,19 @@ public class AutoGatewayOperator impleme
         public void process() {
             // perform synchronous model actions
             synchronized(m_lock) {
-                m_statefulGatewayRepos.refresh();
+                m_statefulTargetRepos.refresh();
                 boolean changed = false;
                 try {
                     checkoutModel();
-                    changed |=registerGateways();
-                    changed |=approveGateways();
-                    changed |=setAutoApprove();
+                    changed |= registerTargets();
+                    changed |= approveTargets();
+                    changed |= setAutoApprove();
                 }
                 catch (IOException ioe) {
                     m_log.log(LogService.LOG_WARNING, "Checkout of model failed.", ioe);
                 }
                 catch (InvalidSyntaxException ise) {
-                    m_log.log(LogService.LOG_WARNING, "Illegal register gateway filter.", ise);
+                    m_log.log(LogService.LOG_WARNING, "Illegal register target filter.", ise);
                 }
 
                 // Commit any changes
@@ -154,13 +153,13 @@ public class AutoGatewayOperator impleme
         }
     }
 
-    private boolean registerGateways() throws InvalidSyntaxException {
+    private boolean registerTargets() throws InvalidSyntaxException {
         boolean changed = false;
-        String filter = "(&" + getConfigValue( ConfigItem.REGISTER_GW_FILTER) +
-        "(" + StatefulGatewayObject.KEY_REGISTRATION_STATE + "=" + StatefulGatewayObject.RegistrationState.Unregistered + "))";
-        List<StatefulGatewayObject> sgos =  m_statefulGatewayRepos.get(m_bundleContext.createFilter(filter));
-        for (StatefulGatewayObject sgo : sgos) {
-            sgo.register();
+        String filter = "(&" + getConfigValue( ConfigItem.REGISTER_TARGET_FILTER) +
+        "(" + StatefulTargetObject.KEY_REGISTRATION_STATE + "=" + StatefulTargetObject.RegistrationState.Unregistered + "))";
+        List<StatefulTargetObject> stos =  m_statefulTargetRepos.get(m_bundleContext.createFilter(filter));
+        for (StatefulTargetObject sto : stos) {
+            sto.register();
             changed = true;
         }
         return changed;
@@ -168,26 +167,26 @@ public class AutoGatewayOperator impleme
 
     private boolean setAutoApprove() throws InvalidSyntaxException {
         boolean changed = false;
-        String filter = "(&" + getConfigValue( ConfigItem.AUTO_APPROVE_GW_FILTER) +
-        "(" + StatefulGatewayObject.KEY_REGISTRATION_STATE + "=" + StatefulGatewayObject.RegistrationState.Registered + ")" +
-        "(!(" + GatewayObject.KEY_AUTO_APPROVE + "=true)))";
-
-        List<StatefulGatewayObject> sgos =  m_statefulGatewayRepos.get(m_bundleContext.createFilter(filter));
-        for (StatefulGatewayObject sgo : sgos) {
-                sgo.setAutoApprove(true);
+        String filter = "(&" + getConfigValue( ConfigItem.AUTO_APPROVE_TARGET_FILTER) +
+        "(" + StatefulTargetObject.KEY_REGISTRATION_STATE + "=" + StatefulTargetObject.RegistrationState.Registered + ")" +
+        "(!(" + TargetObject.KEY_AUTO_APPROVE + "=true)))";
+
+        List<StatefulTargetObject> stos =  m_statefulTargetRepos.get(m_bundleContext.createFilter(filter));
+        for (StatefulTargetObject sto : stos) {
+                sto.setAutoApprove(true);
                 changed = true;
             }
         return changed;
     }
 
-    private boolean approveGateways() throws InvalidSyntaxException {
+    private boolean approveTargets() throws InvalidSyntaxException {
         boolean changed = false;
-        String filter = "(&" + getConfigValue( ConfigItem.APPROVE_GW_FILTER) +
-        "(" + StatefulGatewayObject.KEY_STORE_STATE + "=" + StatefulGatewayObject.StoreState.Unapproved + "))";
+        String filter = "(&" + getConfigValue( ConfigItem.APPROVE_TARGET_FILTER) +
+        "(" + StatefulTargetObject.KEY_STORE_STATE + "=" + StatefulTargetObject.StoreState.Unapproved + "))";
 
-        List<StatefulGatewayObject> sgos =  m_statefulGatewayRepos.get(m_bundleContext.createFilter(filter));
-            for (StatefulGatewayObject sgo : sgos) {
-                sgo.approve();
+        List<StatefulTargetObject> stos =  m_statefulTargetRepos.get(m_bundleContext.createFilter(filter));
+            for (StatefulTargetObject sto : stos) {
+                sto.approve();
                 changed = true;
             }
         return changed;
@@ -216,16 +215,16 @@ public class AutoGatewayOperator impleme
     }
 
     /**
-     *  Helper class used for gateway automation client configuration.
+     *  Helper class used for target automation client configuration.
      *  ENUM (itemname, errormessage, filter true/false)
      *
      */
     private enum ConfigItem {
-        REGISTER_GW_FILTER ("registerGatewayFilter", "Register gateway filter missing", true),
-        APPROVE_GW_FILTER ("approveGatewayFilter", "Approve gateway filter missing", true),
-        AUTO_APPROVE_GW_FILTER ("autoApproveGatewayFilter", "Auto approve config value missing", true),
+        REGISTER_TARGET_FILTER ("registerTargetFilter", "Register target filter missing", true),
+        APPROVE_TARGET_FILTER ("approveTargetFilter", "Approve target filter missing", true),
+        AUTO_APPROVE_TARGET_FILTER ("autoApproveTargetFilter", "Auto approve config value missing", true),
         COMMIT_REPO ("commitRepositories", "Commit value missing.", false),
-        GATEWAY_REPOSITORY ("gatewayRepository", "GatewayRepository id missing.", false),
+        TARGET_REPOSITORY ("targetRepository", "TargetRepository id missing.", false),
         DEPLOYMENT_REPOSITORY ("deploymentRepository", "DeploymentRepository id missing.", false),
         STORE_REPOSITORY ("storeRepository", "Store Repository id missing.", false),
         CUSTOMER_NAME ("customerName", "Customer name missing", false),

Modified: ace/trunk/ace-client-repository-api/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-api/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-api/pom.xml (original)
+++ ace/trunk/ace-client-repository-api/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.client.repository.api</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description>Client API for working with Apache ACE from code, a script or a UI.</description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-api</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-api</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-api</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-api</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-api</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-api</url>
     </scm>
 
     <properties>
@@ -81,4 +81,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/RepositoryAdminLoginContext.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/RepositoryAdminLoginContext.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/RepositoryAdminLoginContext.java (original)
+++ ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/RepositoryAdminLoginContext.java Fri Mar 16 08:58:19 2012
@@ -67,7 +67,7 @@ public interface RepositoryAdminLoginCon
      * will be used.
      * @return this object, to allow chaining.
      */
-    public RepositoryAdminLoginContext addGatewayRepository(URL repositoryLocation, String repositoryCustomer, String repositoryName, boolean writeAccess);
+    public RepositoryAdminLoginContext addTargetRepository(URL repositoryLocation, String repositoryCustomer, String repositoryName, boolean writeAccess);
 
     /**
      * Adds a deployment repository to this login context.

Modified: ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/License2GatewayAssociation.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/License2GatewayAssociation.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/License2GatewayAssociation.java (original)
+++ ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/License2GatewayAssociation.java Fri Mar 16 08:58:19 2012
@@ -23,7 +23,7 @@ import org.apache.ace.client.repository.
 /**
  * Interface to a License2GatewayAssociation. Most functionality is defined by the generic Association.
  */
-public interface License2GatewayAssociation extends Association<LicenseObject, GatewayObject> {
+public interface License2GatewayAssociation extends Association<LicenseObject, TargetObject> {
     public static final String TOPIC_ENTITY_ROOT = License2GatewayAssociation.class.getSimpleName() + "/";
 
     public static final String TOPIC_ADDED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ADDED_SUFFIX;

Modified: ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/LicenseObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/LicenseObject.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/LicenseObject.java (original)
+++ ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/LicenseObject.java Fri Mar 16 08:58:19 2012
@@ -46,7 +46,7 @@ public interface LicenseObject extends R
      * Returns all <code>GatewayObject</code>s this object is associated with. If there
      * are none, an empty list will be returned.
      */
-    public List<GatewayObject> getGateways();
+    public List<TargetObject> getGateways();
 
     /**
      * Returns all associations this license has with a given group.
@@ -55,7 +55,7 @@ public interface LicenseObject extends R
     /**
      * Returns all associations this license has with a given gateway.
      */
-    public List<License2GatewayAssociation> getAssociationsWith(GatewayObject gateway);
+    public List<License2GatewayAssociation> getAssociationsWith(TargetObject gateway);
 
     /**
      * Returns the name of this bundle.

Copied: ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/TargetObject.java (from r1301359, ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/GatewayObject.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/TargetObject.java?p2=ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/TargetObject.java&p1=ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/GatewayObject.java&r1=1301359&r2=1301381&rev=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/GatewayObject.java (original)
+++ ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/TargetObject.java Fri Mar 16 08:58:19 2012
@@ -22,11 +22,11 @@ import java.util.List;
 
 import org.apache.ace.client.repository.RepositoryObject;
 
-public interface GatewayObject extends RepositoryObject {
+public interface TargetObject extends RepositoryObject {
     public static final String KEY_ID = "id";
     public static final String KEY_AUTO_APPROVE = "autoapprove";
 
-    public static final String TOPIC_ENTITY_ROOT = GatewayObject.class.getSimpleName() + "/";
+    public static final String TOPIC_ENTITY_ROOT = TargetObject.class.getSimpleName() + "/";
 
     public static final String TOPIC_ADDED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ADDED_SUFFIX;
     public static final String TOPIC_REMOVED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_REMOVED_SUFFIX;

Modified: ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/ArtifactRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/ArtifactRepository.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/ArtifactRepository.java (original)
+++ ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/ArtifactRepository.java Fri Mar 16 08:58:19 2012
@@ -24,7 +24,7 @@ import java.util.List;
 
 import org.apache.ace.client.repository.ObjectRepository;
 import org.apache.ace.client.repository.object.ArtifactObject;
-import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
 
 /**
  * Interface to a ArtifactRepository. The functionality is defined by the generic AssociationRepository.
@@ -79,7 +79,7 @@ public interface ArtifactRepository exte
 	 * @return A URL to a new, processed artifact, or to the original one, in case nothing needed to be processed.
      * @throws IOException Thrown if reading the original artifact goes wrong, or storing the processed one.
 	 */
-	public String preprocessArtifact(ArtifactObject artifact, GatewayObject gateway, String gatewayID, String version) throws IOException ;
+	public String preprocessArtifact(ArtifactObject artifact, TargetObject gateway, String gatewayID, String version) throws IOException ;
 
     /**
      * Indicates whether the template should be processed again, given the properties, and the version to which it
@@ -94,7 +94,7 @@ public interface ArtifactRepository exte
      * @return Whether or not a new version has to be created.
      * @throws IOException
      */
-    public boolean needsNewVersion(ArtifactObject artifact, GatewayObject gateway, String gatewayID, String fromVersion);
+    public boolean needsNewVersion(ArtifactObject artifact, TargetObject gateway, String gatewayID, String fromVersion);
 
 	/**
 	 * Sets the OBR that this artifact repository should use to upload artifacts to.

Modified: ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/License2GatewayAssociationRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/License2GatewayAssociationRepository.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/License2GatewayAssociationRepository.java (original)
+++ ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/License2GatewayAssociationRepository.java Fri Mar 16 08:58:19 2012
@@ -19,14 +19,14 @@
 package org.apache.ace.client.repository.repository;
 
 import org.apache.ace.client.repository.AssociationRepository;
-import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
 import org.apache.ace.client.repository.object.License2GatewayAssociation;
 import org.apache.ace.client.repository.object.LicenseObject;
 
 /**
  * Interface to a License2GatewayAssociationRepository. The functionality is defined by the generic AssociationRepository.
  */
-public interface License2GatewayAssociationRepository extends AssociationRepository<LicenseObject, GatewayObject, License2GatewayAssociation> {
+public interface License2GatewayAssociationRepository extends AssociationRepository<LicenseObject, TargetObject, License2GatewayAssociation> {
     /**
      * Creates an assocation from a given license to multiple gateways, which correspond to the given
      * filter string. For parameters to use in the filter, see <code>GatewayObject</code>'s <code>KEY_</code> constants.

Copied: ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/TargetRepository.java (from r1301359, ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/GatewayRepository.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/TargetRepository.java?p2=ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/TargetRepository.java&p1=ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/GatewayRepository.java&r1=1301359&r2=1301381&rev=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/GatewayRepository.java (original)
+++ ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/repository/TargetRepository.java Fri Mar 16 08:58:19 2012
@@ -19,10 +19,10 @@
 package org.apache.ace.client.repository.repository;
 
 import org.apache.ace.client.repository.ObjectRepository;
-import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
 
 /**
  * Interface to a GatewayRepository. The functionality is defined by the generic AssociationRepository.
  */
-public interface GatewayRepository extends ObjectRepository<GatewayObject>{
+public interface TargetRepository extends ObjectRepository<TargetObject>{
 }

Copied: ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulTargetObject.java (from r1301359, ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulGatewayObject.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulTargetObject.java?p2=ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulTargetObject.java&p1=ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulGatewayObject.java&r1=1301359&r2=1301381&rev=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulGatewayObject.java (original)
+++ ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulTargetObject.java Fri Mar 16 08:58:19 2012
@@ -23,7 +23,7 @@ import java.util.List;
 import org.apache.ace.client.repository.RepositoryObject;
 import org.apache.ace.client.repository.object.ArtifactObject;
 import org.apache.ace.client.repository.object.DeploymentArtifact;
-import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
 import org.apache.ace.client.repository.object.License2GatewayAssociation;
 import org.apache.ace.client.repository.object.LicenseObject;
 import org.apache.ace.log.LogEvent;
@@ -33,21 +33,21 @@ import org.apache.ace.log.LogEvent;
  * has, plus added functionality for gathering information from a deployment repository and,
  * optionally, from an AuditLog.
  */
-public interface StatefulGatewayObject extends RepositoryObject {
+public interface StatefulTargetObject extends RepositoryObject {
 
-    public static final String TOPIC_ADDED = StatefulGatewayObject.class.getName().replace('.', '/') + "/ADDED";
-    public static final String TOPIC_REMOVED = StatefulGatewayObject.class.getName().replace('.', '/') + "/REMOVED";
-    public static final String TOPIC_CHANGED = StatefulGatewayObject.class.getName().replace('.', '/') + "/CHANGED";
-    public static final String TOPIC_STATUS_CHANGED = StatefulGatewayObject.class.getName().replace('.', '/') + "/STATUS_CHANGED";
+    public static final String TOPIC_ADDED = StatefulTargetObject.class.getName().replace('.', '/') + "/ADDED";
+    public static final String TOPIC_REMOVED = StatefulTargetObject.class.getName().replace('.', '/') + "/REMOVED";
+    public static final String TOPIC_CHANGED = StatefulTargetObject.class.getName().replace('.', '/') + "/CHANGED";
+    public static final String TOPIC_STATUS_CHANGED = StatefulTargetObject.class.getName().replace('.', '/') + "/STATUS_CHANGED";
     /** Indicates a change to the audit events for the StatefulGatewayObject in "entity".*/
-    public static final String TOPIC_AUDITEVENTS_CHANGED = StatefulGatewayObject.class.getName().replace('.', '/') + "/AUDITEVENTS_CHANGED";
+    public static final String TOPIC_AUDITEVENTS_CHANGED = StatefulTargetObject.class.getName().replace('.', '/') + "/AUDITEVENTS_CHANGED";
     /** Key used in the event with topic <code>TOPIC_AUDITEVENTS_CHANGED</code>. Contains a List<LogDescriptor> containing all
      *  events we have not seen yet. NOTE: The first auditevent "change" causing the <code>StatefulGatewayObject</code> to
      *  be instantiated will trigger a <code>TOPIC_AUDITEVENTS_CHANGED</code> event *before* a <code>TOPIC_ADDED</code> event. */
     public static final String KEY_AUDITEVENTS = "auditevents";
-    public static final String TOPIC_ALL = StatefulGatewayObject.class.getName().replace('.', '/') + "/*";
+    public static final String TOPIC_ALL = StatefulTargetObject.class.getName().replace('.', '/') + "/*";
 
-    public final static String KEY_ID = GatewayObject.KEY_ID;
+    public final static String KEY_ID = TargetObject.KEY_ID;
     public final static String KEY_REGISTRATION_STATE = "KEY_REGISTRATION_STATE";
     public final static String KEY_STORE_STATE = "KEY_STORE_STATE";
     public final static String KEY_PROVISIONING_STATE = "KEY_PROVISIONING_STATE";
@@ -175,7 +175,7 @@ public interface StatefulGatewayObject e
      * @return The <code>GatewayObject</code> linked to this <code>StatefulGatewayObject</code>; if none
      * is available, an <code>IllegalStateException</code> will be thrown.
      */
-    public GatewayObject getGatewayObject();
+    public TargetObject getGatewayObject();
 
     /**
      * Returns all <code>LicenseObject</code>s this object is associated with. If there

Copied: ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java (from r1301359, ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulGatewayRepository.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java?p2=ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java&p1=ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulGatewayRepository.java&r1=1301359&r2=1301381&rev=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulGatewayRepository.java (original)
+++ ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java Fri Mar 16 08:58:19 2012
@@ -25,7 +25,7 @@ import org.apache.ace.client.repository.
 /**
  * Represents a repository of <ode>StatefulGatewayObject</code>'s.
  */
-public interface StatefulGatewayRepository extends ObjectRepository<StatefulGatewayObject> {
+public interface StatefulTargetRepository extends ObjectRepository<StatefulTargetObject> {
 
     /**
      * Registers a gateway with given attributes. This will result in the creation
@@ -35,7 +35,7 @@ public interface StatefulGatewayReposito
      * @param attributes The attributes to create the <code>GatewayObject</code> with.
      * @return The newly registered gateway object.
      */
-    public StatefulGatewayObject preregister(Map<String, String> attributes, Map<String, String> tags);
+    public StatefulTargetObject preregister(Map<String, String> attributes, Map<String, String> tags);
 
     /**
      * Unregisters a gateway, removing it from the <code>GatewayRepository</code>. Note

Modified: ace/trunk/ace-client-repository-helper-base/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-helper-base/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-helper-base/pom.xml (original)
+++ ace/trunk/ace-client-repository-helper-base/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.client.repository.helper.base</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description>Base implementation and Apache Velocity based artifact preprocessor that allows you to create artifacts that have placeholders in them that can be replaced with entity specific values.</description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-helper-base</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-helper-base</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-helper-base</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-helper-base</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-helper-base</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-helper-base</url>
     </scm>
 
     <properties>
@@ -132,4 +132,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-client-repository-helper-bundle/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-helper-bundle/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-helper-bundle/pom.xml (original)
+++ ace/trunk/ace-client-repository-helper-bundle/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.client.repository.helper.bundle</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description>Artifact recognizer and helper for bundles.</description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-helper-bundle</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-helper-bundle</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-helper-bundle</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-helper-bundle</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-helper-bundle</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-helper-bundle</url>
     </scm>
 
     <properties>
@@ -74,4 +74,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-client-repository-helper-configuration/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-helper-configuration/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-helper-configuration/pom.xml (original)
+++ ace/trunk/ace-client-repository-helper-configuration/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.client.repository.helper.configuration</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description>Artifact recognizer and helper for metatype compliant AutoConf configuration files.</description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-helper-configuration</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-helper-configuration</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-helper-configuration</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-helper-configuration</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-helper-configuration</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-helper-configuration</url>
     </scm>
 
     <properties>
@@ -84,4 +84,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-client-repository-helper-user/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-helper-user/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-helper-user/pom.xml (original)
+++ ace/trunk/ace-client-repository-helper-user/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.client.repository.helper.user</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description>Artifact recognizer and helper for UserAdmin data.</description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-helper-user</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-helper-user</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-helper-user</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-helper-user</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-helper-user</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-helper-user</url>
     </scm>
 
     <properties>
@@ -83,4 +83,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-client-repository-impl/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/pom.xml (original)
+++ ace/trunk/ace-client-repository-impl/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.client.repository.impl</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-impl</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-impl</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-client-repository-impl</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-impl</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-impl</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-client-repository-impl</url>
     </scm>
 
     <properties>
@@ -127,4 +127,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java Fri Mar 16 08:58:19 2012
@@ -29,15 +29,15 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.object.Artifact2GroupAssociation;
 import org.apache.ace.client.repository.object.ArtifactObject;
 import org.apache.ace.client.repository.object.DeploymentVersionObject;
-import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
 import org.apache.ace.client.repository.object.Group2LicenseAssociation;
 import org.apache.ace.client.repository.object.GroupObject;
 import org.apache.ace.client.repository.object.License2GatewayAssociation;
 import org.apache.ace.client.repository.object.LicenseObject;
 import org.apache.ace.client.repository.repository.ArtifactRepository;
 import org.apache.ace.client.repository.repository.DeploymentVersionRepository;
-import org.apache.ace.client.repository.repository.GatewayRepository;
-import org.apache.ace.client.repository.stateful.StatefulGatewayRepository;
+import org.apache.ace.client.repository.repository.TargetRepository;
+import org.apache.ace.client.repository.stateful.StatefulTargetRepository;
 import org.apache.ace.client.repository.stateful.impl.StatefulGatewayRepositoryImpl;
 import org.apache.ace.server.log.store.LogStore;
 import org.apache.felix.dm.Component;
@@ -126,7 +126,7 @@ public class Activator extends Dependenc
             Group2LicenseAssociation.TOPIC_ALL,
             LicenseObject.TOPIC_ALL,
             License2GatewayAssociation.TOPIC_ALL,
-            GatewayObject.TOPIC_ALL,
+            TargetObject.TOPIC_ALL,
             DeploymentVersionObject.TOPIC_ALL,
             RepositoryAdmin.TOPIC_REFRESH, RepositoryAdmin.TOPIC_LOGIN});
         String filter = "(" + SessionFactory.SERVICE_SID + "=" + sessionID + ")";
@@ -134,10 +134,10 @@ public class Activator extends Dependenc
         topic.put(SessionFactory.SERVICE_SID, sessionID);
         StatefulGatewayRepositoryImpl statefulGatewayRepositoryImpl = new StatefulGatewayRepositoryImpl(sessionID);
         sd.m_service2 = createComponent()
-            .setInterface(new String[] { StatefulGatewayRepository.class.getName(), EventHandler.class.getName() }, topic)
+            .setInterface(new String[] { StatefulTargetRepository.class.getName(), EventHandler.class.getName() }, topic)
             .setImplementation(statefulGatewayRepositoryImpl)
             .add(createServiceDependency().setService(ArtifactRepository.class, filter).setRequired(true))
-            .add(createServiceDependency().setService(GatewayRepository.class, filter).setRequired(true))
+            .add(createServiceDependency().setService(TargetRepository.class, filter).setRequired(true))
             .add(createServiceDependency().setService(DeploymentVersionRepository.class, filter).setRequired(true))
             .add(createServiceDependency().setService(LogStore.class, "(&("+Constants.OBJECTCLASS+"="+LogStore.class.getName()+")(name=auditlog))").setRequired(false))
             .add(createServiceDependency().setService(BundleHelper.class).setRequired(true))

Modified: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java Fri Mar 16 08:58:19 2012
@@ -39,7 +39,7 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.helper.ArtifactRecognizer;
 import org.apache.ace.client.repository.helper.bundle.BundleHelper;
 import org.apache.ace.client.repository.object.ArtifactObject;
-import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
 import org.apache.ace.client.repository.repository.ArtifactRepository;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
@@ -497,7 +497,7 @@ public class ArtifactRepositoryImpl exte
         m_obrBase = obrBase;
     }
 
-    public String preprocessArtifact(ArtifactObject artifact, GatewayObject gateway, String gatewayID, String version) throws IOException {
+    public String preprocessArtifact(ArtifactObject artifact, TargetObject gateway, String gatewayID, String version) throws IOException {
         ArtifactPreprocessor preprocessor = getHelper(artifact.getMimetype()).getPreprocessor();
         if (preprocessor == null) {
             return artifact.getURL();
@@ -507,7 +507,7 @@ public class ArtifactRepositoryImpl exte
         }
     }
 
-    public boolean needsNewVersion(ArtifactObject artifact, GatewayObject gateway, String gatewayID, String fromVersion) {
+    public boolean needsNewVersion(ArtifactObject artifact, TargetObject gateway, String gatewayID, String fromVersion) {
         ArtifactPreprocessor preprocessor = getHelper(artifact.getMimetype()).getPreprocessor();
         if (preprocessor == null) {
             return false;

Modified: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GatewayObjectImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GatewayObjectImpl.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GatewayObjectImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GatewayObjectImpl.java Fri Mar 16 08:58:19 2012
@@ -21,7 +21,7 @@ package org.apache.ace.client.repository
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
 import org.apache.ace.client.repository.object.License2GatewayAssociation;
 import org.apache.ace.client.repository.object.LicenseObject;
 
@@ -31,7 +31,7 @@ import com.thoughtworks.xstream.io.Hiera
  * Implementation class for the GatewayObject. For 'what it does', see GatewayObject,
  * for 'how it works', see RepositoryObjectImpl.
  */
-public class GatewayObjectImpl extends RepositoryObjectImpl<GatewayObject> implements GatewayObject {
+public class GatewayObjectImpl extends RepositoryObjectImpl<TargetObject> implements TargetObject {
     private final static String XML_NODE = "gateway";
 
     GatewayObjectImpl(Map<String, String> attributes, ChangeNotifier notifier) {

Modified: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GatewayPropertyResolver.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GatewayPropertyResolver.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GatewayPropertyResolver.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GatewayPropertyResolver.java Fri Mar 16 08:58:19 2012
@@ -22,7 +22,7 @@ import java.util.*;
 
 import org.apache.ace.client.repository.RepositoryObject;
 import org.apache.ace.client.repository.helper.PropertyResolver;
-import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
 
 /**
  *
@@ -32,7 +32,7 @@ import org.apache.ace.client.repository.
  */
 public class GatewayPropertyResolver extends RepoPropertyResolver {
 
-    public GatewayPropertyResolver(GatewayObject go) {
+    public GatewayPropertyResolver(TargetObject go) {
         super(go);
     }
 

Modified: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GatewayRepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GatewayRepositoryImpl.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GatewayRepositoryImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GatewayRepositoryImpl.java Fri Mar 16 08:58:19 2012
@@ -20,8 +20,8 @@ package org.apache.ace.client.repository
 
 import java.util.Map;
 
-import org.apache.ace.client.repository.object.GatewayObject;
-import org.apache.ace.client.repository.repository.GatewayRepository;
+import org.apache.ace.client.repository.object.TargetObject;
+import org.apache.ace.client.repository.repository.TargetRepository;
 
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 
@@ -29,7 +29,7 @@ import com.thoughtworks.xstream.io.Hiera
  * Implementation class for the GatewayRepository. For 'what it does', see GatewayRepository,
  * for 'how it works', see ObjectRepositoryImpl.
  */
-public class GatewayRepositoryImpl extends ObjectRepositoryImpl<GatewayObjectImpl, GatewayObject> implements GatewayRepository {
+public class GatewayRepositoryImpl extends ObjectRepositoryImpl<GatewayObjectImpl, TargetObject> implements TargetRepository {
     private final static String XML_NODE = "gateways";
 
     public GatewayRepositoryImpl(ChangeNotifier notifier) {

Modified: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/License2GatewayAssociationImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/License2GatewayAssociationImpl.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/License2GatewayAssociationImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/License2GatewayAssociationImpl.java Fri Mar 16 08:58:19 2012
@@ -20,7 +20,7 @@ package org.apache.ace.client.repository
 
 import java.util.Map;
 
-import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
 import org.apache.ace.client.repository.object.License2GatewayAssociation;
 import org.apache.ace.client.repository.object.LicenseObject;
 import org.osgi.framework.InvalidSyntaxException;
@@ -31,16 +31,16 @@ import com.thoughtworks.xstream.io.Hiera
  * Implementation class for the License2GatewayAssociation. For 'what it does', see License2GatewayAssociation,
  * for 'how it works', see AssociationImpl.
  */
-public class License2GatewayAssociationImpl extends AssociationImpl<LicenseObject, GatewayObject, License2GatewayAssociation> implements License2GatewayAssociation {
+public class License2GatewayAssociationImpl extends AssociationImpl<LicenseObject, TargetObject, License2GatewayAssociation> implements License2GatewayAssociation {
     private final static String XML_NODE = "license2gateway";
 
     public License2GatewayAssociationImpl(Map<String, String> attributes, ChangeNotifier notifier, LicenseRepositoryImpl licenseRepository, GatewayRepositoryImpl gatewayRepository) throws InvalidSyntaxException {
-        super(attributes, notifier, LicenseObject.class, GatewayObject.class, licenseRepository, gatewayRepository, XML_NODE);
+        super(attributes, notifier, LicenseObject.class, TargetObject.class, licenseRepository, gatewayRepository, XML_NODE);
     }
     public License2GatewayAssociationImpl(Map<String, String> attributes, Map<String, String> tags, ChangeNotifier notifier, LicenseRepositoryImpl licenseRepository, GatewayRepositoryImpl gatewayRepository) throws InvalidSyntaxException {
-        super(attributes, tags, notifier, LicenseObject.class, GatewayObject.class, licenseRepository, gatewayRepository, XML_NODE);
+        super(attributes, tags, notifier, LicenseObject.class, TargetObject.class, licenseRepository, gatewayRepository, XML_NODE);
     }
     public License2GatewayAssociationImpl(HierarchicalStreamReader reader, ChangeNotifier notifier, LicenseRepositoryImpl licenseRepository, GatewayRepositoryImpl gatewayRepository) throws InvalidSyntaxException {
-        super(reader, notifier, LicenseObject.class, GatewayObject.class, null, null, licenseRepository, gatewayRepository, XML_NODE);
+        super(reader, notifier, LicenseObject.class, TargetObject.class, null, null, licenseRepository, gatewayRepository, XML_NODE);
     }
 }

Modified: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/License2GatewayAssociationRepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/License2GatewayAssociationRepositoryImpl.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/License2GatewayAssociationRepositoryImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/License2GatewayAssociationRepositoryImpl.java Fri Mar 16 08:58:19 2012
@@ -20,7 +20,7 @@ package org.apache.ace.client.repository
 
 import java.util.Map;
 
-import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
 import org.apache.ace.client.repository.object.License2GatewayAssociation;
 import org.apache.ace.client.repository.object.LicenseObject;
 import org.apache.ace.client.repository.repository.License2GatewayAssociationRepository;
@@ -32,7 +32,7 @@ import com.thoughtworks.xstream.io.Hiera
  * for 'how it works', see AssociationRepositoryImpl.
  */
 
-public class License2GatewayAssociationRepositoryImpl extends AssociationRepositoryImpl<LicenseObject, GatewayObject, License2GatewayAssociationImpl, License2GatewayAssociation> implements License2GatewayAssociationRepository {
+public class License2GatewayAssociationRepositoryImpl extends AssociationRepositoryImpl<LicenseObject, TargetObject, License2GatewayAssociationImpl, License2GatewayAssociation> implements License2GatewayAssociationRepository {
     private final static String XML_NODE = "licenses2gateways";
 
     private final LicenseRepositoryImpl m_licenseRepository;

Modified: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/LicenseObjectImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/LicenseObjectImpl.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/LicenseObjectImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/LicenseObjectImpl.java Fri Mar 16 08:58:19 2012
@@ -21,7 +21,7 @@ package org.apache.ace.client.repository
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
 import org.apache.ace.client.repository.object.Group2LicenseAssociation;
 import org.apache.ace.client.repository.object.GroupObject;
 import org.apache.ace.client.repository.object.License2GatewayAssociation;
@@ -48,8 +48,8 @@ public class LicenseObjectImpl extends R
         super(reader, notifier, XML_NODE);
     }
 
-    public List<GatewayObject> getGateways() {
-        return getAssociations(GatewayObject.class);
+    public List<TargetObject> getGateways() {
+        return getAssociations(TargetObject.class);
     }
 
     public List<GroupObject> getGroups() {
@@ -76,8 +76,8 @@ public class LicenseObjectImpl extends R
         return getAssociationsWith(group, GroupObject.class, Group2LicenseAssociation.class);
     }
 
-    public List<License2GatewayAssociation> getAssociationsWith(GatewayObject gateway) {
-        return getAssociationsWith(gateway, GatewayObject.class, License2GatewayAssociation.class);
+    public List<License2GatewayAssociation> getAssociationsWith(TargetObject gateway) {
+        return getAssociationsWith(gateway, TargetObject.class, License2GatewayAssociation.class);
     }
 
     private static String[] DEFINING_KEYS = new String[] {KEY_NAME};

Modified: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepoPropertyResolver.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepoPropertyResolver.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepoPropertyResolver.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepoPropertyResolver.java Fri Mar 16 08:58:19 2012
@@ -5,7 +5,7 @@ import java.util.List;
 
 import org.apache.ace.client.repository.RepositoryObject;
 import org.apache.ace.client.repository.helper.PropertyResolver;
-import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
 import org.apache.ace.client.repository.object.GroupObject;
 import org.apache.ace.client.repository.object.LicenseObject;
 
@@ -61,8 +61,8 @@ public class RepoPropertyResolver implem
     }
     
     protected List<? extends RepositoryObject> getChildren(RepositoryObject ob) {
-        if (ob instanceof GatewayObject) {
-            return ((GatewayObject) ob).getLicenses();
+        if (ob instanceof TargetObject) {
+            return ((TargetObject) ob).getLicenses();
         }
         else if (ob instanceof LicenseObject) {
             return ((LicenseObject) ob).getGroups();

Modified: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java Fri Mar 16 08:58:19 2012
@@ -40,7 +40,7 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.object.Artifact2GroupAssociation;
 import org.apache.ace.client.repository.object.ArtifactObject;
 import org.apache.ace.client.repository.object.DeploymentVersionObject;
-import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
 import org.apache.ace.client.repository.object.Group2LicenseAssociation;
 import org.apache.ace.client.repository.object.GroupObject;
 import org.apache.ace.client.repository.object.License2GatewayAssociation;
@@ -48,7 +48,7 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.repository.Artifact2GroupAssociationRepository;
 import org.apache.ace.client.repository.repository.ArtifactRepository;
 import org.apache.ace.client.repository.repository.DeploymentVersionRepository;
-import org.apache.ace.client.repository.repository.GatewayRepository;
+import org.apache.ace.client.repository.repository.TargetRepository;
 import org.apache.ace.client.repository.repository.Group2LicenseAssociationRepository;
 import org.apache.ace.client.repository.repository.GroupRepository;
 import org.apache.ace.client.repository.repository.License2GatewayAssociationRepository;
@@ -165,7 +165,7 @@ public class RepositoryAdminImpl impleme
             m_artifact2GroupAssociationRepositoryImpl = new Artifact2GroupAssociationRepositoryImpl(m_artifactRepositoryImpl, m_groupRepositoryImpl, m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, Artifact2GroupAssociation.TOPIC_ENTITY_ROOT, m_sessionID));
             m_licenseRepositoryImpl = new LicenseRepositoryImpl(m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, LicenseObject.TOPIC_ENTITY_ROOT, m_sessionID));
             m_group2LicenseAssociationRepositoryImpl = new Group2LicenseAssociationRepositoryImpl(m_groupRepositoryImpl, m_licenseRepositoryImpl, m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, Group2LicenseAssociation.TOPIC_ENTITY_ROOT, m_sessionID));
-            m_gatewayRepositoryImpl = new GatewayRepositoryImpl(m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, GatewayObject.TOPIC_ENTITY_ROOT, m_sessionID));
+            m_gatewayRepositoryImpl = new GatewayRepositoryImpl(m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, TargetObject.TOPIC_ENTITY_ROOT, m_sessionID));
             m_license2GatewayAssociationRepositoryImpl = new License2GatewayAssociationRepositoryImpl(m_licenseRepositoryImpl, m_gatewayRepositoryImpl, m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, License2GatewayAssociation.TOPIC_ENTITY_ROOT, m_sessionID));
             m_deploymentVersionRepositoryImpl = new DeploymentVersionRepositoryImpl(m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, DeploymentVersionObject.TOPIC_ENTITY_ROOT, m_sessionID));
         }
@@ -192,8 +192,8 @@ public class RepositoryAdminImpl impleme
         m_services.add(registerRepository(GroupRepository.class, m_groupRepositoryImpl, new String[] {}));
         m_services.add(registerRepository(Group2LicenseAssociationRepository.class, m_group2LicenseAssociationRepositoryImpl, new String[] {createPrivateObjectTopic(GroupObject.TOPIC_ENTITY_ROOT), createPrivateObjectTopic(LicenseObject.TOPIC_ENTITY_ROOT)}));
         m_services.add(registerRepository(LicenseRepository.class, m_licenseRepositoryImpl, new String[] {}));
-        m_services.add(registerRepository(License2GatewayAssociationRepository.class, m_license2GatewayAssociationRepositoryImpl, new String[] {createPrivateObjectTopic(LicenseObject.TOPIC_ENTITY_ROOT), createPrivateObjectTopic(GatewayObject.TOPIC_ENTITY_ROOT)}));
-        m_services.add(registerRepository(GatewayRepository.class, m_gatewayRepositoryImpl, new String[] {}));
+        m_services.add(registerRepository(License2GatewayAssociationRepository.class, m_license2GatewayAssociationRepositoryImpl, new String[] {createPrivateObjectTopic(LicenseObject.TOPIC_ENTITY_ROOT), createPrivateObjectTopic(TargetObject.TOPIC_ENTITY_ROOT)}));
+        m_services.add(registerRepository(TargetRepository.class, m_gatewayRepositoryImpl, new String[] {}));
         m_services.add(registerRepository(DeploymentVersionRepository.class, m_deploymentVersionRepositoryImpl, new String[] {}));
 
         // prepare the results.
@@ -205,7 +205,7 @@ public class RepositoryAdminImpl impleme
         result.put(Group2LicenseAssociationRepository.class, m_group2LicenseAssociationRepositoryImpl);
         result.put(LicenseRepository.class, m_licenseRepositoryImpl);
         result.put(License2GatewayAssociationRepository.class, m_license2GatewayAssociationRepositoryImpl);
-        result.put(GatewayRepository.class, m_gatewayRepositoryImpl);
+        result.put(TargetRepository.class, m_gatewayRepositoryImpl);
         result.put(DeploymentVersionRepository.class, m_deploymentVersionRepositoryImpl);
 
         return result;

Modified: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminLoginContextImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminLoginContextImpl.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminLoginContextImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminLoginContextImpl.java Fri Mar 16 08:58:19 2012
@@ -27,7 +27,7 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.repository.Artifact2GroupAssociationRepository;
 import org.apache.ace.client.repository.repository.ArtifactRepository;
 import org.apache.ace.client.repository.repository.DeploymentVersionRepository;
-import org.apache.ace.client.repository.repository.GatewayRepository;
+import org.apache.ace.client.repository.repository.TargetRepository;
 import org.apache.ace.client.repository.repository.Group2LicenseAssociationRepository;
 import org.apache.ace.client.repository.repository.GroupRepository;
 import org.apache.ace.client.repository.repository.License2GatewayAssociationRepository;
@@ -68,9 +68,9 @@ class RepositoryAdminLoginContextImpl im
     }
 
     @SuppressWarnings("unchecked")
-    public RepositoryAdminLoginContext addGatewayRepository(URL repositoryLocation, String repositoryCustomer, String repositoryName, boolean writeAccess) {
+    public RepositoryAdminLoginContext addTargetRepository(URL repositoryLocation, String repositoryCustomer, String repositoryName, boolean writeAccess) {
         return addRepositories(repositoryLocation, repositoryCustomer, repositoryName, writeAccess,
-            GatewayRepository.class,
+            TargetRepository.class,
             License2GatewayAssociationRepository.class);
     }
 

Modified: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayObjectImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayObjectImpl.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayObjectImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayObjectImpl.java Fri Mar 16 08:58:19 2012
@@ -35,10 +35,10 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.object.ArtifactObject;
 import org.apache.ace.client.repository.object.DeploymentArtifact;
 import org.apache.ace.client.repository.object.DeploymentVersionObject;
-import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
 import org.apache.ace.client.repository.object.License2GatewayAssociation;
 import org.apache.ace.client.repository.object.LicenseObject;
-import org.apache.ace.client.repository.stateful.StatefulGatewayObject;
+import org.apache.ace.client.repository.stateful.StatefulTargetObject;
 import org.apache.ace.log.AuditEvent;
 import org.apache.ace.log.LogDescriptor;
 import org.apache.ace.log.LogEvent;
@@ -49,10 +49,10 @@ import org.apache.ace.log.LogEvent;
  * parent <code>StatefulGatewayRepository</code>. Once created, it will handle its own lifecyle
  * and remove itself once is existence is no longer necessary.
  */
-public class StatefulGatewayObjectImpl implements StatefulGatewayObject {
+public class StatefulGatewayObjectImpl implements StatefulTargetObject {
     private final StatefulGatewayRepositoryImpl m_repository;
     private final Object m_lock = new Object();
-    private GatewayObject m_gatewayObject;
+    private TargetObject m_gatewayObject;
     private List<LogDescriptor> m_processedAuditEvents = new ArrayList<LogDescriptor>();
     private Map<String, String> m_attributes = new HashMap<String, String>();
     /** This boolean is used to suppress STATUS_CHANGED events during the creation of the object.*/
@@ -92,7 +92,7 @@ public class StatefulGatewayObjectImpl i
     public String getCurrentVersion() {
         DeploymentVersionObject version = m_repository.getMostRecentDeploymentVersion(getID());
         if (version == null) {
-            return StatefulGatewayObject.UNKNOWN_VERSION;
+            return StatefulTargetObject.UNKNOWN_VERSION;
         }
         else {
             return version.getVersion();
@@ -109,7 +109,7 @@ public class StatefulGatewayObjectImpl i
         }
     }
 
-    public GatewayObject getGatewayObject() {
+    public TargetObject getGatewayObject() {
         synchronized(m_lock) {
             ensureGatewayPresent();
             return m_gatewayObject;
@@ -354,7 +354,7 @@ public class StatefulGatewayObjectImpl i
 
         if (containsData) {
             Properties props = new Properties();
-            props.put(StatefulGatewayObject.KEY_AUDITEVENTS, events);
+            props.put(StatefulTargetObject.KEY_AUDITEVENTS, events);
             m_repository.notifyChanged(this, TOPIC_AUDITEVENTS_CHANGED, props);
         }
     }
@@ -417,10 +417,10 @@ public class StatefulGatewayObjectImpl i
 
     @Override
     public boolean equals(Object o) {
-        if ((o == null) || !(o instanceof StatefulGatewayObject)) {
+        if ((o == null) || !(o instanceof StatefulTargetObject)) {
             return false;
         }
-        return getID() == ((StatefulGatewayObject) o).getID();
+        return getID() == ((StatefulTargetObject) o).getID();
     }
 
     private void addStatusAttribute(String key, String value) {



Mime
View raw message