incubator-ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1166679 - in /incubator/ace/trunk: ace-deployment-deploymentadmin/src/main/java/org/apache/ace/deployment/deploymentadmin/ ace-deployment-task/src/main/java/org/apache/ace/deployment/task/
Date Thu, 08 Sep 2011 13:31:40 GMT
Author: marrs
Date: Thu Sep  8 13:31:40 2011
New Revision: 1166679

URL: http://svn.apache.org/viewvc?rev=1166679&view=rev
Log:
ACE-173 more work on factory support

Modified:
    incubator/ace/trunk/ace-deployment-deploymentadmin/src/main/java/org/apache/ace/deployment/deploymentadmin/DeploymentAdminDeployer.java
    incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java
    incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentTaskBase.java

Modified: incubator/ace/trunk/ace-deployment-deploymentadmin/src/main/java/org/apache/ace/deployment/deploymentadmin/DeploymentAdminDeployer.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-deploymentadmin/src/main/java/org/apache/ace/deployment/deploymentadmin/DeploymentAdminDeployer.java?rev=1166679&r1=1166678&r2=1166679&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-deploymentadmin/src/main/java/org/apache/ace/deployment/deploymentadmin/DeploymentAdminDeployer.java
(original)
+++ incubator/ace/trunk/ace-deployment-deploymentadmin/src/main/java/org/apache/ace/deployment/deploymentadmin/DeploymentAdminDeployer.java
Thu Sep  8 13:31:40 2011
@@ -55,9 +55,6 @@ public class DeploymentAdminDeployer imp
 
     public Object[] list() {
         // DeploymentAdmin spec says this call should never return null
-        // TODO this will return all deployment packages and their versions (dependent code

-        //      just takes all versions and finds the highest, which does not make sense
if
-        //      there is more than one DP)
         return m_admin.listDeploymentPackages();
     }
 }
\ No newline at end of file

Modified: incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java?rev=1166679&r1=1166678&r2=1166679&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java
(original)
+++ incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java
Thu Sep  8 13:31:40 2011
@@ -54,6 +54,10 @@ public class Activator extends Dependenc
         for (Component component : components) {
             m_manager.add(component);
         }
+        manager.add(createComponent()
+            .setInterface(ManagedServiceFactory.class.getName(), new Properties() {{ put(Constants.SERVICE_PID,
"org.apache.ace.deployment.factory"); }} )
+            .setImplementation(this)
+        );
     }
 
     private List<Component> createServices(String ma) {

Modified: incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentTaskBase.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentTaskBase.java?rev=1166679&r1=1166678&r2=1166679&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentTaskBase.java
(original)
+++ incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentTaskBase.java
Thu Sep  8 13:31:40 2011
@@ -106,7 +106,9 @@ public class DeploymentTaskBase implemen
         Object[] installedPackages = m_deployer.list();
         List versions = new ArrayList();
         for (int i = 0; i < installedPackages.length; i++) {
-            versions.add(m_deployer.getVersion(installedPackages[i]));
+            if (m_deployer.getName(installedPackages[i]).equals(m_identification.getID()))
{
+                versions.add(m_deployer.getVersion(installedPackages[i]));
+            }
         }
         return getHighestVersion(versions);
     }



Mime
View raw message