You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2013/12/13 00:50:25 UTC
svn commit: r1550595 - in /felix/trunk/coordinator: ./
src/main/java/org/apache/felix/coordination/
src/main/java/org/apache/felix/coordinator/impl/
src/main/java/org/apache/felix/jmx/service/coordination/
src/main/java/org/apache/felix/service/ src/te...
Author: cziegeler
Date: Thu Dec 12 23:50:25 2013
New Revision: 1550595
URL: http://svn.apache.org/r1550595
Log:
FELIX-2647 : Implement Coordinator Service - update to official 4.3 version
Removed:
felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/
felix/trunk/coordinator/src/main/java/org/apache/felix/jmx/service/coordination/
felix/trunk/coordinator/src/main/java/org/apache/felix/service/
felix/trunk/coordinator/src/test/java/org/apache/felix/coordination/
Modified:
felix/trunk/coordinator/ (props changed)
felix/trunk/coordinator/pom.xml
felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/Activator.java
felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java
felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java
felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java
felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CrdCommand.java
felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java
Propchange: felix/trunk/coordinator/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 12 23:50:25 2013
@@ -0,0 +1,5 @@
+.settings
+
+.classpath
+
+.project
Modified: felix/trunk/coordinator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/pom.xml?rev=1550595&r1=1550594&r2=1550595&view=diff
==============================================================================
--- felix/trunk/coordinator/pom.xml (original)
+++ felix/trunk/coordinator/pom.xml Thu Dec 12 23:50:25 2013
@@ -32,7 +32,6 @@
<name>Apache Felix Coordinator Service</name>
<description>
Implementation of the OSGi Coordinator Service Specification 1.0
- (Based on OSGi R 4.3 Draft 2 (31 Aug. 2010))
</description>
<version>0.0.1-SNAPSHOT</version>
@@ -100,17 +99,17 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
+ <version>4.3.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
+ <version>4.3.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
- <version>4.2.0</version>
+ <version>5.0.0</version>
</dependency>
</dependencies>
</project>
Modified: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/Activator.java?rev=1550595&r1=1550594&r2=1550595&view=diff
==============================================================================
--- felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/Activator.java (original)
+++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/Activator.java Thu Dec 12 23:50:25 2013
@@ -25,7 +25,6 @@ import javax.management.MalformedObjectN
import javax.management.ObjectName;
import org.apache.felix.jmx.service.coordinator.CoordinatorMBean;
-import org.apache.felix.service.coordinator.Coordinator;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -33,6 +32,7 @@ import org.osgi.framework.Constants;
import org.osgi.framework.ServiceFactory;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.coordinator.Coordinator;
import org.osgi.util.tracker.ServiceTracker;
@SuppressWarnings("deprecation")
Modified: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java?rev=1550595&r1=1550594&r2=1550595&view=diff
==============================================================================
--- felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java (original)
+++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java Thu Dec 12 23:50:25 2013
@@ -19,17 +19,17 @@
package org.apache.felix.coordinator.impl;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.TimerTask;
-import org.apache.felix.service.coordinator.Coordination;
-import org.apache.felix.service.coordinator.CoordinationException;
-import org.apache.felix.service.coordinator.Participant;
+import org.osgi.framework.Bundle;
+import org.osgi.service.coordinator.Coordination;
+import org.osgi.service.coordinator.CoordinationException;
+import org.osgi.service.coordinator.Participant;
-@SuppressWarnings("deprecation")
public class CoordinationImpl implements Coordination
{
@@ -69,7 +69,7 @@ public class CoordinationImpl implements
private Thread initiatorThread;
- public CoordinationImpl(final CoordinatorImpl owner, final long id, final String name, final int timeOutInMs)
+ public CoordinationImpl(final CoordinatorImpl owner, final long id, final String name, final long timeOutInMs)
{
// TODO: validate name against Bundle Symbolic Name pattern
@@ -172,7 +172,7 @@ public class CoordinationImpl implements
}
- public Collection<Participant> getParticipants()
+ public List<Participant> getParticipants()
{
// synchronize access to the state to prevent it from being changed
// while we create a copy of the participant list
@@ -233,7 +233,7 @@ public class CoordinationImpl implements
}
}
- public Map<Class<?>, ?> getVariables()
+ public Map<Class<?>, Object> getVariables()
{
return variables;
}
@@ -367,4 +367,14 @@ public class CoordinationImpl implements
owner.schedule(timeoutTask, deadLine);
}
}
+
+ public Bundle getBundle() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Coordination getEnclosingCoordination() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java
URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java?rev=1550595&r1=1550594&r2=1550595&view=diff
==============================================================================
--- felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java (original)
+++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java Thu Dec 12 23:50:25 2013
@@ -37,9 +37,9 @@ import javax.management.openmbean.Tabula
import javax.management.openmbean.TabularDataSupport;
import org.apache.felix.jmx.service.coordinator.CoordinatorMBean;
-import org.apache.felix.service.coordinator.Coordination;
-import org.apache.felix.service.coordinator.CoordinationException;
-import org.apache.felix.service.coordinator.Participant;
+import org.osgi.service.coordinator.Coordination;
+import org.osgi.service.coordinator.CoordinationException;
+import org.osgi.service.coordinator.Participant;
/**
* The <code>CoordinationMgr</code> is the actual backend manager of all
@@ -53,7 +53,6 @@ import org.apache.felix.service.coordina
* <li>Management support to timeout and cleanup coordinations</li>
* </ul>
*/
-@SuppressWarnings("deprecation")
public class CoordinationMgr implements CoordinatorMBean
{
@@ -185,7 +184,7 @@ public class CoordinationMgr implements
// ---------- Coordinator back end implementation
- Coordination create(final CoordinatorImpl owner, final String name, final int timeout)
+ Coordination create(final CoordinatorImpl owner, final String name, final long timeout)
{
long id = ctr.incrementAndGet();
CoordinationImpl c = new CoordinationImpl(owner, id, name, timeout);
Modified: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java?rev=1550595&r1=1550594&r2=1550595&view=diff
==============================================================================
--- felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java (original)
+++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java Thu Dec 12 23:50:25 2013
@@ -22,14 +22,13 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.TimerTask;
-import org.apache.felix.service.coordinator.Coordination;
-import org.apache.felix.service.coordinator.CoordinationException;
-import org.apache.felix.service.coordinator.Coordinator;
-import org.apache.felix.service.coordinator.Participant;
import org.osgi.framework.Bundle;
+import org.osgi.service.coordinator.Coordination;
+import org.osgi.service.coordinator.CoordinationException;
+import org.osgi.service.coordinator.Participant;
@SuppressWarnings("deprecation")
-public class CoordinatorImpl implements Coordinator
+public class CoordinatorImpl implements org.osgi.service.coordinator.Coordinator
{
private final Bundle owner;
@@ -80,7 +79,7 @@ public class CoordinatorImpl implements
}
}
- public Coordination create(final String name, final int timeout)
+ public Coordination create(final String name, final long timeout)
{
// TODO: check permission
Coordination c = mgr.create(this, name, timeout);
@@ -114,7 +113,7 @@ public class CoordinatorImpl implements
return mgr.peek();
}
- public Coordination begin(final String name, final int timeoutInMillis)
+ public Coordination begin(final String name, final long timeoutInMillis)
{
// TODO: check permission
return push(create(name, timeoutInMillis));
Modified: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CrdCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CrdCommand.java?rev=1550595&r1=1550594&r2=1550595&view=diff
==============================================================================
--- felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CrdCommand.java (original)
+++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CrdCommand.java Thu Dec 12 23:50:25 2013
@@ -21,12 +21,12 @@ package org.apache.felix.coordinator.imp
import java.util.Collection;
import java.util.Hashtable;
-import org.apache.felix.service.coordinator.Coordination;
-import org.apache.felix.service.coordinator.Participant;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.coordinator.Coordination;
+import org.osgi.service.coordinator.Participant;
/**
* The <code>CrdCommand</code> class implements the required Command Line
@@ -50,14 +50,14 @@ class CrdCommand /* implements Converter
*
* crd list [ -f, --full ] [ <regex filter on name> ]
* crd fail [ -r, --reason <reason> ] [-b,--bundle <bundle>] <coordination> ...
- * crd participants <coordination> â¦
- * crd details <coordination> â¦
+ * crd participants <coordination> ���
+ * crd details <coordination> ���
*
* A Coordinator must provide a converter to a Coordination based on the
* following inputs:
- * id â the Coordination id
- * name â the Coordination name. Must be unique
- * bundle â Must translate to all coordinations of a specific bundle
+ * id ��� the Coordination id
+ * name ��� the Coordination name. Must be unique
+ * bundle ��� Must translate to all coordinations of a specific bundle
*/
static ServiceRegistration create(final BundleContext context, final CoordinationMgr mgr)
Modified: felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java?rev=1550595&r1=1550594&r2=1550595&view=diff
==============================================================================
--- felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java (original)
+++ felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java Thu Dec 12 23:50:25 2013
@@ -18,14 +18,12 @@
*/
package org.apache.felix.coordinator.impl;
-import org.apache.felix.coordinator.impl.CoordinationMgr;
-import org.apache.felix.coordinator.impl.CoordinatorImpl;
-import org.apache.felix.service.coordinator.Coordination;
-import org.apache.felix.service.coordinator.CoordinationException;
-import org.apache.felix.service.coordinator.Participant;
-
import junit.framework.TestCase;
+import org.osgi.service.coordinator.Coordination;
+import org.osgi.service.coordinator.CoordinationException;
+import org.osgi.service.coordinator.Participant;
+
@SuppressWarnings("deprecation")
public class CoordinatorImplTest extends TestCase
{
@@ -306,6 +304,7 @@ public class CoordinatorImplTest extends
Thread c2Thread = new Thread()
{
+ @Override
public void run()
{
final Coordination c2 = coordinator.create(name2, 0);