ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1301449 [1/2] - in /ace/trunk: ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/ ace-client-repository-helper-base/src/main/java/org/apache/ace/client/repository/helper/base/ ace-client-repository-impl/src/ma...
Date Fri, 16 Mar 2012 12:05:41 GMT
Author: marrs
Date: Fri Mar 16 12:05:39 2012
New Revision: 1301449

URL: http://svn.apache.org/viewvc?rev=1301449&view=rev
Log:
ACE-63 refactored several projects

Added:
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2FeatureAssociationImpl.java
      - copied, changed from r1301412, ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2GroupAssociationImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2FeatureAssociationRepositoryImpl.java
      - copied, changed from r1301412, ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2GroupAssociationRepositoryImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Distribution2TargetAssociationImpl.java
      - copied, changed from r1301412, 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/Distribution2TargetAssociationRepositoryImpl.java
      - copied, changed from r1301412, 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/DistributionObjectImpl.java
      - copied, changed from r1301412, 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/DistributionRepositoryImpl.java
      - copied, changed from r1301412, ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/LicenseRepositoryImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Feature2DistributionAssociationImpl.java
      - copied, changed from r1301412, ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Group2LicenseAssociationImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Feature2DistributionAssociationRepositoryImpl.java
      - copied, changed from r1301412, ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Group2LicenseAssociationRepositoryImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/FeatureObjectImpl.java
      - copied, changed from r1301412, ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GroupObjectImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/FeatureRepositoryImpl.java
      - copied, changed from r1301412, ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GroupRepositoryImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryPropertyResolver.java
      - copied, changed from r1301412, 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/TargetObjectImpl.java
      - copied, changed from r1301412, 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/TargetPropertyResolver.java
      - copied, changed from r1301381, 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/TargetRepositoryImpl.java
      - copied, changed from r1301381, 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/stateful/impl/StatefulTargetObjectImpl.java
      - copied, changed from r1301412, 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/StatefulTargetRepositoryImpl.java
      - copied, changed from r1301412, ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java
Removed:
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2GroupAssociationImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2GroupAssociationRepositoryImpl.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/Group2LicenseAssociationImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Group2LicenseAssociationRepositoryImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GroupObjectImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GroupRepositoryImpl.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/LicenseRepositoryImpl.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/stateful/impl/StatefulGatewayObjectImpl.java
    ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java
Modified:
    ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/ArtifactObject.java
    ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/DistributionObject.java
    ace/trunk/ace-client-repository-helper-base/src/main/java/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java
    ace/trunk/ace-client-repository-helper-base/src/main/java/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java
    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/ArtifactObjectImpl.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/DeploymentVersionRepositoryImpl.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/test/java/org/apache/ace/client/repository/impl/ModelTest.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/repositoryadmin/RepositoryAdminTest.java
    ace/trunk/ace-log-servlet/src/main/java/org/apache/ace/server/log/servlet/LogServlet.java
    ace/trunk/ace-log-servlet/src/test/java/org/apache/ace/server/log/servlet/LogServletTest.java
    ace/trunk/ace-log-task/src/main/java/org/apache/ace/server/log/task/LogSyncTask.java
    ace/trunk/ace-log/src/main/java/org/apache/ace/log/LogDescriptor.java
    ace/trunk/ace-log/src/test/java/org/apache/ace/log/LogDescriptorTest.java
    ace/trunk/ace-server-log-store/src/main/java/org/apache/ace/server/log/store/impl/LogStoreImpl.java
    ace/trunk/ace-server-log-store/src/test/java/org/apache/ace/server/log/store/impl/ServerLogStoreTester.java

Modified: ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/ArtifactObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/ArtifactObject.java?rev=1301449&r1=1301448&r2=1301449&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/ArtifactObject.java (original)
+++ ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/ArtifactObject.java Fri Mar 16 12:05:39 2012
@@ -72,7 +72,7 @@ public interface ArtifactObject extends 
      * Returns all <code>GroupObject</code>s this object is associated with. If there
      * are none, an empty list will be returned.
      */
-    public List<FeatureObject> getGroups();
+    public List<FeatureObject> getFeatures();
     /**
      * Returns all associations this artifact has with a given group.
      */

Modified: ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/DistributionObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/DistributionObject.java?rev=1301449&r1=1301448&r2=1301449&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/DistributionObject.java (original)
+++ ace/trunk/ace-client-repository-api/src/main/java/org/apache/ace/client/repository/object/DistributionObject.java Fri Mar 16 12:05:39 2012
@@ -41,13 +41,13 @@ public interface DistributionObject exte
      * Returns all <code>FeatureObject</code>s this object is associated with. If there
      * are none, an empty list will be returned.
      */
-    public List<FeatureObject> getGroups();
+    public List<FeatureObject> getFeatures();
     
     /**
      * Returns all <code>TargetObject</code>s this object is associated with. If there
      * are none, an empty list will be returned.
      */
-    public List<TargetObject> getGateways();
+    public List<TargetObject> getTargets();
 
     /**
      * Returns all associations this distribution has with a given feature.

Modified: ace/trunk/ace-client-repository-helper-base/src/main/java/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-helper-base/src/main/java/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java?rev=1301449&r1=1301448&r2=1301449&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-helper-base/src/main/java/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java (original)
+++ ace/trunk/ace-client-repository-helper-base/src/main/java/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java Fri Mar 16 12:05:39 2012
@@ -174,7 +174,7 @@ public abstract class ArtifactPreprocess
         return new URL(obrBase, name);
     }
 
-    public abstract String preprocess(String url, PropertyResolver props, String gatewayID, String version, URL obrBase) throws IOException;
+    public abstract String preprocess(String url, PropertyResolver props, String targetID, String version, URL obrBase) throws IOException;
 
-    public abstract boolean needsNewVersion(String url, PropertyResolver props, String gatewayID, String fromVersion);
+    public abstract boolean needsNewVersion(String url, PropertyResolver props, String targetID, String fromVersion);
 }

Modified: ace/trunk/ace-client-repository-helper-base/src/main/java/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-helper-base/src/main/java/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java?rev=1301449&r1=1301448&r2=1301449&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-helper-base/src/main/java/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java (original)
+++ ace/trunk/ace-client-repository-helper-base/src/main/java/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java Fri Mar 16 12:05:39 2012
@@ -73,7 +73,7 @@ public class VelocityArtifactPreprocesso
     }
 
     @Override
-    public String preprocess(String url, PropertyResolver props, String gatewayID, String version, URL obrBase) throws IOException {
+    public String preprocess(String url, PropertyResolver props, String targetID, String version, URL obrBase) throws IOException {
         init();
         // first, get the original data.
         byte[] input = null;
@@ -92,11 +92,11 @@ public class VelocityArtifactPreprocesso
         }
         else {
             try {
-                String name = getFilename(url, gatewayID, version);
+                String name = getFilename(url, targetID, version);
                 OutputStream output = upload(name, obrBase);
                 output.write(result);
                 output.close();
-                setHashForVersion(url, gatewayID, version, hash(result));
+                setHashForVersion(url, targetID, version, hash(result));
                 return determineNewUrl(name, obrBase).toString();
             }
             catch (IOException ioe) {
@@ -105,19 +105,19 @@ public class VelocityArtifactPreprocesso
         }
     }
 
-    private String getFilename(String url, String gatewayID, String version) throws MalformedURLException {
-        return new File(new URL(url).getFile()).getName() + "-" + gatewayID + "-" + version;
+    private String getFilename(String url, String targetID, String version) throws MalformedURLException {
+        return new File(new URL(url).getFile()).getName() + "-" + targetID + "-" + version;
     }
 
-    private String getFullUrl(String url, String gatewayID, String version) throws MalformedURLException {
-        return url + "-" + gatewayID + "-" + version;
+    private String getFullUrl(String url, String targetID, String version) throws MalformedURLException {
+        return url + "-" + targetID + "-" + version;
     }
 
-    private String getHashForVersion(String url, String gateway, String version) {
+    private String getHashForVersion(String url, String target, String version) {
         String key = new StringBuilder().append('[')
         .append(url)
         .append("][")
-        .append(gateway)
+        .append(target)
         .append("][")
         .append(version)
         .append(']').toString();
@@ -128,7 +128,7 @@ public class VelocityArtifactPreprocesso
         else {
             byte[] processedTemplate;
             try {
-                processedTemplate = getBytesFromUrl(getFullUrl(url, gateway, version));
+                processedTemplate = getBytesFromUrl(getFullUrl(url, target, version));
             }
             catch (IOException e) {
                 // we cannot retrieve the artifact, so we cannot say anything about it.
@@ -141,11 +141,11 @@ public class VelocityArtifactPreprocesso
         }
     }
 
-    private void setHashForVersion(String url, String gateway, String version, String hash) {
+    private void setHashForVersion(String url, String target, String version, String hash) {
         String key = new StringBuilder().append('[')
         .append(url)
         .append("][")
-        .append(gateway)
+        .append(target)
         .append("][")
         .append(version)
         .append(']').toString();
@@ -196,7 +196,7 @@ public class VelocityArtifactPreprocesso
     }
 
     @Override
-    public boolean needsNewVersion(String url, PropertyResolver props, String gatewayID, String fromVersion) {
+    public boolean needsNewVersion(String url, PropertyResolver props, String targetID, String fromVersion) {
         try {
             init();
         }
@@ -226,7 +226,7 @@ public class VelocityArtifactPreprocesso
         String newHash = hash(result);
 
         // find the hash for the previous version
-        String oldHash = getHashForVersion(url, gatewayID, fromVersion);
+        String oldHash = getHashForVersion(url, targetID, fromVersion);
 
         // Note: we do not cache any previously created processed templates, since the call that asks us to approve a new version
         // may cross a pending needsNewVersion call.

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=1301449&r1=1301448&r2=1301449&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 12:05:39 2012
@@ -38,7 +38,7 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.repository.DeploymentVersionRepository;
 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.client.repository.stateful.impl.StatefulTargetRepositoryImpl;
 import org.apache.ace.server.log.store.LogStore;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyActivatorBase;
@@ -132,7 +132,7 @@ public class Activator extends Dependenc
         String filter = "(" + SessionFactory.SERVICE_SID + "=" + sessionID + ")";
         topic.put(EventConstants.EVENT_FILTER, filter);
         topic.put(SessionFactory.SERVICE_SID, sessionID);
-        StatefulGatewayRepositoryImpl statefulGatewayRepositoryImpl = new StatefulGatewayRepositoryImpl(sessionID);
+        StatefulTargetRepositoryImpl statefulGatewayRepositoryImpl = new StatefulTargetRepositoryImpl(sessionID);
         sd.m_service2 = createComponent()
             .setInterface(new String[] { StatefulTargetRepository.class.getName(), EventHandler.class.getName() }, topic)
             .setImplementation(statefulGatewayRepositoryImpl)

Copied: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2FeatureAssociationImpl.java (from r1301412, ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2GroupAssociationImpl.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2FeatureAssociationImpl.java?p2=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2FeatureAssociationImpl.java&p1=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2GroupAssociationImpl.java&r1=1301412&r2=1301449&rev=1301449&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2GroupAssociationImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2FeatureAssociationImpl.java Fri Mar 16 12:05:39 2012
@@ -28,21 +28,21 @@ import org.osgi.framework.InvalidSyntaxE
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 
 /**
- * Implementation class for the Artifact2GroupAssociation. For 'what it does', see Artifact2GroupAssociation,
+ * Implementation class for the Artifact2FeatureAssociation. For 'what it does', see Artifact2FeatureAssociation,
  * for 'how it works', see AssociationImpl.
  */
