svn commit: r1695676 [1/3] - in /ace/trunk: cnf/localrepo/ cnf/localrepo/org.apache.felix.dependencymanager.shell/ cnf/localrepo/org.apache.felix.dependencymanager/ org.apache.ace.client.repository.it
Author: marrs Date: Thu Aug 13 10:58:51 2015 New Revision: 1695676 URL: http://svn.apache.org/r1695676 Log: ACE-514 Upgraded to the latest DM4 release and migrated the code. Added: ace/trunk/cnf/localrepo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-4.0.2.jar (with props) ace/trunk/cnf/localrepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.1.1.jar (with props) Removed: ace/trunk/cnf/localrepo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-3.0.1.jar ace/trunk/cnf/localrepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.1.0.jar Modified: ace/trunk/cnf/localrepo/index.xml ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceImpl.java ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceManagerImpl.java ace/trunk/org.apache.ace.configurator/src/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/AgentDeploymentServlet.java ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/DeploymentServlet.java ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/Activator.java ace/trunk/org.apache.ace.http/src/org/apache/ace/http/redirector/Activator.java ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/Activator.java ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/servlet/BundleServlet.java ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryFactory.java ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/servlet/RepositoryServletBase.java ace/trunk/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinClient.java ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/MainActionToolbar.java
svn commit: r1695676 [2/3] - in /ace/trunk: cnf/localrepo/ cnf/localrepo/org.apache.felix.dependencymanager.shell/ cnf/localrepo/org.apache.felix.dependencymanager/ org.apache.ace.client.repository.it
Modified: ace/trunk/cnf/localrepo/index.xml URL: http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/index.xml?rev=1695676&r1=1695675&r2=1695676&view=diff == --- ace/trunk/cnf/localrepo/index.xml (original) +++ ace/trunk/cnf/localrepo/index.xml Thu Aug 13 10:58:51 2015 @@ -1,630 +1,636 @@ - + - + - + - - - + + + - - + + - - + + - - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + + - - - - - + + + + + - - - - + + + + + - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - + - - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + +
svn commit: r1695676 [3/3] - in /ace/trunk: cnf/localrepo/ cnf/localrepo/org.apache.felix.dependencymanager.shell/ cnf/localrepo/org.apache.felix.dependencymanager/ org.apache.ace.client.repository.it
Added:
ace/trunk/cnf/localrepo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-4.0.2.jar
URL:
http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-4.0.2.jar?rev=1695676&view=auto
==
Binary file - no diff available.
Propchange:
ace/trunk/cnf/localrepo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-4.0.2.jar
--
svn:mime-type = application/octet-stream
Added:
ace/trunk/cnf/localrepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.1.1.jar
URL:
http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.1.1.jar?rev=1695676&view=auto
==
Binary file - no diff available.
Propchange:
ace/trunk/cnf/localrepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.1.1.jar
--
svn:mime-type = application/octet-stream
Modified:
ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java?rev=1695676&r1=1695675&r2=1695676&view=diff
==
---
ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java
(original)
+++
ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java
Thu Aug 13 10:58:51 2015
@@ -61,6 +61,7 @@ import org.apache.ace.repository.Reposit
import org.apache.ace.repository.RepositoryConstants;
import org.apache.ace.test.constants.TestConstants;
import org.apache.felix.dm.Component;
+import org.apache.felix.dm.ComponentState;
import org.apache.felix.dm.ComponentStateListener;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
@@ -375,19 +376,13 @@ public abstract class BaseRepositoryAdmi
}
}
});
-comp.addStateListener(new ComponentStateListener() {
-public void stopping(Component comp) {
-}
-
-public void stopped(Component comp) {
-}
-
-public void starting(Component comp) {
-}
-
-public void started(Component comp) {
-startLatch.countDown();
-}
+comp.add(new ComponentStateListener() {
+ @Override
+ public void changed(Component component, ComponentState
state) {
+ if (state == ComponentState.TRACKING_OPTIONAL) {
+ startLatch.countDown();
+ }
+ }
});
if (debug) {
Modified:
ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceImpl.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceImpl.java?rev=1695676&r1=1695675&r2=1695676&view=diff
==
---
ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceImpl.java
(original)
+++
ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceImpl.java
Thu Aug 13 10:58:51 2015
@@ -108,12 +108,11 @@ public class WorkspaceImpl implements Wo
private void addSessionDependency(Component component, Class service,
boolean isRequired) {
component.add(m_manager.createServiceDependency()
.setService(service, "(" + SessionFactory.SERVICE_SID + "=" +
m_sessionID + ")")
-.setRequired(isRequired).setInstanceBound(true));
+.setRequired(isRequired));
}
private void addDependency(Component component, Class service, boolean
isRequired) {
-
component.add(m_manager.createServiceDependency().setService(service).setRequired(isRequired)
-.setInstanceBound(true));
+
component.add(m_manager.createServiceDependency().setService(service).setRequired(isRequired));
}
public void init(Component component) {
Modified:
ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceManagerImpl.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceManagerImpl.java?rev=1695676
[jira] [Resolved] (ACE-514) Upgrade to Dependency Manager 4
[ https://issues.apache.org/jira/browse/ACE-514?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Marcel Offermans resolved ACE-514. -- Resolution: Fixed Committed the new version, adapted the code, ran the tests locally and launched the all-in-one version and did some smoke tests. Everything seems to work fine again. > Upgrade to Dependency Manager 4 > --- > > Key: ACE-514 > URL: https://issues.apache.org/jira/browse/ACE-514 > Project: ACE > Issue Type: Improvement > Components: Architecture >Reporter: Marcel Offermans >Assignee: Marcel Offermans > > The Apache Felix project recently released Dependency Manager 4 (the current > release is 4.0.1). This upgrade fixes some concurrency issues, cleans up the > API and support concurrency a lot better than before, resulting in faster > startup times. It would be good to upgrade to this version, even though a > couple of small things have changed. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
