Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 35547 invoked from network); 3 Feb 2011 22:35:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Feb 2011 22:35:39 -0000 Received: (qmail 56700 invoked by uid 500); 3 Feb 2011 22:35:39 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 56609 invoked by uid 500); 3 Feb 2011 22:35:39 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 56602 invoked by uid 99); 3 Feb 2011 22:35:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Feb 2011 22:35:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Feb 2011 22:35:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F18D923889B3; Thu, 3 Feb 2011 22:35:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1067011 - in /felix/trunk/coordinator: ./ src/main/java/org/apache/felix/coordination/impl/ src/main/java/org/apache/felix/coordinator/ src/main/java/org/apache/felix/coordinator/impl/ src/test/java/org/apache/felix/coordination/impl/ src/... Date: Thu, 03 Feb 2011 22:35:13 -0000 To: commits@felix.apache.org From: fmeschbe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110203223513.F18D923889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fmeschbe Date: Thu Feb 3 22:35:13 2011 New Revision: 1067011 URL: http://svn.apache.org/viewvc?rev=1067011&view=rev Log: FELIX-2642 Adapt Felix implementation package and fix Export-Package and Private-Package and Bundle-Activator references in the POM Added: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/Activator.java (contents, props changed) - copied, changed from r1067009, felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/Activator.java felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java (contents, props changed) - copied, changed from r1067009, felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationImpl.java felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java (contents, props changed) - copied, changed from r1067009, felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationMgr.java felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java (contents, props changed) - copied, changed from r1067009, felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinatorImpl.java felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CrdCommand.java (contents, props changed) - copied, changed from r1067009, felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CrdCommand.java felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/ felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/ felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java (contents, props changed) - copied, changed from r1067009, felix/trunk/coordinator/src/test/java/org/apache/felix/coordination/impl/CoordinatorImplTest.java Removed: felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/Activator.java felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationImpl.java felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationMgr.java felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinatorImpl.java felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CrdCommand.java felix/trunk/coordinator/src/test/java/org/apache/felix/coordination/impl/CoordinatorImplTest.java Modified: felix/trunk/coordinator/pom.xml Modified: felix/trunk/coordinator/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/pom.xml?rev=1067011&r1=1067010&r2=1067011&view=diff ============================================================================== --- felix/trunk/coordinator/pom.xml (original) +++ felix/trunk/coordinator/pom.xml Thu Feb 3 22:35:13 2011 @@ -79,16 +79,16 @@ http://felix.apache.org/site/apache-felix-coordination-service.html - org.apache.felix.jmx.service.coordination; - org.apache.felix.service.coordination; + org.apache.felix.jmx.service.coordinator; + org.apache.felix.service.coordinator; version=1.0; mandatory:="status"; status="provisional" - org.apache.felix.coordination.impl.* + org.apache.felix.coordinator.impl.* - org.apache.felix.coordination.impl.Activator + org.apache.felix.coordinator.impl.Activator Copied: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/Activator.java (from r1067009, felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/Activator.java) URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/Activator.java?p2=felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/Activator.java&p1=felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/Activator.java&r1=1067009&r2=1067011&rev=1067011&view=diff ============================================================================== --- felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/Activator.java (original) +++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/Activator.java Thu Feb 3 22:35:13 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.coordination.impl; +package org.apache.felix.coordinator.impl; import java.util.Hashtable; Propchange: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/Activator.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/Activator.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Rev Url Copied: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java (from r1067009, felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationImpl.java) URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java?p2=felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java&p1=felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationImpl.java&r1=1067009&r2=1067011&rev=1067011&view=diff ============================================================================== --- felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationImpl.java (original) +++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java Thu Feb 3 22:35:13 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.coordination.impl; +package org.apache.felix.coordinator.impl; import java.util.ArrayList; import java.util.Collection; Propchange: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Rev Url Copied: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java (from r1067009, felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationMgr.java) URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java?p2=felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java&p1=felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationMgr.java&r1=1067009&r2=1067011&rev=1067011&view=diff ============================================================================== --- felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationMgr.java (original) +++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java Thu Feb 3 22:35:13 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.coordination.impl; +package org.apache.felix.coordinator.impl; import java.io.IOException; import java.util.ArrayList; Propchange: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Rev Url Copied: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java (from r1067009, felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinatorImpl.java) URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java?p2=felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java&p1=felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinatorImpl.java&r1=1067009&r2=1067011&rev=1067011&view=diff ============================================================================== --- felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinatorImpl.java (original) +++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java Thu Feb 3 22:35:13 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.coordination.impl; +package org.apache.felix.coordinator.impl; import java.util.Collection; import java.util.HashSet; Propchange: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Rev Url Copied: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CrdCommand.java (from r1067009, felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CrdCommand.java) URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CrdCommand.java?p2=felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CrdCommand.java&p1=felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CrdCommand.java&r1=1067009&r2=1067011&rev=1067011&view=diff ============================================================================== --- felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CrdCommand.java (original) +++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CrdCommand.java Thu Feb 3 22:35:13 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.coordination.impl; +package org.apache.felix.coordinator.impl; import java.util.Collection; import java.util.Hashtable; Propchange: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CrdCommand.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CrdCommand.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Rev Url Copied: felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java (from r1067009, felix/trunk/coordinator/src/test/java/org/apache/felix/coordination/impl/CoordinatorImplTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java?p2=felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java&p1=felix/trunk/coordinator/src/test/java/org/apache/felix/coordination/impl/CoordinatorImplTest.java&r1=1067009&r2=1067011&rev=1067011&view=diff ============================================================================== --- felix/trunk/coordinator/src/test/java/org/apache/felix/coordination/impl/CoordinatorImplTest.java (original) +++ felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java Thu Feb 3 22:35:13 2011 @@ -16,8 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.coordination.impl; +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; Propchange: felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Rev Url