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&r1=1695675&r2=1695676&view=diff
==============================================================================
---
ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceManagerImpl.java
(original)
+++
ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceManagerImpl.java
Thu Aug 13 10:58:51 2015
@@ -84,7 +84,7 @@ public class WorkspaceManagerImpl implem
private void addDependency(Component component, Class<?> service, boolean
isRequired) {
component.add(component.getDependencyManager().createServiceDependency().setService(service)
- .setRequired(isRequired).setInstanceBound(true));
+ .setRequired(isRequired));
}
public void destroy() {
Modified:
ace/trunk/org.apache.ace.configurator/src/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.configurator/src/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java?rev=1695676&r1=1695675&r2=1695676&view=diff
==============================================================================
---
ace/trunk/org.apache.ace.configurator/src/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java
(original)
+++
ace/trunk/org.apache.ace.configurator/src/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java
Thu Aug 13 10:58:51 2015
@@ -84,7 +84,6 @@ public class UpdateUserAdminTask impleme
comp.add(dm.createServiceDependency()
.setService(Repository.class, m_repoFilter)
.setCallbacks("addRepo", "removeRepo")
- .setInstanceBound(true)
.setRequired(true)
);
}
Modified:
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/AgentDeploymentServlet.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/AgentDeploymentServlet.java?rev=1695676&r1=1695675&r2=1695676&view=diff
==============================================================================
---
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/AgentDeploymentServlet.java
(original)
+++
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/AgentDeploymentServlet.java
Thu Aug 13 10:58:51 2015
@@ -137,7 +137,7 @@ public class AgentDeploymentServlet exte
*/
protected void init(Component comp) {
comp.add(m_dm.createServiceDependency()
-
.setService(AuthenticationService.class).setRequired(m_useAuth).setInstanceBound(true)
+ .setService(AuthenticationService.class).setRequired(m_useAuth)
);
}
Modified:
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/DeploymentServlet.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/DeploymentServlet.java?rev=1695676&r1=1695675&r2=1695676&view=diff
==============================================================================
---
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/DeploymentServlet.java
(original)
+++
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/DeploymentServlet.java
Thu Aug 13 10:58:51 2015
@@ -199,7 +199,6 @@ public class DeploymentServlet extends H
comp.add(m_dm.createServiceDependency()
.setService(AuthenticationService.class)
.setRequired(m_useAuth)
- .setInstanceBound(true)
);
}
Modified:
ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/Activator.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/Activator.java?rev=1695676&r1=1695675&r2=1695676&view=diff
==============================================================================
---
ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/Activator.java
(original)
+++
ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/Activator.java
Thu Aug 13 10:58:51 2015
@@ -104,7 +104,7 @@ public class Activator extends Dependenc
m_manager.add(component);
}
else {
- Object service = component.getService();
+ Object service = component.getInstance();
if (service instanceof PropertyBasedDiscovery) {
PropertyBasedDiscovery identification =
(PropertyBasedDiscovery) service;
try {
Modified:
ace/trunk/org.apache.ace.http/src/org/apache/ace/http/redirector/Activator.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http/src/org/apache/ace/http/redirector/Activator.java?rev=1695676&r1=1695675&r2=1695676&view=diff
==============================================================================
---
ace/trunk/org.apache.ace.http/src/org/apache/ace/http/redirector/Activator.java
(original)
+++
ace/trunk/org.apache.ace.http/src/org/apache/ace/http/redirector/Activator.java
Thu Aug 13 10:58:51 2015
@@ -63,7 +63,7 @@ public class Activator extends Dependenc
getDependencyManager().add(component);
}
else {
- RedirectServlet servlet = (RedirectServlet) component.getService();
+ RedirectServlet servlet = (RedirectServlet)
component.getInstance();
if (servlet != null) {
servlet.update(properties);
}
Modified:
ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/Activator.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/Activator.java?rev=1695676&r1=1695675&r2=1695676&view=diff
==============================================================================
---
ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/Activator.java
(original)
+++
ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/Activator.java
Thu Aug 13 10:58:51 2015
@@ -96,7 +96,7 @@ public class Activator extends Dependenc
m_manager.add(component);
}
else {
- Object service = component.getService();
+ Object service = component.getInstance();
if (service instanceof PropertyBasedIdentification) {
PropertyBasedIdentification identification =
(PropertyBasedIdentification) service;
identification.setID(id);
Modified:
ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/servlet/BundleServlet.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/servlet/BundleServlet.java?rev=1695676&r1=1695675&r2=1695676&view=diff
==============================================================================
---
ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/servlet/BundleServlet.java
(original)
+++
ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/servlet/BundleServlet.java
Thu Aug 13 10:58:51 2015
@@ -108,7 +108,6 @@ public class BundleServlet extends HttpS
comp.add(m_dm.createServiceDependency()
.setService(AuthenticationService.class)
.setRequired(m_useAuth)
- .setInstanceBound(true)
);
}
Modified:
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryFactory.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryFactory.java?rev=1695676&r1=1695675&r2=1695676&view=diff
==============================================================================
---
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryFactory.java
(original)
+++
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryFactory.java
Thu Aug 13 10:58:51 2015
@@ -69,7 +69,7 @@ public class RepositoryFactory implement
// remove repository service...
Component service = m_instances.remove(pid);
if (service != null) {
- File repoDir = ((RepositoryImpl) service.getService()).getDir();
+ File repoDir = ((RepositoryImpl) service.getInstance()).getDir();
m_manager.remove(service);
@@ -164,7 +164,7 @@ public class RepositoryFactory implement
}
else {
// update existing instance...
- RepositoryImpl store = (RepositoryImpl) oldService.getService();
+ RepositoryImpl store = (RepositoryImpl) oldService.getInstance();
// be a little pedantic about the ignored properties...
if (!baseDir.equals(store.getDir())) {
Modified:
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/servlet/RepositoryServletBase.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/servlet/RepositoryServletBase.java?rev=1695676&r1=1695675&r2=1695676&view=diff
==============================================================================
---
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/servlet/RepositoryServletBase.java
(original)
+++
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/servlet/RepositoryServletBase.java
Thu Aug 13 10:58:51 2015
@@ -196,7 +196,7 @@ public abstract class RepositoryServletB
protected void init(Component comp) {
comp.add(m_dm.createServiceDependency()
.setService(AuthenticationService.class)
- .setRequired(m_useAuth).setInstanceBound(true));
+ .setRequired(m_useAuth));
}
@Override
Modified:
ace/trunk/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java?rev=1695676&r1=1695675&r2=1695676&view=diff
==============================================================================
---
ace/trunk/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java
(original)
+++
ace/trunk/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java
Thu Aug 13 10:58:51 2015
@@ -41,6 +41,7 @@ import junit.framework.TestCase;
import org.apache.ace.test.constants.TestConstants;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.ComponentDependencyDeclaration;
+import org.apache.felix.dm.ComponentState;
import org.apache.felix.dm.ComponentStateListener;
import org.apache.felix.dm.DependencyManager;
import org.apache.felix.dm.ServiceDependency;
@@ -77,7 +78,7 @@ public class IntegrationTestBase extends
StringBuilder result = new StringBuilder();
for (Component component : m_components) {
result.append(component).append('\n');
- for (ComponentDependencyDeclaration dependency :
(List<ComponentDependencyDeclaration>) component.getDependencies()) {
+ for (ComponentDependencyDeclaration dependency :
component.getComponentDeclaration().getComponentDependencies()) {
result.append(" ")
.append(dependency.toString())
.append(" ")
@@ -89,23 +90,31 @@ public class IntegrationTestBase extends
return result.toString();
}
- public void started(Component component) {
- m_components.remove(component);
- m_latch.countDown();
- }
-
- public void starting(Component component) {
- }
-
- public void stopped(Component component) {
- }
-
- public void stopping(Component component) {
- }
+// public void started(Component component) {
+// m_components.remove(component);
+// m_latch.countDown();
+// }
+//
+// public void starting(Component component) {
+// }
+//
+// public void stopped(Component component) {
+// }
+//
+// public void stopping(Component component) {
+// }
public boolean waitForEmpty(long timeout, TimeUnit unit) throws
InterruptedException {
return m_latch.await(timeout, unit);
}
+
+ @Override
+ public void changed(Component component, ComponentState state) {
+ if (state == ComponentState.TRACKING_OPTIONAL) {
+ m_components.remove(component);
+ m_latch.countDown();
+ }
+ }
}
/**
@@ -580,7 +589,7 @@ public class IntegrationTestBase extends
// Register our listener for all the services...
for (Component component : components) {
- component.addStateListener(listener);
+ component.add(listener);
}
// Then give them to the dependency manager...
Modified:
ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinClient.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinClient.java?rev=1695676&r1=1695675&r2=1695676&view=diff
==============================================================================
---
ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinClient.java
(original)
+++
ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinClient.java
Thu Aug 13 10:58:51 2015
@@ -524,7 +524,7 @@ public class VaadinClient extends com.va
component.add(m_manager.createServiceDependency()
.setService(service)
.setRequired(true)
- .setInstanceBound(true));
+ );
}
private void addListener(final Object implementation, final String...
topics) {
@@ -544,7 +544,7 @@ public class VaadinClient extends com.va
component.add(m_manager.createServiceDependency()
.setService(service, "(" + SessionFactory.SERVICE_SID + "=" +
m_sessionID + ")")
.setRequired(true)
- .setInstanceBound(true));
+ );
}
/**
Modified:
ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java?rev=1695676&r1=1695675&r2=1695676&view=diff
==============================================================================
---
ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java
(original)
+++
ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java
Thu Aug 13 10:58:51 2015
@@ -357,7 +357,6 @@ abstract class BaseObjectPanel<REPO_OBJ
DependencyManager dm = component.getDependencyManager();
component.add(dm
.createServiceDependency()
- .setInstanceBound(true)
.setService(UIExtensionFactory.class, "(" +
UIExtensionFactory.EXTENSION_POINT_KEY + "=" + m_extensionPoint + ")")
.setCallbacks("addExtension", "removeExtension"));
}
Modified:
ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/MainActionToolbar.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/MainActionToolbar.java?rev=1695676&r1=1695675&r2=1695676&view=diff
==============================================================================
---
ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/MainActionToolbar.java
(original)
+++
ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/MainActionToolbar.java
Thu Aug 13 10:58:51 2015
@@ -376,8 +376,7 @@ public abstract class MainActionToolbar
.setService(UIExtensionFactory.class, "(" +
UIExtensionFactory.EXTENSION_POINT_KEY + "=" +
UIExtensionFactory.EXTENSION_POINT_VALUE_MENU + ")")
.setCallbacks("add", "remove")
.setRequired(false)
- .setInstanceBound(true)
- );
+ );
}
protected final void remove(ServiceReference ref, UIExtensionFactory
factory) {