-public class Artifact2GroupAssociationImpl extends AssociationImpl<ArtifactObject, FeatureObject, Artifact2FeatureAssociation> implements Artifact2FeatureAssociation {
-    private final static String XML_NODE = "artifact2group";
+public class Artifact2FeatureAssociationImpl extends AssociationImpl<ArtifactObject, FeatureObject, Artifact2FeatureAssociation> implements Artifact2FeatureAssociation {
+    private final static String XML_NODE = "artifact2feature";
 
-    public Artifact2GroupAssociationImpl(Map<String, String> attributes, ChangeNotifier notifier, ArtifactRepositoryImpl artifactRepository, GroupRepositoryImpl groupRepository) throws InvalidSyntaxException {
-        super(attributes, notifier, ArtifactObject.class, FeatureObject.class, artifactRepository, groupRepository, XML_NODE);
+    public Artifact2FeatureAssociationImpl(Map<String, String> attributes, ChangeNotifier notifier, ArtifactRepositoryImpl artifactRepository, FeatureRepositoryImpl featureRepository) throws InvalidSyntaxException {
+        super(attributes, notifier, ArtifactObject.class, FeatureObject.class, artifactRepository, featureRepository, XML_NODE);
     }
 
-    public Artifact2GroupAssociationImpl(Map<String, String> attributes, Map<String, String> tags, ChangeNotifier notifier, ArtifactRepositoryImpl artifactRepository, GroupRepositoryImpl groupRepository) throws InvalidSyntaxException {
-        super(attributes, tags, notifier, ArtifactObject.class, FeatureObject.class, artifactRepository, groupRepository, XML_NODE);
+    public Artifact2FeatureAssociationImpl(Map<String, String> attributes, Map<String, String> tags, ChangeNotifier notifier, ArtifactRepositoryImpl artifactRepository, FeatureRepositoryImpl featureRepository) throws InvalidSyntaxException {
+        super(attributes, tags, notifier, ArtifactObject.class, FeatureObject.class, artifactRepository, featureRepository, XML_NODE);
     }
 
-    public Artifact2GroupAssociationImpl(HierarchicalStreamReader reader, ChangeNotifier notifier, ArtifactRepositoryImpl artifactRepository, GroupRepositoryImpl groupRepository) throws InvalidSyntaxException {
-        super(reader, notifier, ArtifactObject.class, FeatureObject.class, null, null, artifactRepository, groupRepository, XML_NODE);
+    public Artifact2FeatureAssociationImpl(HierarchicalStreamReader reader, ChangeNotifier notifier, ArtifactRepositoryImpl artifactRepository, FeatureRepositoryImpl featureRepository) throws InvalidSyntaxException {
+        super(reader, notifier, ArtifactObject.class, FeatureObject.class, null, null, artifactRepository, featureRepository, XML_NODE);
     }
 }

Copied: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2FeatureAssociationRepositoryImpl.java (from r1301412, ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2GroupAssociationRepositoryImpl.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2FeatureAssociationRepositoryImpl.java?p2=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2FeatureAssociationRepositoryImpl.java&p1=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2GroupAssociationRepositoryImpl.java&r1=1301412&r2=1301449&rev=1301449&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2GroupAssociationRepositoryImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Artifact2FeatureAssociationRepositoryImpl.java Fri Mar 16 12:05:39 2012
@@ -29,25 +29,25 @@ import org.osgi.framework.InvalidSyntaxE
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 
 /**
- * Implementation class for the Artifact2GroupAssociationRepository. For 'what it does', see Artifact2GroupAssociationRepository,
+ * Implementation class for the Artifact2FeatureAssociationRepository. For 'what it does', see Artifact2FeatureAssociationRepository,
  * for 'how it works', see AssociationRepositoryImpl.
  */
-public class Artifact2GroupAssociationRepositoryImpl extends AssociationRepositoryImpl<ArtifactObject, FeatureObject, Artifact2GroupAssociationImpl, Artifact2FeatureAssociation> implements Artifact2FeatureAssociationRepository {
-    private final static String XML_NODE = "artifacts2groups";
+public class Artifact2FeatureAssociationRepositoryImpl extends AssociationRepositoryImpl<ArtifactObject, FeatureObject, Artifact2FeatureAssociationImpl, Artifact2FeatureAssociation> implements Artifact2FeatureAssociationRepository {
+    private final static String XML_NODE = "artifacts2features";
 
-    private final ArtifactRepositoryImpl m_bundleRepository;
-    private final GroupRepositoryImpl m_groupRepository;
+    private final ArtifactRepositoryImpl m_artifactRepository;
+    private final FeatureRepositoryImpl m_featureRepository;
 
-    public Artifact2GroupAssociationRepositoryImpl(ArtifactRepositoryImpl bundleRepository, GroupRepositoryImpl groupRepository, ChangeNotifier notifier) {
+    public Artifact2FeatureAssociationRepositoryImpl(ArtifactRepositoryImpl artifactRepository, FeatureRepositoryImpl featureRepository, ChangeNotifier notifier) {
         super(notifier, XML_NODE);
-        m_bundleRepository = bundleRepository;
-        m_groupRepository = groupRepository;
+        m_artifactRepository = artifactRepository;
+        m_featureRepository = featureRepository;
     }
 
     @Override
-    Artifact2GroupAssociationImpl createNewInhabitant(Map<String, String> attributes) {
+    Artifact2FeatureAssociationImpl createNewInhabitant(Map<String, String> attributes) {
         try {
-            return new Artifact2GroupAssociationImpl(attributes, this, m_bundleRepository, m_groupRepository);
+            return new Artifact2FeatureAssociationImpl(attributes, this, m_artifactRepository, m_featureRepository);
         }
         catch (InvalidSyntaxException e) {
             throw new IllegalArgumentException("Unable to create association: ", e);
@@ -55,9 +55,9 @@ public class Artifact2GroupAssociationRe
     }
 
     @Override
-    Artifact2GroupAssociationImpl createNewInhabitant(Map<String, String> attributes, Map<String, String> tags) {
+    Artifact2FeatureAssociationImpl createNewInhabitant(Map<String, String> attributes, Map<String, String> tags) {
         try {
-            return new Artifact2GroupAssociationImpl(attributes, tags, this, m_bundleRepository, m_groupRepository);
+            return new Artifact2FeatureAssociationImpl(attributes, tags, this, m_artifactRepository, m_featureRepository);
         }
         catch (InvalidSyntaxException e) {
             throw new IllegalArgumentException("Unable to create association: ", e);
@@ -65,9 +65,9 @@ public class Artifact2GroupAssociationRe
     }
 
     @Override
-    Artifact2GroupAssociationImpl createNewInhabitant(HierarchicalStreamReader reader) {
+    Artifact2FeatureAssociationImpl createNewInhabitant(HierarchicalStreamReader reader) {
         try {
-            return new Artifact2GroupAssociationImpl(reader, this, m_bundleRepository, m_groupRepository);
+            return new Artifact2FeatureAssociationImpl(reader, this, m_artifactRepository, m_featureRepository);
         }
         catch (InvalidSyntaxException e) {
             throw new IllegalArgumentException("Unable to create association: ", e);

Modified: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/ArtifactObjectImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/ArtifactObjectImpl.java?rev=1301449&r1=1301448&r2=1301449&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/ArtifactObjectImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/ArtifactObjectImpl.java Fri Mar 16 12:05:39 2012
@@ -68,12 +68,12 @@ public class ArtifactObjectImpl extends 
         m_repo = repo;
     }
 
-    public List<FeatureObject> getGroups() {
+    public List<FeatureObject> getFeatures() {
         return getAssociations(FeatureObject.class);
     }
 
-    public List<Artifact2FeatureAssociation> getAssociationsWith(FeatureObject group) {
-        return getAssociationsWith(group, FeatureObject.class, Artifact2FeatureAssociation.class);
+    public List<Artifact2FeatureAssociation> getAssociationsWith(FeatureObject feature) {
+        return getAssociationsWith(feature, FeatureObject.class, Artifact2FeatureAssociation.class);
     }
 
     @Override

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=1301449&r1=1301448&r2=1301449&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 12:05:39 2012
@@ -70,7 +70,7 @@ public class ArtifactRepositoryImpl exte
     /**
      * Custom comparator which sorts service references by service rank, highest rank first.
      */
-    private static Comparator<ServiceReference> SERVICE_RANK_COMPARATOR = new Comparator<ServiceReference>() {
+    private static Comparator<ServiceReference> SERVICE_RANK_COMPARATOR = new Comparator<ServiceReference>() { // TODO ServiceReferences are comparable by default now
         public int compare(ServiceReference o1, ServiceReference o2) {
             int rank1 = 0;
             int rank2 = 0;
@@ -110,7 +110,7 @@ public class ArtifactRepositoryImpl exte
 
     @Override
     public List<ArtifactObject> get(Filter filter) {
-        // Note that this excludes any Bundle artifacts which are resource processors.
+        // Note that this excludes any bundle artifacts which are resource processors.
         try {
             Filter extendedFilter = createFilter("(&" + filter.toString() + "(!(" + BundleHelper.KEY_RESOURCE_PROCESSOR_PID + "=*)))");
             return super.get(extendedFilter);
@@ -497,23 +497,23 @@ public class ArtifactRepositoryImpl exte
         m_obrBase = obrBase;
     }
 
-    public String preprocessArtifact(ArtifactObject artifact, TargetObject gateway, String gatewayID, String version) throws IOException {
+    public String preprocessArtifact(ArtifactObject artifact, TargetObject target, String targetID, String version) throws IOException {
         ArtifactPreprocessor preprocessor = getHelper(artifact.getMimetype()).getPreprocessor();
         if (preprocessor == null) {
             return artifact.getURL();
         }
         else {
-            return preprocessor.preprocess(artifact.getURL(), new GatewayPropertyResolver(gateway), gatewayID, version, m_obrBase);
+            return preprocessor.preprocess(artifact.getURL(), new TargetPropertyResolver(target), targetID, version, m_obrBase);
         }
     }
 
-    public boolean needsNewVersion(ArtifactObject artifact, TargetObject gateway, String gatewayID, String fromVersion) {
+    public boolean needsNewVersion(ArtifactObject artifact, TargetObject target, String targetID, String fromVersion) {
         ArtifactPreprocessor preprocessor = getHelper(artifact.getMimetype()).getPreprocessor();
         if (preprocessor == null) {
             return false;
         }
         else {
-            return preprocessor.needsNewVersion(artifact.getURL(), new GatewayPropertyResolver(gateway), gatewayID, fromVersion);
+            return preprocessor.needsNewVersion(artifact.getURL(), new TargetPropertyResolver(target), targetID, fromVersion);
         }
     }
     

Modified: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/DeploymentVersionRepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/DeploymentVersionRepositoryImpl.java?rev=1301449&r1=1301448&r2=1301449&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/DeploymentVersionRepositoryImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/DeploymentVersionRepositoryImpl.java Fri Mar 16 12:05:39 2012
@@ -34,7 +34,7 @@ import org.osgi.framework.Version;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 
 /**
- * Implementation class for the GatewayRepository. For 'what it does', see GatewayRepository,
+ * Implementation class for the TargetRepository. For 'what it does', see TargetRepository,
  * for 'how it works', see ObjectRepositoryImpl.
  * TODO: For now, this class reuses the functionality of ObjectRepositoryImpl. In the future, it
  * might be useful to create a custom implementation for performance reasons.
@@ -91,21 +91,21 @@ public class DeploymentVersionRepository
         }
     };
 
-    public List<DeploymentVersionObject> getDeploymentVersions(String gatewayID) {
+    public List<DeploymentVersionObject> getDeploymentVersions(String targetID) {
         List<DeploymentVersionObject> result = null;
             try {
-                result = get(createFilter("(" + DeploymentVersionObject.KEY_TARGETID + "=" + RepositoryUtil.escapeFilterValue(gatewayID) + ")"));
+                result = get(createFilter("(" + DeploymentVersionObject.KEY_TARGETID + "=" + RepositoryUtil.escapeFilterValue(targetID) + ")"));
                 Collections.sort(result, versionComparator);
             }
             catch (InvalidSyntaxException e) {
-                // Too bad, probably an illegal gatewayID.
+                // Too bad, probably an illegal targetID.
                 result = new ArrayList<DeploymentVersionObject>();
             }
         return result;
     }
 
-    public DeploymentVersionObject getMostRecentDeploymentVersion(String gatewayID) {
-        List<DeploymentVersionObject> versions = getDeploymentVersions(gatewayID);
+    public DeploymentVersionObject getMostRecentDeploymentVersion(String targetID) {
+        List<DeploymentVersionObject> versions = getDeploymentVersions(targetID);
         DeploymentVersionObject result = null;
         if ((versions != null) && (versions.size() > 0)) {
             result = versions.get(versions.size() - 1);

Copied: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Distribution2TargetAssociationImpl.java (from r1301412, 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/Distribution2TargetAssociationImpl.java?p2=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Distribution2TargetAssociationImpl.java&p1=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/License2GatewayAssociationImpl.java&r1=1301412&r2=1301449&rev=1301449&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/Distribution2TargetAssociationImpl.java Fri Mar 16 12:05:39 2012
@@ -28,19 +28,19 @@ import org.osgi.framework.InvalidSyntaxE
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 
 /**
- * Implementation class for the License2GatewayAssociation. For 'what it does', see License2GatewayAssociation,
+ * Implementation class for the Distribution2TargetAssociation. For 'what it does', see Distribution2TargetAssociation,
  * for 'how it works', see AssociationImpl.
  */
-public class License2GatewayAssociationImpl extends AssociationImpl<DistributionObject, TargetObject, Distribution2TargetAssociation> implements Distribution2TargetAssociation {
-    private final static String XML_NODE = "license2gateway";
+public class Distribution2TargetAssociationImpl extends AssociationImpl<DistributionObject, TargetObject, Distribution2TargetAssociation> implements Distribution2TargetAssociation {
+    private final static String XML_NODE = "distribution2target";
 
-    public License2GatewayAssociationImpl(Map<String, String> attributes, ChangeNotifier notifier, LicenseRepositoryImpl licenseRepository, GatewayRepositoryImpl gatewayRepository) throws InvalidSyntaxException {
-        super(attributes, notifier, DistributionObject.class, TargetObject.class, licenseRepository, gatewayRepository, XML_NODE);
+    public Distribution2TargetAssociationImpl(Map<String, String> attributes, ChangeNotifier notifier, DistributionRepositoryImpl distributionRepository, TargetRepositoryImpl targetRepository) throws InvalidSyntaxException {
+        super(attributes, notifier, DistributionObject.class, TargetObject.class, distributionRepository, targetRepository, XML_NODE);
     }
-    public License2GatewayAssociationImpl(Map<String, String> attributes, Map<String, String> tags, ChangeNotifier notifier, LicenseRepositoryImpl licenseRepository, GatewayRepositoryImpl gatewayRepository) throws InvalidSyntaxException {
-        super(attributes, tags, notifier, DistributionObject.class, TargetObject.class, licenseRepository, gatewayRepository, XML_NODE);
+    public Distribution2TargetAssociationImpl(Map<String, String> attributes, Map<String, String> tags, ChangeNotifier notifier, DistributionRepositoryImpl distributionRepository, TargetRepositoryImpl targetRepository) throws InvalidSyntaxException {
+        super(attributes, tags, notifier, DistributionObject.class, TargetObject.class, distributionRepository, targetRepository, XML_NODE);
     }
-    public License2GatewayAssociationImpl(HierarchicalStreamReader reader, ChangeNotifier notifier, LicenseRepositoryImpl licenseRepository, GatewayRepositoryImpl gatewayRepository) throws InvalidSyntaxException {
-        super(reader, notifier, DistributionObject.class, TargetObject.class, null, null, licenseRepository, gatewayRepository, XML_NODE);
+    public Distribution2TargetAssociationImpl(HierarchicalStreamReader reader, ChangeNotifier notifier, DistributionRepositoryImpl distributionRepository, TargetRepositoryImpl targetRepository) throws InvalidSyntaxException {
+        super(reader, notifier, DistributionObject.class, TargetObject.class, null, null, distributionRepository, targetRepository, XML_NODE);
     }
 }

Copied: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Distribution2TargetAssociationRepositoryImpl.java (from r1301412, 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/Distribution2TargetAssociationRepositoryImpl.java?p2=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Distribution2TargetAssociationRepositoryImpl.java&p1=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/License2GatewayAssociationRepositoryImpl.java&r1=1301412&r2=1301449&rev=1301449&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/Distribution2TargetAssociationRepositoryImpl.java Fri Mar 16 12:05:39 2012
@@ -28,26 +28,26 @@ import org.osgi.framework.InvalidSyntaxE
 
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 /**
- * Implementation class for the License2GatewayAssociationRepository. For 'what it does', see License2GatewayAssociationRepository,
+ * Implementation class for the Distribution2TargetAssociationRepository. For 'what it does', see Distribution2TargetAssociationRepository,
  * for 'how it works', see AssociationRepositoryImpl.
  */
 
-public class License2GatewayAssociationRepositoryImpl extends AssociationRepositoryImpl<DistributionObject, TargetObject, License2GatewayAssociationImpl, Distribution2TargetAssociation> implements Distribution2TargetAssociationRepository {
-    private final static String XML_NODE = "licenses2gateways";
+public class Distribution2TargetAssociationRepositoryImpl extends AssociationRepositoryImpl<DistributionObject, TargetObject, Distribution2TargetAssociationImpl, Distribution2TargetAssociation> implements Distribution2TargetAssociationRepository {
+    private final static String XML_NODE = "distributions2targets";
 
-    private final LicenseRepositoryImpl m_licenseRepository;
-    private final GatewayRepositoryImpl m_gatewayRepository;
+    private final DistributionRepositoryImpl m_distributionRepository;
+    private final TargetRepositoryImpl m_targetRepository;
 
-    public License2GatewayAssociationRepositoryImpl(LicenseRepositoryImpl licenseRepository, GatewayRepositoryImpl gatewayRepository, ChangeNotifier notifier) {
+    public Distribution2TargetAssociationRepositoryImpl(DistributionRepositoryImpl distributionRepository, TargetRepositoryImpl targetRepository, ChangeNotifier notifier) {
         super(notifier, XML_NODE);
-        m_licenseRepository = licenseRepository;
-        m_gatewayRepository = gatewayRepository;
+        m_distributionRepository = distributionRepository;
+        m_targetRepository = targetRepository;
     }
 
     @Override
-    License2GatewayAssociationImpl createNewInhabitant(Map<String, String> attributes) {
+    Distribution2TargetAssociationImpl createNewInhabitant(Map<String, String> attributes) {
         try {
-            return new License2GatewayAssociationImpl(attributes, this, m_licenseRepository, m_gatewayRepository);
+            return new Distribution2TargetAssociationImpl(attributes, this, m_distributionRepository, m_targetRepository);
         }
         catch (InvalidSyntaxException e) {
             throw new IllegalArgumentException("Unable to create association: ", e);
@@ -55,9 +55,9 @@ public class License2GatewayAssociationR
     }
 
     @Override
-    License2GatewayAssociationImpl createNewInhabitant(Map<String, String> attributes, Map<String, String> tags) {
+    Distribution2TargetAssociationImpl createNewInhabitant(Map<String, String> attributes, Map<String, String> tags) {
         try {
-            return new License2GatewayAssociationImpl(attributes, tags, this, m_licenseRepository, m_gatewayRepository);
+            return new Distribution2TargetAssociationImpl(attributes, tags, this, m_distributionRepository, m_targetRepository);
         }
         catch (InvalidSyntaxException e) {
             throw new IllegalArgumentException("Unable to create association: ", e);
@@ -65,23 +65,23 @@ public class License2GatewayAssociationR
     }
 
     @Override
-    License2GatewayAssociationImpl createNewInhabitant(HierarchicalStreamReader reader) {
+    Distribution2TargetAssociationImpl createNewInhabitant(HierarchicalStreamReader reader) {
         try {
-            return new License2GatewayAssociationImpl(reader, this, m_licenseRepository, m_gatewayRepository);
+            return new Distribution2TargetAssociationImpl(reader, this, m_distributionRepository, m_targetRepository);
         }
         catch (InvalidSyntaxException e) {
             throw new IllegalArgumentException("Unable to create association: ", e);
         }
     }
 
-    public Distribution2TargetAssociation createDistribution2TargetFilter(DistributionObject license, String gatewayFilter) {
+    public Distribution2TargetAssociation createDistribution2TargetFilter(DistributionObject distribution, String targetFilter) {
         try {
-            m_gatewayRepository.createFilter(gatewayFilter);
+            m_targetRepository.createFilter(targetFilter);
         }
         catch (InvalidSyntaxException ise) {
-            throw new IllegalArgumentException("Gateway filter '" + gatewayFilter + "' cannot be parsed into a valid Filter.", ise);
+            throw new IllegalArgumentException("Target filter '" + targetFilter + "' cannot be parsed into a valid Filter.", ise);
         }
 
-        return create(license.getAssociationFilter(null), gatewayFilter);
+        return create(distribution.getAssociationFilter(null), targetFilter);
     }
 }

Copied: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/DistributionObjectImpl.java (from r1301412, 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/DistributionObjectImpl.java?p2=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/DistributionObjectImpl.java&p1=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/LicenseObjectImpl.java&r1=1301412&r2=1301449&rev=1301449&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/DistributionObjectImpl.java Fri Mar 16 12:05:39 2012
@@ -30,29 +30,29 @@ import org.apache.ace.client.repository.
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 
 /**
- * Implementation class for the LicenseObject. For 'what it does', see LicenseObject,
+ * Implementation class for the DistributionObject. For 'what it does', see DistributionObject,
  * for 'how it works', see RepositoryObjectImpl.
  */
-public class LicenseObjectImpl extends RepositoryObjectImpl<DistributionObject> implements DistributionObject {
-    private final static String XML_NODE = "license";
+public class DistributionObjectImpl extends RepositoryObjectImpl<DistributionObject> implements DistributionObject {
+    private final static String XML_NODE = "distribution";
 
-    LicenseObjectImpl(Map<String, String> attributes, Map<String, String> tags, ChangeNotifier notifier) {
+    DistributionObjectImpl(Map<String, String> attributes, Map<String, String> tags, ChangeNotifier notifier) {
         super(checkAttributes(attributes, KEY_NAME), tags, notifier, XML_NODE);
     }
 
-    LicenseObjectImpl(Map<String, String> attributes, ChangeNotifier notifier) {
+    DistributionObjectImpl(Map<String, String> attributes, ChangeNotifier notifier) {
         super(checkAttributes(attributes, KEY_NAME), notifier, XML_NODE);
     }
 
-    LicenseObjectImpl(HierarchicalStreamReader reader, ChangeNotifier notifier) {
+    DistributionObjectImpl(HierarchicalStreamReader reader, ChangeNotifier notifier) {
         super(reader, notifier, XML_NODE);
     }
 
-    public List<TargetObject> getGateways() {
+    public List<TargetObject> getTargets() {
         return getAssociations(TargetObject.class);
     }
 
-    public List<FeatureObject> getGroups() {
+    public List<FeatureObject> getFeatures() {
         return getAssociations(FeatureObject.class);
     }
 
@@ -72,12 +72,12 @@ public class LicenseObjectImpl extends R
         addAttribute(KEY_NAME, name);
     }
 
-    public List<Feature2DistributionAssociation> getAssociationsWith(FeatureObject group) {
-        return getAssociationsWith(group, FeatureObject.class, Feature2DistributionAssociation.class);
+    public List<Feature2DistributionAssociation> getAssociationsWith(FeatureObject feature) {
+        return getAssociationsWith(feature, FeatureObject.class, Feature2DistributionAssociation.class);
     }
 
-    public List<Distribution2TargetAssociation> getAssociationsWith(TargetObject gateway) {
-        return getAssociationsWith(gateway, TargetObject.class, Distribution2TargetAssociation.class);
+    public List<Distribution2TargetAssociation> getAssociationsWith(TargetObject target) {
+        return getAssociationsWith(target, TargetObject.class, Distribution2TargetAssociation.class);
     }
 
     private static String[] DEFINING_KEYS = new String[] {KEY_NAME};

Copied: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/DistributionRepositoryImpl.java (from r1301412, ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/LicenseRepositoryImpl.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/DistributionRepositoryImpl.java?p2=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/DistributionRepositoryImpl.java&p1=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/LicenseRepositoryImpl.java&r1=1301412&r2=1301449&rev=1301449&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/LicenseRepositoryImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/DistributionRepositoryImpl.java Fri Mar 16 12:05:39 2012
@@ -29,25 +29,25 @@ import com.thoughtworks.xstream.io.Hiera
  * Implementation class for the LicenseRepository. For 'what it does', see LicenseRepository,
  * for 'how it works', see ObjectRepositoryImpl.
  */
-public class LicenseRepositoryImpl extends ObjectRepositoryImpl<LicenseObjectImpl, DistributionObject> implements DistributionRepository {
-    private final static String XML_NODE = "licenses";
+public class DistributionRepositoryImpl extends ObjectRepositoryImpl<DistributionObjectImpl, DistributionObject> implements DistributionRepository {
+    private final static String XML_NODE = "distributions";
 
-    public LicenseRepositoryImpl(ChangeNotifier notifier) {
+    public DistributionRepositoryImpl(ChangeNotifier notifier) {
         super(notifier, XML_NODE);
     }
 
     @Override
-    LicenseObjectImpl createNewInhabitant(Map<String, String> attributes, Map<String, String> tags) {
-        return new LicenseObjectImpl(attributes, tags, this);
+    DistributionObjectImpl createNewInhabitant(Map<String, String> attributes, Map<String, String> tags) {
+        return new DistributionObjectImpl(attributes, tags, this);
     }
 
     @Override
-    LicenseObjectImpl createNewInhabitant(Map<String, String> attributes) {
-        return new LicenseObjectImpl(attributes, this);
+    DistributionObjectImpl createNewInhabitant(Map<String, String> attributes) {
+        return new DistributionObjectImpl(attributes, this);
     }
 
     @Override
-    LicenseObjectImpl createNewInhabitant(HierarchicalStreamReader reader) {
-        return new LicenseObjectImpl(reader, this);
+    DistributionObjectImpl createNewInhabitant(HierarchicalStreamReader reader) {
+        return new DistributionObjectImpl(reader, this);
     }
 }

Copied: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Feature2DistributionAssociationImpl.java (from r1301412, ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Group2LicenseAssociationImpl.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Feature2DistributionAssociationImpl.java?p2=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Feature2DistributionAssociationImpl.java&p1=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Group2LicenseAssociationImpl.java&r1=1301412&r2=1301449&rev=1301449&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Group2LicenseAssociationImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Feature2DistributionAssociationImpl.java Fri Mar 16 12:05:39 2012
@@ -28,19 +28,19 @@ import org.osgi.framework.InvalidSyntaxE
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 
 /**
- * Implementation class for the Group2LicenseAssociation. For 'what it does', see Group2LicenseAssociation,
+ * Implementation class for the Feature2DistributionAssociation. For 'what it does', see Feature2DistributionAssociation,
  * for 'how it works', see AssociationImpl.
  */
-public class Group2LicenseAssociationImpl extends AssociationImpl<FeatureObject, DistributionObject, Feature2DistributionAssociation> implements Feature2DistributionAssociation {
-    private final static String XML_NODE = "group2license";
+public class Feature2DistributionAssociationImpl extends AssociationImpl<FeatureObject, DistributionObject, Feature2DistributionAssociation> implements Feature2DistributionAssociation {
+    private final static String XML_NODE = "feature2distribution";
 
-    public Group2LicenseAssociationImpl(Map<String, String> attributes, ChangeNotifier notifier, GroupRepositoryImpl groupRepository, LicenseRepositoryImpl licenseRepository) throws InvalidSyntaxException {
-        super(attributes, notifier, FeatureObject.class, DistributionObject.class, groupRepository, licenseRepository, XML_NODE);
+    public Feature2DistributionAssociationImpl(Map<String, String> attributes, ChangeNotifier notifier, FeatureRepositoryImpl featureRepository, DistributionRepositoryImpl distributionRepository) throws InvalidSyntaxException {
+        super(attributes, notifier, FeatureObject.class, DistributionObject.class, featureRepository, distributionRepository, XML_NODE);
     }
-    public Group2LicenseAssociationImpl(Map<String, String> attributes, Map<String, String> tags, ChangeNotifier notifier, GroupRepositoryImpl groupRepository, LicenseRepositoryImpl licenseRepository) throws InvalidSyntaxException {
-        super(attributes, tags, notifier, FeatureObject.class, DistributionObject.class, groupRepository, licenseRepository, XML_NODE);
+    public Feature2DistributionAssociationImpl(Map<String, String> attributes, Map<String, String> tags, ChangeNotifier notifier, FeatureRepositoryImpl featureRepository, DistributionRepositoryImpl distributionRepository) throws InvalidSyntaxException {
+        super(attributes, tags, notifier, FeatureObject.class, DistributionObject.class, featureRepository, distributionRepository, XML_NODE);
     }
-    public Group2LicenseAssociationImpl(HierarchicalStreamReader reader, ChangeNotifier notifier, GroupRepositoryImpl groupRepository, LicenseRepositoryImpl licenseRepository) throws InvalidSyntaxException {
-        super(reader, notifier, FeatureObject.class, DistributionObject.class, null, null, groupRepository, licenseRepository, XML_NODE);
+    public Feature2DistributionAssociationImpl(HierarchicalStreamReader reader, ChangeNotifier notifier, FeatureRepositoryImpl featureRepository, DistributionRepositoryImpl distributionRepository) throws InvalidSyntaxException {
+        super(reader, notifier, FeatureObject.class, DistributionObject.class, null, null, featureRepository, distributionRepository, XML_NODE);
     }
 }

Copied: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Feature2DistributionAssociationRepositoryImpl.java (from r1301412, ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Group2LicenseAssociationRepositoryImpl.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Feature2DistributionAssociationRepositoryImpl.java?p2=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Feature2DistributionAssociationRepositoryImpl.java&p1=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Group2LicenseAssociationRepositoryImpl.java&r1=1301412&r2=1301449&rev=1301449&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Group2LicenseAssociationRepositoryImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Feature2DistributionAssociationRepositoryImpl.java Fri Mar 16 12:05:39 2012
@@ -32,22 +32,22 @@ import com.thoughtworks.xstream.io.Hiera
  * Implementation class for the Group2LicenseAssociationRepository. For 'what it does', see Group2LicenseAssociationRepository,
  * for 'how it works', see AssociationRepositoryImpl.
  */
-public class Group2LicenseAssociationRepositoryImpl extends AssociationRepositoryImpl<FeatureObject, DistributionObject, Group2LicenseAssociationImpl, Feature2DistributionAssociation> implements Feature2DistributionAssociationRepository {
-    private final static String XML_NODE = "groups2licenses";
+public class Feature2DistributionAssociationRepositoryImpl extends AssociationRepositoryImpl<FeatureObject, DistributionObject, Feature2DistributionAssociationImpl, Feature2DistributionAssociation> implements Feature2DistributionAssociationRepository {
+    private final static String XML_NODE = "features2distributions";
 
-    private final GroupRepositoryImpl m_groupRepository;
-    private final LicenseRepositoryImpl m_licenseRepository;
+    private final FeatureRepositoryImpl m_featureRepository;
+    private final DistributionRepositoryImpl m_distributionRepository;
 
-    public Group2LicenseAssociationRepositoryImpl(GroupRepositoryImpl groupRepository, LicenseRepositoryImpl licenseRepository, ChangeNotifier notifier) {
+    public Feature2DistributionAssociationRepositoryImpl(FeatureRepositoryImpl featureRepository, DistributionRepositoryImpl distributionRepository, ChangeNotifier notifier) {
         super(notifier, XML_NODE);
-        m_groupRepository = groupRepository;
-        m_licenseRepository = licenseRepository;
+        m_featureRepository = featureRepository;
+        m_distributionRepository = distributionRepository;
     }
 
     @Override
-    Group2LicenseAssociationImpl createNewInhabitant(Map<String, String> attributes) {
+    Feature2DistributionAssociationImpl createNewInhabitant(Map<String, String> attributes) {
         try {
-            return new Group2LicenseAssociationImpl(attributes, this, m_groupRepository, m_licenseRepository);
+            return new Feature2DistributionAssociationImpl(attributes, this, m_featureRepository, m_distributionRepository);
         }
         catch (InvalidSyntaxException e) {
             throw new IllegalArgumentException("Unable to create association: ", e);
@@ -55,9 +55,9 @@ public class Group2LicenseAssociationRep
     }
 
     @Override
-    Group2LicenseAssociationImpl createNewInhabitant(Map<String, String> attributes, Map<String, String> tags) {
+    Feature2DistributionAssociationImpl createNewInhabitant(Map<String, String> attributes, Map<String, String> tags) {
         try {
-            return new Group2LicenseAssociationImpl(attributes, tags, this, m_groupRepository, m_licenseRepository);
+            return new Feature2DistributionAssociationImpl(attributes, tags, this, m_featureRepository, m_distributionRepository);
         }
         catch (InvalidSyntaxException e) {
             throw new IllegalArgumentException("Unable to create association: ", e);
@@ -65,9 +65,9 @@ public class Group2LicenseAssociationRep
     }
 
     @Override
-    Group2LicenseAssociationImpl createNewInhabitant(HierarchicalStreamReader reader) {
+    Feature2DistributionAssociationImpl createNewInhabitant(HierarchicalStreamReader reader) {
         try {
-            return new Group2LicenseAssociationImpl(reader, this, m_groupRepository, m_licenseRepository);
+            return new Feature2DistributionAssociationImpl(reader, this, m_featureRepository, m_distributionRepository);
         }
         catch (InvalidSyntaxException e) {
             throw new IllegalArgumentException("Unable to create association: ", e);

Copied: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/FeatureObjectImpl.java (from r1301412, ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GroupObjectImpl.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/FeatureObjectImpl.java?p2=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/FeatureObjectImpl.java&p1=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GroupObjectImpl.java&r1=1301412&r2=1301449&rev=1301449&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GroupObjectImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/FeatureObjectImpl.java Fri Mar 16 12:05:39 2012
@@ -30,21 +30,21 @@ import org.apache.ace.client.repository.
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 
 /**
- * Implementation class for the GroupObject. For 'what it does', see GroupObject,
+ * Implementation class for the FeatureObject. For 'what it does', see FeatureObject,
  * for 'how it works', see RepositoryObjectImpl.
  */
-public class GroupObjectImpl extends RepositoryObjectImpl<FeatureObject> implements FeatureObject {
-    private final static String XML_NODE = "group";
+public class FeatureObjectImpl extends RepositoryObjectImpl<FeatureObject> implements FeatureObject {
+    private final static String XML_NODE = "feature";
 
-    GroupObjectImpl(Map<String, String> attributes, Map<String, String> tags, ChangeNotifier notifier) {
+    FeatureObjectImpl(Map<String, String> attributes, Map<String, String> tags, ChangeNotifier notifier) {
         super(checkAttributes(attributes, KEY_NAME), tags, notifier, XML_NODE);
     }
 
-    GroupObjectImpl(Map<String, String> attributes, ChangeNotifier notifier) {
+    FeatureObjectImpl(Map<String, String> attributes, ChangeNotifier notifier) {
         super(checkAttributes(attributes, KEY_NAME), notifier, XML_NODE);
     }
 
-    GroupObjectImpl(HierarchicalStreamReader reader, ChangeNotifier notifier) {
+    FeatureObjectImpl(HierarchicalStreamReader reader, ChangeNotifier notifier) {
         super(reader, notifier, XML_NODE);
     }
 
@@ -76,8 +76,8 @@ public class GroupObjectImpl extends Rep
         return getAssociationsWith(artifact, ArtifactObject.class, Artifact2FeatureAssociation.class);
     }
 
-    public List<Feature2DistributionAssociation> getAssociationsWith(DistributionObject license) {
-        return getAssociationsWith(license, DistributionObject.class, Feature2DistributionAssociation.class);
+    public List<Feature2DistributionAssociation> getAssociationsWith(DistributionObject distribution) {
+        return getAssociationsWith(distribution, DistributionObject.class, Feature2DistributionAssociation.class);
     }
 
     private static String[] DEFINING_KEYS = new String[] {KEY_NAME};

Copied: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/FeatureRepositoryImpl.java (from r1301412, ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GroupRepositoryImpl.java)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/FeatureRepositoryImpl.java?p2=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/FeatureRepositoryImpl.java&p1=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GroupRepositoryImpl.java&r1=1301412&r2=1301449&rev=1301449&view=diff
==============================================================================
--- ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GroupRepositoryImpl.java (original)
+++ ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/FeatureRepositoryImpl.java Fri Mar 16 12:05:39 2012
@@ -26,28 +26,28 @@ import org.apache.ace.client.repository.
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 
 /**
- * Implementation class for the GroupRepository. For 'what it does', see GroupRepository,
+ * Implementation class for the FeatureRepository. For 'what it does', see FeatureRepository,
  * for 'how it works', see ObjectRepositoryImpl.
  */
-public class GroupRepositoryImpl extends ObjectRepositoryImpl<GroupObjectImpl, FeatureObject> implements FeatureRepository {
-    private final static String XML_NODE = "groups";
+public class FeatureRepositoryImpl extends ObjectRepositoryImpl<FeatureObjectImpl, FeatureObject> implements FeatureRepository {
+    private final static String XML_NODE = "features";
 
-    public GroupRepositoryImpl(ChangeNotifier notifier) {
+    public FeatureRepositoryImpl(ChangeNotifier notifier) {
         super(notifier, XML_NODE);
     }
 
     @Override
-    GroupObjectImpl createNewInhabitant(Map<String, String> attributes, Map<String, String> tags) {
-        return new GroupObjectImpl(attributes, tags, this);
+    FeatureObjectImpl createNewInhabitant(Map<String, String> attributes, Map<String, String> tags) {
+        return new FeatureObjectImpl(attributes, tags, this);
     }
 
     @Override
-    GroupObjectImpl createNewInhabitant(Map<String, String> attributes) {
-        return new GroupObjectImpl(attributes, this);
+    FeatureObjectImpl createNewInhabitant(Map<String, String> attributes) {
+        return new FeatureObjectImpl(attributes, this);
     }
 
     @Override
-    GroupObjectImpl createNewInhabitant(HierarchicalStreamReader reader) {
-        return new GroupObjectImpl(reader, this);
+    FeatureObjectImpl createNewInhabitant(HierarchicalStreamReader reader) {
+        return new FeatureObjectImpl(reader, this);
     }
 }

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=1301449&r1=1301448&r2=1301449&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 12:05:39 2012
@@ -101,12 +101,12 @@ public class RepositoryAdminImpl impleme
     private volatile DependencyManager m_manager;
     List<Component[]> m_services;
     private ArtifactRepositoryImpl m_artifactRepositoryImpl;
-    private GroupRepositoryImpl m_groupRepositoryImpl;
-    private Artifact2GroupAssociationRepositoryImpl m_artifact2GroupAssociationRepositoryImpl;
-    private LicenseRepositoryImpl m_licenseRepositoryImpl;
-    private Group2LicenseAssociationRepositoryImpl m_group2LicenseAssociationRepositoryImpl;
-    private GatewayRepositoryImpl m_gatewayRepositoryImpl;
-    private License2GatewayAssociationRepositoryImpl m_license2GatewayAssociationRepositoryImpl;
+    private FeatureRepositoryImpl m_featureRepositoryImpl;
+    private Artifact2FeatureAssociationRepositoryImpl m_artifact2FeatureAssociationRepositoryImpl;
+    private DistributionRepositoryImpl m_distributionRepositoryImpl;
+    private Feature2DistributionAssociationRepositoryImpl m_feature2DistributionAssociationRepositoryImpl;
+    private TargetRepositoryImpl m_targetRepositoryImpl;
+    private Distribution2TargetAssociationRepositoryImpl m_distribution2TargetAssociationRepositoryImpl;
     private DeploymentVersionRepositoryImpl m_deploymentVersionRepositoryImpl;
     private ChangeNotifierManager m_changeNotifierManager;
     private final String m_sessionID;
@@ -161,12 +161,12 @@ public class RepositoryAdminImpl impleme
         // create the repository objects, if this is the first time this method is called.
         if (m_artifactRepositoryImpl == null) {
             m_artifactRepositoryImpl = new ArtifactRepositoryImpl(m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, ArtifactObject.TOPIC_ENTITY_ROOT, m_sessionID));
-            m_groupRepositoryImpl = new GroupRepositoryImpl(m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, FeatureObject.TOPIC_ENTITY_ROOT, m_sessionID));
-            m_artifact2GroupAssociationRepositoryImpl = new Artifact2GroupAssociationRepositoryImpl(m_artifactRepositoryImpl, m_groupRepositoryImpl, m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, Artifact2FeatureAssociation.TOPIC_ENTITY_ROOT, m_sessionID));
-            m_licenseRepositoryImpl = new LicenseRepositoryImpl(m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, DistributionObject.TOPIC_ENTITY_ROOT, m_sessionID));
-            m_group2LicenseAssociationRepositoryImpl = new Group2LicenseAssociationRepositoryImpl(m_groupRepositoryImpl, m_licenseRepositoryImpl, m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, Feature2DistributionAssociation.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, Distribution2TargetAssociation.TOPIC_ENTITY_ROOT, m_sessionID));
+            m_featureRepositoryImpl = new FeatureRepositoryImpl(m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, FeatureObject.TOPIC_ENTITY_ROOT, m_sessionID));
+            m_artifact2FeatureAssociationRepositoryImpl = new Artifact2FeatureAssociationRepositoryImpl(m_artifactRepositoryImpl, m_featureRepositoryImpl, m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, Artifact2FeatureAssociation.TOPIC_ENTITY_ROOT, m_sessionID));
+            m_distributionRepositoryImpl = new DistributionRepositoryImpl(m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, DistributionObject.TOPIC_ENTITY_ROOT, m_sessionID));
+            m_feature2DistributionAssociationRepositoryImpl = new Feature2DistributionAssociationRepositoryImpl(m_featureRepositoryImpl, m_distributionRepositoryImpl, m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, Feature2DistributionAssociation.TOPIC_ENTITY_ROOT, m_sessionID));
+            m_targetRepositoryImpl = new TargetRepositoryImpl(m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, TargetObject.TOPIC_ENTITY_ROOT, m_sessionID));
+            m_distribution2TargetAssociationRepositoryImpl = new Distribution2TargetAssociationRepositoryImpl(m_distributionRepositoryImpl, m_targetRepositoryImpl, m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, Distribution2TargetAssociation.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));
         }
         // first, register the artifact repository manually; it needs some special care.
@@ -188,24 +188,24 @@ public class RepositoryAdminImpl impleme
         m_services.add(new Component[] {artifactRepoService, artifactHandlerService});
 
         // register all repositories are services. Keep the service objects around, we need them to pull the services later.
-        m_services.add(registerRepository(Artifact2FeatureAssociationRepository.class, m_artifact2GroupAssociationRepositoryImpl, new String[] {createPrivateObjectTopic(ArtifactObject.TOPIC_ENTITY_ROOT), createPrivateObjectTopic(FeatureObject.TOPIC_ENTITY_ROOT)}));
-        m_services.add(registerRepository(FeatureRepository.class, m_groupRepositoryImpl, new String[] {}));
-        m_services.add(registerRepository(Feature2DistributionAssociationRepository.class, m_group2LicenseAssociationRepositoryImpl, new String[] {createPrivateObjectTopic(FeatureObject.TOPIC_ENTITY_ROOT), createPrivateObjectTopic(DistributionObject.TOPIC_ENTITY_ROOT)}));
-        m_services.add(registerRepository(DistributionRepository.class, m_licenseRepositoryImpl, new String[] {}));
-        m_services.add(registerRepository(Distribution2TargetAssociationRepository.class, m_license2GatewayAssociationRepositoryImpl, new String[] {createPrivateObjectTopic(DistributionObject.TOPIC_ENTITY_ROOT), createPrivateObjectTopic(TargetObject.TOPIC_ENTITY_ROOT)}));
-        m_services.add(registerRepository(TargetRepository.class, m_gatewayRepositoryImpl, new String[] {}));
+        m_services.add(registerRepository(Artifact2FeatureAssociationRepository.class, m_artifact2FeatureAssociationRepositoryImpl, new String[] {createPrivateObjectTopic(ArtifactObject.TOPIC_ENTITY_ROOT), createPrivateObjectTopic(FeatureObject.TOPIC_ENTITY_ROOT)}));
+        m_services.add(registerRepository(FeatureRepository.class, m_featureRepositoryImpl, new String[] {}));
+        m_services.add(registerRepository(Feature2DistributionAssociationRepository.class, m_feature2DistributionAssociationRepositoryImpl, new String[] {createPrivateObjectTopic(FeatureObject.TOPIC_ENTITY_ROOT), createPrivateObjectTopic(DistributionObject.TOPIC_ENTITY_ROOT)}));
+        m_services.add(registerRepository(DistributionRepository.class, m_distributionRepositoryImpl, new String[] {}));
+        m_services.add(registerRepository(Distribution2TargetAssociationRepository.class, m_distribution2TargetAssociationRepositoryImpl, new String[] {createPrivateObjectTopic(DistributionObject.TOPIC_ENTITY_ROOT), createPrivateObjectTopic(TargetObject.TOPIC_ENTITY_ROOT)}));
+        m_services.add(registerRepository(TargetRepository.class, m_targetRepositoryImpl, new String[] {}));
         m_services.add(registerRepository(DeploymentVersionRepository.class, m_deploymentVersionRepositoryImpl, new String[] {}));
 
         // prepare the results.
         Map<Class<? extends ObjectRepository>, ObjectRepositoryImpl> result = new HashMap<Class<? extends ObjectRepository>, ObjectRepositoryImpl>();
 
         result.put(ArtifactRepository.class, m_artifactRepositoryImpl);
-        result.put(Artifact2FeatureAssociationRepository.class, m_artifact2GroupAssociationRepositoryImpl);
-        result.put(FeatureRepository.class, m_groupRepositoryImpl);
-        result.put(Feature2DistributionAssociationRepository.class, m_group2LicenseAssociationRepositoryImpl);
-        result.put(DistributionRepository.class, m_licenseRepositoryImpl);
-        result.put(Distribution2TargetAssociationRepository.class, m_license2GatewayAssociationRepositoryImpl);
-        result.put(TargetRepository.class, m_gatewayRepositoryImpl);
+        result.put(Artifact2FeatureAssociationRepository.class, m_artifact2FeatureAssociationRepositoryImpl);
+        result.put(FeatureRepository.class, m_featureRepositoryImpl);
+        result.put(Feature2DistributionAssociationRepository.class, m_feature2DistributionAssociationRepositoryImpl);
+        result.put(DistributionRepository.class, m_distributionRepositoryImpl);
+        result.put(Distribution2TargetAssociationRepository.class, m_distribution2TargetAssociationRepositoryImpl);
+        result.put(TargetRepository.class, m_targetRepositoryImpl);
         result.put(DeploymentVersionRepository.class, m_deploymentVersionRepositoryImpl);
 
         return result;
@@ -222,17 +222,17 @@ public class RepositoryAdminImpl impleme
     }
 
     @SuppressWarnings("unchecked")
-    private <T extends RepositoryObject> Component[] registerRepository(Class<? extends ObjectRepository<T>> iface, ObjectRepositoryImpl<?, T> imp, String[] topics) {
+    private <T extends RepositoryObject> Component[] registerRepository(Class<? extends ObjectRepository<T>> iface, ObjectRepositoryImpl<?, T> implementation, String[] topics) {
         Component repositoryService = m_manager.createComponent()
             .setInterface(iface.getName(), m_sessionProps)
-            .setImplementation(imp)
+            .setImplementation(implementation)
             .add(m_manager.createServiceDependency().setService(LogService.class).setRequired(false));
         Dictionary topic = new Hashtable();
         topic.put(EventConstants.EVENT_TOPIC, topics);
         topic.put(EventConstants.EVENT_FILTER, "(" + SessionFactory.SERVICE_SID + "=" + m_sessionID + ")");
         Component handlerService = m_manager.createComponent()
             .setInterface(EventHandler.class.getName(), topic)
-            .setImplementation(imp);
+            .setImplementation(implementation);
 
         m_manager.add(repositoryService);
         m_manager.add(handlerService);
@@ -246,11 +246,6 @@ public class RepositoryAdminImpl impleme
         return RepositoryObject.PRIVATE_TOPIC_ROOT + entityRoot + RepositoryObject.TOPIC_ALL_SUFFIX;
     }
 
-
-
-
-
-
     public void checkout() throws IOException {
         synchronized (m_lock) {
             ensureLogin();
@@ -429,16 +424,16 @@ public class RepositoryAdminImpl impleme
          * Create the lists of repositories and topics, and create and register
          * the sets with these.
          */
-        for (int nRsd = 0; nRsd < result.length; nRsd++) {
-            RepositorySetDescriptor rsd = context.getDescriptors().get(nRsd);
+        for (int i = 0; i < result.length; i++) {
+            RepositorySetDescriptor rsd = context.getDescriptors().get(i);
             ObjectRepositoryImpl[] impls = new ObjectRepositoryImpl[rsd.m_objectRepositories.length];
             String[] topics = new String[rsd.m_objectRepositories.length];
-            for (int nRepo = 0; nRepo < impls.length; nRepo++) {
-                impls[nRepo] = m_repositories.get(rsd.m_objectRepositories[nRepo]);
-                topics[nRepo] = impls[nRepo].getTopicAll(true);
+            for (int j = 0; j < impls.length; j++) {
+                impls[j] = m_repositories.get(rsd.m_objectRepositories[j]);
+                topics[j] = impls[j].getTopicAll(true);
             }
-            result[nRsd] = loadRepositorySet(context.getUser(), rsd, impls);
-            result[nRsd].registerHandler(m_context, m_sessionID, topics);
+            result[i] = loadRepositorySet(context.getUser(), rsd, impls);
+            result[i].registerHandler(m_context, m_sessionID, topics);
         }
 
         return result;
@@ -549,9 +544,6 @@ public class RepositoryAdminImpl impleme
         return WorkingState.Unchanged;
     }
 
-
-
-
     public void addArtifactHelper(ServiceReference ref, ArtifactHelper helper) {
         String mimetype = (String) ref.getProperty(ArtifactHelper.KEY_MIMETYPE);
         m_artifactRepositoryImpl.addHelper(mimetype, helper);
@@ -561,5 +553,4 @@ public class RepositoryAdminImpl impleme
         String mimetype = (String) ref.getProperty(ArtifactHelper.KEY_MIMETYPE);
         m_artifactRepositoryImpl.removeHelper(mimetype, helper);
     }
-
 }

Copied: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryPropertyResolver.java (from r1301412, 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/RepositoryPropertyResolver.java?p2=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryPropertyResolver.java&p1=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepoPropertyResolver.java&r1=1301412&r2=1301449&rev=1301449&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/RepositoryPropertyResolver.java Fri Mar 16 12:05:39 2012
@@ -10,24 +10,20 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.object.DistributionObject;
 
 /**
- * 
  * This PropertyResolver first tries to resolve the key in the
  * current repository object. If not found, it looks for the key
  * in its children. 
- * 
- * @author dennisg
- *
  */
-public class RepoPropertyResolver implements PropertyResolver {
+public class RepositoryPropertyResolver implements PropertyResolver {
 	
-	private final RepositoryObject m_repo;
+	private final RepositoryObject m_repositoryObject;
 	
-	public RepoPropertyResolver(RepositoryObject obj) {
-		m_repo = obj;
+	public RepositoryPropertyResolver(RepositoryObject repositoryObject) {
+		m_repositoryObject = repositoryObject;
 	}
 	
     public String get(String key) {
-		return get(key, m_repo);
+		return get(key, m_repositoryObject);
     }
 
     private String get(String key, RepositoryObject ro) {
@@ -57,7 +53,7 @@ public class RepoPropertyResolver implem
     }
 
     protected List<? extends RepositoryObject> getChildren() {
-    	return getChildren(m_repo);
+    	return getChildren(m_repositoryObject);
     }
     
     protected List<? extends RepositoryObject> getChildren(RepositoryObject ob) {
@@ -65,7 +61,7 @@ public class RepoPropertyResolver implem
             return ((TargetObject) ob).getDistributions();
         }
         else if (ob instanceof DistributionObject) {
-            return ((DistributionObject) ob).getGroups();
+            return ((DistributionObject) ob).getFeatures();
         }
         else if (ob instanceof FeatureObject) {
             return ((FeatureObject) ob).getArtifacts();
@@ -84,5 +80,3 @@ public class RepoPropertyResolver implem
         return null;
     }	
 }
-
-

Copied: ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/TargetObjectImpl.java (from r1301412, 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/TargetObjectImpl.java?p2=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/TargetObjectImpl.java&p1=ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/GatewayObjectImpl.java&r1=1301412&r2=1301449&rev=1301449&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/TargetObjectImpl.java Fri Mar 16 12:05:39 2012
@@ -28,21 +28,21 @@ import org.apache.ace.client.repository.
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 
 /**
- * Implementation class for the GatewayObject. For 'what it does', see GatewayObject,
+ * Implementation class for the TargetObject. For 'what it does', see TargetObject,
  * for 'how it works', see RepositoryObjectImpl.
  */
-public class GatewayObjectImpl extends RepositoryObjectImpl<TargetObject> implements TargetObject {
-    private final static String XML_NODE = "gateway";
+public class TargetObjectImpl extends RepositoryObjectImpl<TargetObject> implements TargetObject {
+    private final static String XML_NODE = "target";
 
-    GatewayObjectImpl(Map<String, String> attributes, ChangeNotifier notifier) {
+    TargetObjectImpl(Map<String, String> attributes, ChangeNotifier notifier) {
         super(checkAttributes(attributes, KEY_ID), notifier, XML_NODE);
     }
 
-    GatewayObjectImpl(Map<String, String> attributes, Map<String, String> tags, ChangeNotifier notifier) {
+    TargetObjectImpl(Map<String, String> attributes, Map<String, String> tags, ChangeNotifier notifier) {
         super(checkAttributes(attributes, KEY_ID), tags, notifier, XML_NODE);
     }
 
-    GatewayObjectImpl(HierarchicalStreamReader reader, ChangeNotifier notifier) {
+    TargetObjectImpl(HierarchicalStreamReader reader, ChangeNotifier notifier) {
         super(reader, notifier, XML_NODE);
         if(getAttribute(KEY_AUTO_APPROVE) == null) {
             addAttribute(KEY_AUTO_APPROVE, String.valueOf(false));
@@ -57,8 +57,8 @@ public class GatewayObjectImpl extends R
         return getAttribute(KEY_ID);
     }
 
-    public List<Distribution2TargetAssociation> getAssociationsWith(DistributionObject license) {
-        return getAssociationsWith(license, DistributionObject.class, Distribution2TargetAssociation.class);
+    public List<Distribution2TargetAssociation> getAssociationsWith(DistributionObject distribution) {
+        return getAssociationsWith(distribution, DistributionObject.class, Distribution2TargetAssociation.class);
     }
 
     private static String[] DEFINING_KEYS = new String[] {KEY_ID};
@@ -79,6 +79,5 @@ public class GatewayObjectImpl extends R
 
     public void setAutoApprove(boolean approve) {
        addAttribute(KEY_AUTO_APPROVE, String.valueOf(approve));
-
     }
 }



Mime
View raw message