Return-Path: Delivered-To: apmail-incubator-ace-commits-archive@minotaur.apache.org Received: (qmail 29311 invoked from network); 11 Aug 2010 17:11:49 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 11 Aug 2010 17:11:49 -0000 Received: (qmail 5383 invoked by uid 500); 11 Aug 2010 17:11:49 -0000 Delivered-To: apmail-incubator-ace-commits-archive@incubator.apache.org Received: (qmail 5363 invoked by uid 500); 11 Aug 2010 17:11:49 -0000 Mailing-List: contact ace-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ace-dev@incubator.apache.org Delivered-To: mailing list ace-commits@incubator.apache.org Received: (qmail 5355 invoked by uid 99); 11 Aug 2010 17:11:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Aug 2010 17:11:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 11 Aug 2010 17:11:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 96943238890A; Wed, 11 Aug 2010 17:10:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r984473 - in /incubator/ace/trunk: ace-client-automation/ ace-client-repository-api/ ace-client-repository-configuration/ ace-client-repository-helper-bundle/ ace-client-repository-helper-user/ ace-client-repository-impl/ ace-client-reposit... Date: Wed, 11 Aug 2010 17:10:26 -0000 To: ace-commits@incubator.apache.org From: marrs@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100811171027.96943238890A@eris.apache.org> Author: marrs Date: Wed Aug 11 17:10:24 2010 New Revision: 984473 URL: http://svn.apache.org/viewvc?rev=984473&view=rev Log: Large refactoring of bundles and dependencies, did a lot of cleanup of things that did work, but were intended to be modularized differently. Added: incubator/ace/trunk/ace-client-repository-api/ - copied from r982003, incubator/ace/trunk/ace-client-repository/ incubator/ace/trunk/ace-deployment-deploymentadmin/ - copied from r982003, incubator/ace/trunk/ace-deployment/ incubator/ace/trunk/ace-repository-impl/ - copied from r982003, incubator/ace/trunk/ace-repository/ Removed: incubator/ace/trunk/ace-client-repository/ incubator/ace/trunk/ace-deployment/ incubator/ace/trunk/ace-repository/ Modified: incubator/ace/trunk/ace-client-automation/pom.xml incubator/ace/trunk/ace-client-repository-api/osgi.bnd incubator/ace/trunk/ace-client-repository-api/pom.xml incubator/ace/trunk/ace-client-repository-configuration/pom.xml incubator/ace/trunk/ace-client-repository-helper-bundle/pom.xml incubator/ace/trunk/ace-client-repository-helper-user/pom.xml incubator/ace/trunk/ace-client-repository-impl/osgi.bnd incubator/ace/trunk/ace-client-repository-impl/pom.xml incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/CachedRepositoryImplTest.java incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/FilebasedBackupRepositoryTest.java incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/MockCachedRepository.java incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/MockRepository.java incubator/ace/trunk/ace-client-repository-useradmin/osgi.bnd incubator/ace/trunk/ace-client-repository-useradmin/pom.xml incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/RepositoryUserAdmin.java incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminImpl.java incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/RoleImpl.java incubator/ace/trunk/ace-client-repository-useradmin/src/test/java/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminSerializationTest.java incubator/ace/trunk/ace-configurator-useradmin-task/osgi.bnd incubator/ace/trunk/ace-configurator-useradmin-task/pom.xml incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java incubator/ace/trunk/ace-deployment-api/src/main/java/org/apache/ace/deployment/Deployment.java incubator/ace/trunk/ace-deployment-deploymentadmin/pom.xml incubator/ace/trunk/ace-deployment-provider-api/src/main/java/org/apache/ace/deployment/provider/ArtifactData.java incubator/ace/trunk/ace-deployment-provider-api/src/main/java/org/apache/ace/deployment/provider/DeploymentProvider.java incubator/ace/trunk/ace-deployment-provider-base/pom.xml incubator/ace/trunk/ace-deployment-provider-repositorybased/osgi.bnd incubator/ace/trunk/ace-deployment-provider-repositorybased/pom.xml incubator/ace/trunk/ace-deployment-provider-repositorybased/src/main/java/org/apache/ace/deployment/provider/repositorybased/RepositoryBasedProvider.java incubator/ace/trunk/ace-deployment-provider-repositorybased/src/test/java/org/apache/ace/deployment/provider/repositorybased/MockDeploymentRepository.java incubator/ace/trunk/ace-deployment-servlet/src/main/java/org/apache/ace/deployment/servlet/DeploymentServlet.java incubator/ace/trunk/ace-deployment-task/osgi.bnd incubator/ace/trunk/ace-discovery-api/osgi.bnd incubator/ace/trunk/ace-discovery-api/pom.xml incubator/ace/trunk/ace-discovery-property/osgi.bnd incubator/ace/trunk/ace-discovery-property/pom.xml incubator/ace/trunk/ace-gateway-log/pom.xml incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/task/LogSyncTask.java incubator/ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/gateway/log/task/LogSyncTaskTest.java incubator/ace/trunk/ace-identification-ifconfig/osgi.bnd incubator/ace/trunk/ace-identification-property/osgi.bnd incubator/ace/trunk/ace-identification-property/pom.xml incubator/ace/trunk/ace-log-servlet/pom.xml incubator/ace/trunk/ace-log-servlet/src/main/java/org/apache/ace/server/log/servlet/LogServlet.java incubator/ace/trunk/ace-log-servlet/src/test/java/org/apache/ace/server/log/servlet/LogServletTest.java incubator/ace/trunk/ace-log-task/osgi.bnd incubator/ace/trunk/ace-log-task/pom.xml incubator/ace/trunk/ace-log-task/src/main/java/org/apache/ace/server/log/task/LogSyncTask.java incubator/ace/trunk/ace-log-task/src/test/java/org/apache/ace/server/log/task/LogTaskTest.java incubator/ace/trunk/ace-log/osgi.bnd incubator/ace/trunk/ace-log/pom.xml incubator/ace/trunk/ace-log/src/main/java/org/apache/ace/log/LogDescriptor.java incubator/ace/trunk/ace-log/src/test/java/org/apache/ace/log/LogDescriptorTest.java incubator/ace/trunk/ace-repository-api/pom.xml incubator/ace/trunk/ace-repository-api/src/main/java/org/apache/ace/repository/Repository.java incubator/ace/trunk/ace-repository-api/src/main/java/org/apache/ace/repository/RepositoryReplication.java incubator/ace/trunk/ace-repository-impl/osgi.bnd incubator/ace/trunk/ace-repository-impl/pom.xml incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/Activator.java incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/RepositoryImpl.java incubator/ace/trunk/ace-repository-servlet/pom.xml incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryReplicationServlet.java incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryServlet.java incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryServletBase.java incubator/ace/trunk/ace-repository-task/pom.xml incubator/ace/trunk/ace-repository-task/src/main/java/org/apache/ace/repository/task/RepositoryReplicationTask.java incubator/ace/trunk/ace-server-log-store/pom.xml incubator/ace/trunk/ace-server-log-store/src/main/java/org/apache/ace/server/log/store/impl/LogStoreImpl.java incubator/ace/trunk/ace-target-devgateway/pom.xml incubator/ace/trunk/ace-target-devserver/pom.xml Modified: incubator/ace/trunk/ace-client-automation/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-automation/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-automation/pom.xml (original) +++ incubator/ace/trunk/ace-client-automation/pom.xml Wed Aug 11 17:10:24 2010 @@ -52,7 +52,7 @@ ${project.groupId} - ace-client-repository + ace-client-repository-api ${project.version} Modified: incubator/ace/trunk/ace-client-repository-api/osgi.bnd URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-api/osgi.bnd?rev=984473&r1=982003&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-api/osgi.bnd (original) +++ incubator/ace/trunk/ace-client-repository-api/osgi.bnd Wed Aug 11 17:10:24 2010 @@ -4,9 +4,11 @@ Bundle-Version>:\ Bundle-SymbolicName:\ ${bundle.symbolicName} -Export-Package: +Export-Package: \ + ${bundle.namespace}, \ + ${bundle.namespace}.helper, \ + ${bundle.namespace}.helper.bundle, \ + ${bundle.namespace}.object, \ + ${bundle.namespace}.repository, \ + ${bundle.namespace}.stateful -Import-Package: *;resolution:=optional - -Embed-Dependency: \ - velocity, xpp3 Modified: incubator/ace/trunk/ace-client-repository-api/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-api/pom.xml?rev=984473&r1=982003&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-api/pom.xml (original) +++ incubator/ace/trunk/ace-client-repository-api/pom.xml Wed Aug 11 17:10:24 2010 @@ -25,15 +25,15 @@ org.apache.ace ace-pom 0.8.0-SNAPSHOT - ../pom/ + ../pom/ org.apache.ace - ace-client-repository + ace-client-repository-api 0.8.0-SNAPSHOT bundle - Apache ACE - Client Repository + Apache ACE - Client Repository API ${namespace}.client.repository @@ -68,16 +68,5 @@ org.osgi org.osgi.compendium - - org.apache.velocity - velocity - - - - xpp3 - xpp3 - 1.1.4c - - \ No newline at end of file Modified: incubator/ace/trunk/ace-client-repository-configuration/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-configuration/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-configuration/pom.xml (original) +++ incubator/ace/trunk/ace-client-repository-configuration/pom.xml Wed Aug 11 17:10:24 2010 @@ -51,7 +51,12 @@ ${project.groupId} - ace-client-repository + ace-client-repository-api + ${project.version} + + + ${project.groupId} + ace-client-repository-helper-base ${project.version} Modified: incubator/ace/trunk/ace-client-repository-helper-bundle/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-helper-bundle/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-helper-bundle/pom.xml (original) +++ incubator/ace/trunk/ace-client-repository-helper-bundle/pom.xml Wed Aug 11 17:10:24 2010 @@ -52,7 +52,7 @@ ${project.groupId} - ace-client-repository + ace-client-repository-api ${project.version} Modified: incubator/ace/trunk/ace-client-repository-helper-user/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-helper-user/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-helper-user/pom.xml (original) +++ incubator/ace/trunk/ace-client-repository-helper-user/pom.xml Wed Aug 11 17:10:24 2010 @@ -52,7 +52,12 @@ ${project.groupId} - ace-client-repository + ace-client-repository-api + ${project.version} + + + ${project.groupId} + ace-client-repository-helper-base ${project.version} Modified: incubator/ace/trunk/ace-client-repository-impl/osgi.bnd URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/osgi.bnd?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-impl/osgi.bnd (original) +++ incubator/ace/trunk/ace-client-repository-impl/osgi.bnd Wed Aug 11 17:10:24 2010 @@ -6,12 +6,43 @@ Bundle-Version>:\ Bundle-SymbolicName:\ ${bundle.symbolicName} -Private-Package: org.apache.ace.client.repository.impl, org.apache.ace.util, org.apache.ace.repository.ext, org.apache.ace.repository.impl, org.apache.ace.client.repository.stateful.impl +Private-Package: \ + org.apache.ace.client.repository.impl, \ + org.apache.ace.util, \ + org.apache.ace.repository.ext, \ + org.apache.ace.repository.ext.impl, \ + org.apache.ace.client.repository.stateful.impl -Export-Package:\ - org.apache.ace.client.repository, org.apache.ace.client.repository.object, org.apache.ace.client.repository.repository, org.apache.ace.client.repository.helper, org.apache.ace.client.repository.stateful, org.apache.ace.server.log.store +Export-Package: \ + org.apache.ace.client.repository, \ + org.apache.ace.client.repository.object, \ + org.apache.ace.client.repository.repository, \ + org.apache.ace.client.repository.helper, \ + org.apache.ace.client.repository.stateful, \ + org.apache.ace.server.log.store -Import-Package: *;resolution:=optional +Import-Package: \ + !javax.security.auth, \ + !javax.swing.plaf, \ + !javax.xml.parsers, \ + !javax.xml.stream, \ + !javax.xml.transform.sax, \ + !net.sf.cglib.proxy, \ + !nu.xom, \ + !org.codehaus.jettison.mapped, \ + !org.dom4j, \ + !org.dom4j.io, \ + !org.dom4j.tree, \ + !org.jdom, \ + !org.jdom.input, \ + !org.joda.time, \ + !org.joda.time.format, \ + !org.w3c.dom, \ + !org.xml.sax, \ + !org.xml.sax.helpers, \ + !sun.misc, \ + !sun.reflect, \ + * Embed-Dependency:\ xstream, xpp3 Modified: incubator/ace/trunk/ace-client-repository-impl/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-impl/pom.xml (original) +++ incubator/ace/trunk/ace-client-repository-impl/pom.xml Wed Aug 11 17:10:24 2010 @@ -52,12 +52,17 @@ ${project.groupId} - ace-client-repository + ace-client-repository-api ${project.version} ${project.groupId} - ace-repository + ace-repository-api + ${project.version} + + + ${project.groupId} + ace-repository-ext ${project.version} @@ -65,6 +70,11 @@ ace-server-log-store ${project.version} + + ${project.groupId} + ace-range-api + ${project.version} + ${project.groupId} ace-util Modified: incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java (original) +++ incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java Wed Aug 11 17:10:24 2010 @@ -56,9 +56,9 @@ import org.apache.ace.client.repository. import org.apache.ace.repository.Repository; import org.apache.ace.repository.ext.BackupRepository; import org.apache.ace.repository.ext.CachedRepository; -import org.apache.ace.repository.impl.CachedRepositoryImpl; -import org.apache.ace.repository.impl.FilebasedBackupRepository; -import org.apache.ace.repository.impl.RemoteRepository; +import org.apache.ace.repository.ext.impl.CachedRepositoryImpl; +import org.apache.ace.repository.ext.impl.FilebasedBackupRepository; +import org.apache.ace.repository.ext.impl.RemoteRepository; import org.apache.felix.dm.DependencyManager; import org.apache.felix.dm.Service; import org.osgi.framework.BundleContext; Modified: incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/CachedRepositoryImplTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/CachedRepositoryImplTest.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/CachedRepositoryImplTest.java (original) +++ incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/CachedRepositoryImplTest.java Wed Aug 11 17:10:24 2010 @@ -25,7 +25,7 @@ import java.io.InputStream; import org.apache.ace.repository.Repository; import org.apache.ace.repository.ext.BackupRepository; import org.apache.ace.repository.ext.CachedRepository; -import org.apache.ace.repository.impl.CachedRepositoryImpl; +import org.apache.ace.repository.ext.impl.CachedRepositoryImpl; import org.apache.ace.test.utils.TestUtils; import org.testng.annotations.Test; Modified: incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/FilebasedBackupRepositoryTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/FilebasedBackupRepositoryTest.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/FilebasedBackupRepositoryTest.java (original) +++ incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/FilebasedBackupRepositoryTest.java Wed Aug 11 17:10:24 2010 @@ -23,7 +23,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import org.apache.ace.repository.impl.FilebasedBackupRepository; +import org.apache.ace.repository.ext.impl.FilebasedBackupRepository; import org.apache.ace.test.utils.TestUtils; import org.testng.annotations.Test; Modified: incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/MockCachedRepository.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/MockCachedRepository.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/MockCachedRepository.java (original) +++ incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/MockCachedRepository.java Wed Aug 11 17:10:24 2010 @@ -21,7 +21,7 @@ package org.apache.ace.client.repository import java.io.IOException; import java.io.InputStream; -import org.apache.ace.repository.SortedRangeSet; +import org.apache.ace.range.SortedRangeSet; import org.apache.ace.repository.ext.CachedRepository; Modified: incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/MockRepository.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/MockRepository.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/MockRepository.java (original) +++ incubator/ace/trunk/ace-client-repository-impl/src/test/java/org/apache/ace/client/repository/impl/MockRepository.java Wed Aug 11 17:10:24 2010 @@ -22,8 +22,8 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; +import org.apache.ace.range.SortedRangeSet; import org.apache.ace.repository.Repository; -import org.apache.ace.repository.SortedRangeSet; public class MockRepository implements Repository { Modified: incubator/ace/trunk/ace-client-repository-useradmin/osgi.bnd URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-useradmin/osgi.bnd?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-useradmin/osgi.bnd (original) +++ incubator/ace/trunk/ace-client-repository-useradmin/osgi.bnd Wed Aug 11 17:10:24 2010 @@ -7,5 +7,36 @@ Bundle-SymbolicName:\ Export-Package:\ ${bundle.namespace}; version="${pom.version}" +Private-Package: \ + ${bundle.namespace}.impl, \ + org.apache.ace.repository.ext, \ + org.apache.ace.repository.ext.impl + +Import-Package: \ + !javax.security.auth, \ + !javax.swing.plaf, \ + !javax.xml.parsers, \ + !javax.xml.stream, \ + !javax.xml.transform.sax, \ + !net.sf.cglib.proxy, \ + !nu.xom, \ + !org.codehaus.jettison.mapped, \ + !org.dom4j, \ + !org.dom4j.io, \ + !org.dom4j.tree, \ + !org.jdom, \ + !org.jdom.input, \ + !org.joda.time, \ + !org.joda.time.format, \ + !org.w3c.dom, \ + !org.xml.sax, \ + !org.xml.sax.helpers, \ + !sun.misc, \ + !sun.reflect, \ + * + +Embed-Dependency:\ + xstream, xpp3 + Bundle-Activator: \ ${bundle.namespace}.impl.Activator \ No newline at end of file Modified: incubator/ace/trunk/ace-client-repository-useradmin/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-useradmin/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-useradmin/pom.xml (original) +++ incubator/ace/trunk/ace-client-repository-useradmin/pom.xml Wed Aug 11 17:10:24 2010 @@ -36,8 +36,8 @@ Apache ACE - Client Repository UserAdmin - ${namespace}.client.repository.useradmin - ${namespace}.client.repository.useradmin + ${namespace}.client.repositoryuseradmin + ${namespace}.client.repositoryuseradmin @@ -51,12 +51,27 @@ ${project.groupId} - ace-client-repository + ace-client-repository-api ${project.version} ${project.groupId} - ace-repository + ace-client-repository-helper-base + ${project.version} + + + ${project.groupId} + ace-range-api + ${project.version} + + + ${project.groupId} + ace-repository-api + ${project.version} + + + ${project.groupId} + ace-repository-ext ${project.version} @@ -80,6 +95,11 @@ xstream xstream + + xpp3 + xpp3 + 1.1.4c + Modified: incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/RepositoryUserAdmin.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/RepositoryUserAdmin.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/RepositoryUserAdmin.java (original) +++ incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/RepositoryUserAdmin.java Wed Aug 11 17:10:24 2010 @@ -20,6 +20,7 @@ package org.apache.ace.client.repository import java.io.IOException; import java.net.URL; + import org.osgi.service.useradmin.User; import org.osgi.service.useradmin.UserAdmin; Modified: incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminImpl.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminImpl.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminImpl.java (original) +++ incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminImpl.java Wed Aug 11 17:10:24 2010 @@ -37,20 +37,13 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import com.thoughtworks.xstream.XStream; -import com.thoughtworks.xstream.converters.Converter; -import com.thoughtworks.xstream.converters.MarshallingContext; -import com.thoughtworks.xstream.converters.UnmarshallingContext; -import com.thoughtworks.xstream.io.HierarchicalStreamReader; -import com.thoughtworks.xstream.io.HierarchicalStreamWriter; -import com.thoughtworks.xstream.io.StreamException; -import com.thoughtworks.xstream.io.xml.DomDriver; + import org.apache.ace.client.repositoryuseradmin.RepositoryUserAdmin; import org.apache.ace.repository.Repository; import org.apache.ace.repository.ext.CachedRepository; -import org.apache.ace.repository.impl.CachedRepositoryImpl; -import org.apache.ace.repository.impl.FilebasedBackupRepository; -import org.apache.ace.repository.impl.RemoteRepository; +import org.apache.ace.repository.ext.impl.CachedRepositoryImpl; +import org.apache.ace.repository.ext.impl.FilebasedBackupRepository; +import org.apache.ace.repository.ext.impl.RemoteRepository; import org.osgi.framework.BundleContext; import org.osgi.framework.Filter; import org.osgi.framework.InvalidSyntaxException; @@ -61,6 +54,15 @@ import org.osgi.service.useradmin.Author import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.User; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.converters.Converter; +import com.thoughtworks.xstream.converters.MarshallingContext; +import com.thoughtworks.xstream.converters.UnmarshallingContext; +import com.thoughtworks.xstream.io.HierarchicalStreamReader; +import com.thoughtworks.xstream.io.HierarchicalStreamWriter; +import com.thoughtworks.xstream.io.StreamException; +import com.thoughtworks.xstream.io.xml.DomDriver; + /** * RepositoryUserAdminImpl can checkout, commit and revert a repository * containing user data. It uses XStream to read and write the data. Modified: incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/RoleImpl.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/RoleImpl.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/RoleImpl.java (original) +++ incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/RoleImpl.java Wed Aug 11 17:10:24 2010 @@ -26,6 +26,7 @@ import java.util.HashSet; import java.util.Hashtable; import java.util.List; import java.util.Set; + import org.osgi.framework.InvalidSyntaxException; import org.osgi.service.useradmin.Group; import org.osgi.service.useradmin.Role; Modified: incubator/ace/trunk/ace-client-repository-useradmin/src/test/java/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminSerializationTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-useradmin/src/test/java/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminSerializationTest.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-useradmin/src/test/java/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminSerializationTest.java (original) +++ incubator/ace/trunk/ace-client-repository-useradmin/src/test/java/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminSerializationTest.java Wed Aug 11 17:10:24 2010 @@ -29,7 +29,7 @@ import java.util.concurrent.LinkedBlocki import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import org.apache.ace.repository.SortedRangeSet; +import org.apache.ace.range.SortedRangeSet; import org.apache.ace.repository.ext.CachedRepository; import org.apache.ace.test.utils.TestUtils; import org.osgi.framework.BundleContext; Modified: incubator/ace/trunk/ace-configurator-useradmin-task/osgi.bnd URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator-useradmin-task/osgi.bnd?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-configurator-useradmin-task/osgi.bnd (original) +++ incubator/ace/trunk/ace-configurator-useradmin-task/osgi.bnd Wed Aug 11 17:10:24 2010 @@ -6,8 +6,9 @@ Bundle-Version>:\ Bundle-SymbolicName:\ ${bundle.symbolicName} -Export-Package:\ - ${bundle.namespace}; version="${pom.version}" +Export-Package: -Embed-Dependency:\ - ace-repository; scope=compile|runtime; type=!pom;inline=true \ No newline at end of file +Private-Package: \ + ${bundle.namespace}, \ + org.apache.ace.repository.ext, \ + org.apache.ace.repository.ext.impl Modified: incubator/ace/trunk/ace-configurator-useradmin-task/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator-useradmin-task/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-configurator-useradmin-task/pom.xml (original) +++ incubator/ace/trunk/ace-configurator-useradmin-task/pom.xml Wed Aug 11 17:10:24 2010 @@ -52,12 +52,17 @@ ${project.groupId} + ace-range-api + ${project.version} + + + ${project.groupId} ace-repository-api ${project.version} ${project.groupId} - ace-repository + ace-repository-ext ${project.version} Modified: incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java (original) +++ incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java Wed Aug 11 17:10:24 2010 @@ -26,8 +26,9 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Dictionary; import java.util.Properties; + import org.apache.ace.repository.ext.CachedRepository; -import org.apache.ace.repository.impl.CachedRepositoryImpl; +import org.apache.ace.repository.ext.impl.CachedRepositoryImpl; import org.apache.ace.resourceprocessor.useradmin.UserAdminConfigurator; import org.osgi.framework.BundleContext; import org.osgi.service.cm.ConfigurationException; Modified: incubator/ace/trunk/ace-deployment-api/src/main/java/org/apache/ace/deployment/Deployment.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-api/src/main/java/org/apache/ace/deployment/Deployment.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-deployment-api/src/main/java/org/apache/ace/deployment/Deployment.java (original) +++ incubator/ace/trunk/ace-deployment-api/src/main/java/org/apache/ace/deployment/Deployment.java Wed Aug 11 17:10:24 2010 @@ -24,14 +24,13 @@ import org.osgi.framework.Version; /** * Service that abstracts the actual implementation that manages components that are to be deployed. * Implementations of this interface could for example make use of the DeploymentAdmin - * from the OSGI mobile spec to actually deploy packages. The objects used as arguments and return values + * from the OSGi spec to actually deploy packages. The objects used as arguments and return values * must all be of the same type, which type depends on the implementation. */ -public interface Deployment -{ +public interface Deployment { /** - * Deploys the contents of the stream onto the system + * Deploys the contents of the stream onto the system. * * @param inputStream Stream containing new components. * @return The update package that was installed, may be null if the implementation does not support this. Modified: incubator/ace/trunk/ace-deployment-deploymentadmin/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-deploymentadmin/pom.xml?rev=984473&r1=982003&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-deployment-deploymentadmin/pom.xml (original) +++ incubator/ace/trunk/ace-deployment-deploymentadmin/pom.xml Wed Aug 11 17:10:24 2010 @@ -29,14 +29,14 @@ org.apache.ace - ace-deployment + ace-deployment-deploymentadmin 0.8.0-SNAPSHOT bundle - Apache ACE - Deployment + Apache ACE - Deployment DeploymentAdmin Based - ${namespace}.deployment + ${namespace}.deployment.deploymentadmin ${namespace}.deployment.deploymentadmin Modified: incubator/ace/trunk/ace-deployment-provider-api/src/main/java/org/apache/ace/deployment/provider/ArtifactData.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-api/src/main/java/org/apache/ace/deployment/provider/ArtifactData.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-deployment-provider-api/src/main/java/org/apache/ace/deployment/provider/ArtifactData.java (original) +++ incubator/ace/trunk/ace-deployment-provider-api/src/main/java/org/apache/ace/deployment/provider/ArtifactData.java Wed Aug 11 17:10:24 2010 @@ -25,8 +25,7 @@ import java.util.jar.Attributes; * The ArtifactData as returned by the DeploymentProvider class in this package. * It contains several pieces of data which describe the artifact and the place where it can be found. */ -public interface ArtifactData -{ +public interface ArtifactData { /** * Indicate if the bundle has changed. This is used when comparing artifacts in 2 versions. (see DeploymentProvider) Modified: incubator/ace/trunk/ace-deployment-provider-api/src/main/java/org/apache/ace/deployment/provider/DeploymentProvider.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-api/src/main/java/org/apache/ace/deployment/provider/DeploymentProvider.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-deployment-provider-api/src/main/java/org/apache/ace/deployment/provider/DeploymentProvider.java (original) +++ incubator/ace/trunk/ace-deployment-provider-api/src/main/java/org/apache/ace/deployment/provider/DeploymentProvider.java Wed Aug 11 17:10:24 2010 @@ -25,8 +25,7 @@ import java.util.List; * An interface that provides the meta information for the bundles * in a certain version number. */ -public interface DeploymentProvider -{ +public interface DeploymentProvider { /** * Get the collection of bundleData for a specific version. This data can be used to generate a deployment package. Modified: incubator/ace/trunk/ace-deployment-provider-base/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-base/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-deployment-provider-base/pom.xml (original) +++ incubator/ace/trunk/ace-deployment-provider-base/pom.xml Wed Aug 11 17:10:24 2010 @@ -38,7 +38,7 @@ ${project.groupId} - ace-client-repository + ace-client-repository-api ${project.version} Modified: incubator/ace/trunk/ace-deployment-provider-repositorybased/osgi.bnd URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-repositorybased/osgi.bnd?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-deployment-provider-repositorybased/osgi.bnd (original) +++ incubator/ace/trunk/ace-deployment-provider-repositorybased/osgi.bnd Wed Aug 11 17:10:24 2010 @@ -6,9 +6,11 @@ Bundle-Version>:\ Bundle-SymbolicName:\ ${bundle.symbolicName} -Export-Package:\ - org.apache.ace.deployment.provider; version="${pom.version}" - -Embed-Dependency:\ - ace-deployment-provider-api; inline=true, ace-deployment-provider-base; inline=true,ace-repository; inline=true +Export-Package: +Private-Package: \ + ${bundle.namespace}, \ + org.apache.ace.deployment.provider.impl, \ + org.apache.ace.repository.ext, \ + org.apache.ace.repository.ext.impl + Modified: incubator/ace/trunk/ace-deployment-provider-repositorybased/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-repositorybased/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-deployment-provider-repositorybased/pom.xml (original) +++ incubator/ace/trunk/ace-deployment-provider-repositorybased/pom.xml Wed Aug 11 17:10:24 2010 @@ -52,7 +52,7 @@ ${project.groupId} - ace-client-repository + ace-client-repository-api ${project.version} @@ -63,7 +63,12 @@ ${project.groupId} - ace-repository + ace-range-api + ${project.version} + + + ${project.groupId} + ace-repository-ext ${project.version} Modified: incubator/ace/trunk/ace-deployment-provider-repositorybased/src/main/java/org/apache/ace/deployment/provider/repositorybased/RepositoryBasedProvider.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-repositorybased/src/main/java/org/apache/ace/deployment/provider/repositorybased/RepositoryBasedProvider.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-deployment-provider-repositorybased/src/main/java/org/apache/ace/deployment/provider/repositorybased/RepositoryBasedProvider.java (original) +++ incubator/ace/trunk/ace-deployment-provider-repositorybased/src/main/java/org/apache/ace/deployment/provider/repositorybased/RepositoryBasedProvider.java Wed Aug 11 17:10:24 2010 @@ -32,6 +32,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; + import javax.xml.namespace.QName; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; @@ -39,18 +40,19 @@ import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathVariableResolver; + import org.apache.ace.client.repository.helper.bundle.BundleHelper; import org.apache.ace.client.repository.object.DeploymentArtifact; import org.apache.ace.deployment.provider.ArtifactData; import org.apache.ace.deployment.provider.DeploymentProvider; import org.apache.ace.deployment.provider.impl.ArtifactDataImpl; -import org.apache.ace.repository.RangeIterator; +import org.apache.ace.range.RangeIterator; import org.apache.ace.repository.Repository; import org.apache.ace.repository.ext.BackupRepository; import org.apache.ace.repository.ext.CachedRepository; -import org.apache.ace.repository.impl.CachedRepositoryImpl; -import org.apache.ace.repository.impl.FilebasedBackupRepository; -import org.apache.ace.repository.impl.RemoteRepository; +import org.apache.ace.repository.ext.impl.CachedRepositoryImpl; +import org.apache.ace.repository.ext.impl.FilebasedBackupRepository; +import org.apache.ace.repository.ext.impl.RemoteRepository; import org.osgi.framework.Version; import org.osgi.service.cm.ConfigurationException; import org.osgi.service.cm.ManagedService; Modified: incubator/ace/trunk/ace-deployment-provider-repositorybased/src/test/java/org/apache/ace/deployment/provider/repositorybased/MockDeploymentRepository.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-repositorybased/src/test/java/org/apache/ace/deployment/provider/repositorybased/MockDeploymentRepository.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-deployment-provider-repositorybased/src/test/java/org/apache/ace/deployment/provider/repositorybased/MockDeploymentRepository.java (original) +++ incubator/ace/trunk/ace-deployment-provider-repositorybased/src/test/java/org/apache/ace/deployment/provider/repositorybased/MockDeploymentRepository.java Wed Aug 11 17:10:24 2010 @@ -22,8 +22,8 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; +import org.apache.ace.range.SortedRangeSet; import org.apache.ace.repository.Repository; -import org.apache.ace.repository.SortedRangeSet; public class MockDeploymentRepository implements Repository { Modified: incubator/ace/trunk/ace-deployment-servlet/src/main/java/org/apache/ace/deployment/servlet/DeploymentServlet.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-servlet/src/main/java/org/apache/ace/deployment/servlet/DeploymentServlet.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-deployment-servlet/src/main/java/org/apache/ace/deployment/servlet/DeploymentServlet.java (original) +++ incubator/ace/trunk/ace-deployment-servlet/src/main/java/org/apache/ace/deployment/servlet/DeploymentServlet.java Wed Aug 11 17:10:24 2010 @@ -151,6 +151,7 @@ public class DeploymentServlet extends H throw new AceRestException(HttpServletResponse.SC_NOT_FOUND, "Unknown gateway (" + gatewayID + ")"); } catch (IOException ioe) { + m_log.log(LogService.LOG_WARNING, "Error getting available versions.", ioe); throw new AceRestException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Error getting available versions."); } } Modified: incubator/ace/trunk/ace-deployment-task/osgi.bnd URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-task/osgi.bnd?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-deployment-task/osgi.bnd (original) +++ incubator/ace/trunk/ace-deployment-task/osgi.bnd Wed Aug 11 17:10:24 2010 @@ -6,6 +6,4 @@ Bundle-Version>:\ Bundle-SymbolicName:\ ${bundle.symbolicName} -Export-Package:\ - org.apache.ace.deployment; version="${pom.version}" - +Export-Package: Modified: incubator/ace/trunk/ace-discovery-api/osgi.bnd URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-discovery-api/osgi.bnd?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-discovery-api/osgi.bnd (original) +++ incubator/ace/trunk/ace-discovery-api/osgi.bnd Wed Aug 11 17:10:24 2010 @@ -7,3 +7,4 @@ Bundle-SymbolicName:\ Export-Package:\ ${bundle.namespace}; version="${pom.version}" +Import-Package: Modified: incubator/ace/trunk/ace-discovery-api/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-discovery-api/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-discovery-api/pom.xml (original) +++ incubator/ace/trunk/ace-discovery-api/pom.xml Wed Aug 11 17:10:24 2010 @@ -37,7 +37,7 @@ ${namespace}.discovery - ${namespace}.discovery.api + ${namespace}.discovery Modified: incubator/ace/trunk/ace-discovery-property/osgi.bnd URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-discovery-property/osgi.bnd?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-discovery-property/osgi.bnd (original) +++ incubator/ace/trunk/ace-discovery-property/osgi.bnd Wed Aug 11 17:10:24 2010 @@ -6,9 +6,4 @@ Bundle-Version>:\ Bundle-SymbolicName:\ ${bundle.symbolicName} -Export-Package:\ - org.apache.ace.discovery; version="${pom.version}" - -Embed-Dependency:\ - *; scope=compile|runtime; type=!pom;inline=true - +Export-Package: Modified: incubator/ace/trunk/ace-discovery-property/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-discovery-property/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-discovery-property/pom.xml (original) +++ incubator/ace/trunk/ace-discovery-property/pom.xml Wed Aug 11 17:10:24 2010 @@ -33,7 +33,7 @@ 0.8.0-SNAPSHOT bundle - Apache ACE - Discovery Property based + Apache ACE - Discovery Property Based ${namespace}.discovery.property Modified: incubator/ace/trunk/ace-gateway-log/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-gateway-log/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-gateway-log/pom.xml (original) +++ incubator/ace/trunk/ace-gateway-log/pom.xml Wed Aug 11 17:10:24 2010 @@ -62,6 +62,11 @@ ${groupId} + ace-range-api + ${version} + + + ${groupId} ace-gateway-log-store ${version} Modified: incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/task/LogSyncTask.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/task/LogSyncTask.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/task/LogSyncTask.java (original) +++ incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/task/LogSyncTask.java Wed Aug 11 17:10:24 2010 @@ -26,13 +26,14 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.net.URL; import java.util.List; + import org.apache.ace.discovery.Discovery; import org.apache.ace.gateway.log.store.LogStore; import org.apache.ace.identification.Identification; import org.apache.ace.log.LogDescriptor; import org.apache.ace.log.LogEvent; -import org.apache.ace.repository.RangeIterator; -import org.apache.ace.repository.SortedRangeSet; +import org.apache.ace.range.RangeIterator; +import org.apache.ace.range.SortedRangeSet; import org.osgi.service.log.LogService; public class LogSyncTask implements Runnable { Modified: incubator/ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/gateway/log/task/LogSyncTaskTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/gateway/log/task/LogSyncTaskTest.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/gateway/log/task/LogSyncTaskTest.java (original) +++ incubator/ace/trunk/ace-gateway-log/src/test/java/org/apache/ace/gateway/log/task/LogSyncTaskTest.java Wed Aug 11 17:10:24 2010 @@ -34,7 +34,7 @@ import org.apache.ace.gateway.log.store. import org.apache.ace.identification.Identification; import org.apache.ace.log.LogDescriptor; import org.apache.ace.log.LogEvent; -import org.apache.ace.repository.SortedRangeSet; +import org.apache.ace.range.SortedRangeSet; import org.apache.ace.test.utils.TestUtils; import org.osgi.service.log.LogService; import org.testng.annotations.BeforeMethod; Modified: incubator/ace/trunk/ace-identification-ifconfig/osgi.bnd URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-identification-ifconfig/osgi.bnd?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-identification-ifconfig/osgi.bnd (original) +++ incubator/ace/trunk/ace-identification-ifconfig/osgi.bnd Wed Aug 11 17:10:24 2010 @@ -6,9 +6,4 @@ Bundle-Version>:\ Bundle-SymbolicName:\ ${bundle.symbolicName} -Export-Package:\ - ${bundle.namespace}; version="${pom.version}" - -Embed-Dependency:\ - *; scope=compile|runtime; type=!pom;inline=true - +Export-Package: Modified: incubator/ace/trunk/ace-identification-property/osgi.bnd URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-identification-property/osgi.bnd?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-identification-property/osgi.bnd (original) +++ incubator/ace/trunk/ace-identification-property/osgi.bnd Wed Aug 11 17:10:24 2010 @@ -1,4 +1,4 @@ -Bundle-Activator: ${bundle.namespace}.property.Activator +Bundle-Activator: ${bundle.namespace}.Activator Bundle-Version>:\ ${pom.version} @@ -6,5 +6,4 @@ Bundle-Version>:\ Bundle-SymbolicName:\ ${bundle.symbolicName} -Export-Package:\ - ${bundle.namespace}; version="${pom.version}" +Export-Package: \ No newline at end of file Modified: incubator/ace/trunk/ace-identification-property/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-identification-property/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-identification-property/pom.xml (original) +++ incubator/ace/trunk/ace-identification-property/pom.xml Wed Aug 11 17:10:24 2010 @@ -37,7 +37,7 @@ ${namespace}.identification.property - ${namespace}.identification + ${namespace}.identification.property Modified: incubator/ace/trunk/ace-log-servlet/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log-servlet/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-log-servlet/pom.xml (original) +++ incubator/ace/trunk/ace-log-servlet/pom.xml Wed Aug 11 17:10:24 2010 @@ -52,7 +52,12 @@ ${project.groupId} - ace-repository + ace-range-api + ${project.version} + + + ${project.groupId} + ace-repository-api ${project.version} Modified: incubator/ace/trunk/ace-log-servlet/src/main/java/org/apache/ace/server/log/servlet/LogServlet.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log-servlet/src/main/java/org/apache/ace/server/log/servlet/LogServlet.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-log-servlet/src/main/java/org/apache/ace/server/log/servlet/LogServlet.java (original) +++ incubator/ace/trunk/ace-log-servlet/src/main/java/org/apache/ace/server/log/servlet/LogServlet.java Wed Aug 11 17:10:24 2010 @@ -23,14 +23,16 @@ import java.io.IOException; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; + import javax.servlet.ServletInputStream; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.ace.log.LogDescriptor; import org.apache.ace.log.LogEvent; -import org.apache.ace.repository.SortedRangeSet; +import org.apache.ace.range.SortedRangeSet; import org.apache.ace.server.log.store.LogStore; import org.osgi.service.log.LogService; Modified: incubator/ace/trunk/ace-log-servlet/src/test/java/org/apache/ace/server/log/servlet/LogServletTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log-servlet/src/test/java/org/apache/ace/server/log/servlet/LogServletTest.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-log-servlet/src/test/java/org/apache/ace/server/log/servlet/LogServletTest.java (original) +++ incubator/ace/trunk/ace-log-servlet/src/test/java/org/apache/ace/server/log/servlet/LogServletTest.java Wed Aug 11 17:10:24 2010 @@ -31,8 +31,7 @@ import javax.servlet.ServletOutputStream import org.apache.ace.log.LogDescriptor; import org.apache.ace.log.LogEvent; -import org.apache.ace.repository.SortedRangeSet; -import org.apache.ace.server.log.servlet.LogServlet; +import org.apache.ace.range.SortedRangeSet; import org.apache.ace.server.log.store.LogStore; import org.apache.ace.test.utils.TestUtils; import org.osgi.service.log.LogService; Modified: incubator/ace/trunk/ace-log-task/osgi.bnd URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log-task/osgi.bnd?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-log-task/osgi.bnd (original) +++ incubator/ace/trunk/ace-log-task/osgi.bnd Wed Aug 11 17:10:24 2010 @@ -4,6 +4,4 @@ Bundle-Version>:\ Bundle-SymbolicName:\ ${bundle.symbolicName} -Export-Package:\ - ${bundle.namespace}; version="${pom.version}" - +Export-Package: Modified: incubator/ace/trunk/ace-log-task/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log-task/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-log-task/pom.xml (original) +++ incubator/ace/trunk/ace-log-task/pom.xml Wed Aug 11 17:10:24 2010 @@ -52,6 +52,11 @@ ${project.groupId} + ace-range-api + ${project.version} + + + ${project.groupId} ace-log ${project.version} Modified: incubator/ace/trunk/ace-log-task/src/main/java/org/apache/ace/server/log/task/LogSyncTask.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log-task/src/main/java/org/apache/ace/server/log/task/LogSyncTask.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-log-task/src/main/java/org/apache/ace/server/log/task/LogSyncTask.java (original) +++ incubator/ace/trunk/ace-log-task/src/main/java/org/apache/ace/server/log/task/LogSyncTask.java Wed Aug 11 17:10:24 2010 @@ -36,7 +36,7 @@ import org.apache.ace.discovery.Discover import org.apache.ace.log.LogDescriptor; import org.apache.ace.log.LogEvent; import org.apache.ace.log.LogSync; -import org.apache.ace.repository.SortedRangeSet; +import org.apache.ace.range.SortedRangeSet; import org.apache.ace.server.log.store.LogStore; import org.osgi.service.log.LogService; Modified: incubator/ace/trunk/ace-log-task/src/test/java/org/apache/ace/server/log/task/LogTaskTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log-task/src/test/java/org/apache/ace/server/log/task/LogTaskTest.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-log-task/src/test/java/org/apache/ace/server/log/task/LogTaskTest.java (original) +++ incubator/ace/trunk/ace-log-task/src/test/java/org/apache/ace/server/log/task/LogTaskTest.java Wed Aug 11 17:10:24 2010 @@ -26,8 +26,8 @@ import java.util.ArrayList; import java.util.List; import org.apache.ace.log.LogDescriptor; -import org.apache.ace.repository.RangeIterator; -import org.apache.ace.repository.SortedRangeSet; +import org.apache.ace.range.RangeIterator; +import org.apache.ace.range.SortedRangeSet; import org.testng.annotations.Test; public class LogTaskTest { Modified: incubator/ace/trunk/ace-log/osgi.bnd URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log/osgi.bnd?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-log/osgi.bnd (original) +++ incubator/ace/trunk/ace-log/osgi.bnd Wed Aug 11 17:10:24 2010 @@ -7,3 +7,4 @@ Bundle-SymbolicName:\ Export-Package:\ ${bundle.namespace}; version="${pom.version}" +Private-Package: org.apache.ace.util Modified: incubator/ace/trunk/ace-log/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-log/pom.xml (original) +++ incubator/ace/trunk/ace-log/pom.xml Wed Aug 11 17:10:24 2010 @@ -52,7 +52,7 @@ ${project.groupId} - ace-repository-api + ace-range-api ${project.version} Modified: incubator/ace/trunk/ace-log/src/main/java/org/apache/ace/log/LogDescriptor.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log/src/main/java/org/apache/ace/log/LogDescriptor.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-log/src/main/java/org/apache/ace/log/LogDescriptor.java (original) +++ incubator/ace/trunk/ace-log/src/main/java/org/apache/ace/log/LogDescriptor.java Wed Aug 11 17:10:24 2010 @@ -20,7 +20,8 @@ package org.apache.ace.log; import java.util.NoSuchElementException; import java.util.StringTokenizer; -import org.apache.ace.repository.SortedRangeSet; + +import org.apache.ace.range.SortedRangeSet; import org.apache.ace.util.Codec; /** @@ -31,9 +32,7 @@ import org.apache.ace.util.Codec; *
  • A set of event IDs
    • * */ -public class LogDescriptor -{ - +public class LogDescriptor { private final SortedRangeSet m_rangeSet; private final long m_logID; private final String m_gatewayID; Modified: incubator/ace/trunk/ace-log/src/test/java/org/apache/ace/log/LogDescriptorTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log/src/test/java/org/apache/ace/log/LogDescriptorTest.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-log/src/test/java/org/apache/ace/log/LogDescriptorTest.java (original) +++ incubator/ace/trunk/ace-log/src/test/java/org/apache/ace/log/LogDescriptorTest.java Wed Aug 11 17:10:24 2010 @@ -20,7 +20,7 @@ package org.apache.ace.log; import static org.apache.ace.test.utils.TestUtils.UNIT; -import org.apache.ace.repository.SortedRangeSet; +import org.apache.ace.range.SortedRangeSet; import org.testng.annotations.Test; public class LogDescriptorTest { Modified: incubator/ace/trunk/ace-repository-api/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-api/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-repository-api/pom.xml (original) +++ incubator/ace/trunk/ace-repository-api/pom.xml Wed Aug 11 17:10:24 2010 @@ -33,10 +33,10 @@ 0.8.0-SNAPSHOT bundle - Apache ACE - Repository + Apache ACE - Repository API - ${namespace}.repository.api + ${namespace}.repository ${namespace}.repository @@ -55,5 +55,10 @@ ace-util ${version}     + + ${groupId} + ace-range-api + ${version} +     \ No newline at end of file Modified: incubator/ace/trunk/ace-repository-api/src/main/java/org/apache/ace/repository/Repository.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-api/src/main/java/org/apache/ace/repository/Repository.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-repository-api/src/main/java/org/apache/ace/repository/Repository.java (original) +++ incubator/ace/trunk/ace-repository-api/src/main/java/org/apache/ace/repository/Repository.java Wed Aug 11 17:10:24 2010 @@ -21,6 +21,8 @@ package org.apache.ace.repository; import java.io.IOException; import java.io.InputStream; +import org.apache.ace.range.SortedRangeSet; + /** * Providing full access to a repository, which includes read and write access. */ Modified: incubator/ace/trunk/ace-repository-api/src/main/java/org/apache/ace/repository/RepositoryReplication.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-api/src/main/java/org/apache/ace/repository/RepositoryReplication.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-repository-api/src/main/java/org/apache/ace/repository/RepositoryReplication.java (original) +++ incubator/ace/trunk/ace-repository-api/src/main/java/org/apache/ace/repository/RepositoryReplication.java Wed Aug 11 17:10:24 2010 @@ -21,6 +21,8 @@ package org.apache.ace.repository; import java.io.IOException; import java.io.InputStream; +import org.apache.ace.range.SortedRangeSet; + /** * The interface for replication of the data in a repository. */ Modified: incubator/ace/trunk/ace-repository-impl/osgi.bnd URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-impl/osgi.bnd?rev=984473&r1=982003&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-repository-impl/osgi.bnd (original) +++ incubator/ace/trunk/ace-repository-impl/osgi.bnd Wed Aug 11 17:10:24 2010 @@ -6,12 +6,5 @@ Bundle-Version>:\ Bundle-SymbolicName:\ ${bundle.symbolicName} -Embed-Dependency:\ - *; scope=compile|runtime; type=!pom;inline=true - -Export-Package:\ - ${bundle.namespace}; version="${pom.version}" - --exportcontents: org.apache.ace.util; version="${pom.version}" - +Export-Package: Modified: incubator/ace/trunk/ace-repository-impl/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-impl/pom.xml?rev=984473&r1=982003&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-repository-impl/pom.xml (original) +++ incubator/ace/trunk/ace-repository-impl/pom.xml Wed Aug 11 17:10:24 2010 @@ -29,14 +29,14 @@ org.apache.ace - ace-repository + ace-repository-impl 0.8.0-SNAPSHOT bundle Apache ACE - Repository Impl - ${namespace}.repository + ${namespace}.repository.impl ${namespace}.repository @@ -53,11 +53,21 @@ ${project.groupId} + ace-range-api + ${project.version} + + + ${project.groupId} ace-repository-api ${project.version} ${project.groupId} + ace-repository-ext + ${project.version} + + + ${project.groupId} ace-util ${project.version} Modified: incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/Activator.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/Activator.java?rev=984473&r1=982003&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/Activator.java (original) +++ incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/Activator.java Wed Aug 11 17:10:24 2010 @@ -45,4 +45,4 @@ public class Activator extends Dependenc public void destroy(BundleContext context, DependencyManager manager) throws Exception { // Nothing to do here } -} \ No newline at end of file +} Modified: incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/RepositoryImpl.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/RepositoryImpl.java?rev=984473&r1=982003&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/RepositoryImpl.java (original) +++ incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/RepositoryImpl.java Wed Aug 11 17:10:24 2010 @@ -25,9 +25,10 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.Arrays; + +import org.apache.ace.range.SortedRangeSet; import org.apache.ace.repository.Repository; import org.apache.ace.repository.RepositoryReplication; -import org.apache.ace.repository.SortedRangeSet; import org.osgi.service.cm.ConfigurationException; import org.osgi.service.log.LogService; Modified: incubator/ace/trunk/ace-repository-servlet/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-servlet/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-repository-servlet/pom.xml (original) +++ incubator/ace/trunk/ace-repository-servlet/pom.xml Wed Aug 11 17:10:24 2010 @@ -52,7 +52,13 @@ ${project.groupId} - ace-repository + ace-range-api + ${project.version} + + + + ${project.groupId} + ace-repository-api ${project.version} Modified: incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryReplicationServlet.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryReplicationServlet.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryReplicationServlet.java (original) +++ incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryReplicationServlet.java Wed Aug 11 17:10:24 2010 @@ -21,8 +21,9 @@ package org.apache.ace.repository.servle import java.io.IOException; import java.io.InputStream; import java.util.Dictionary; + +import org.apache.ace.range.SortedRangeSet; import org.apache.ace.repository.RepositoryReplication; -import org.apache.ace.repository.SortedRangeSet; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; import org.osgi.service.cm.ConfigurationException; Modified: incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryServlet.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryServlet.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryServlet.java (original) +++ incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryServlet.java Wed Aug 11 17:10:24 2010 @@ -21,8 +21,9 @@ package org.apache.ace.repository.servle import java.io.IOException; import java.io.InputStream; import java.util.Dictionary; + +import org.apache.ace.range.SortedRangeSet; import org.apache.ace.repository.Repository; -import org.apache.ace.repository.SortedRangeSet; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; import org.osgi.service.cm.ConfigurationException; Modified: incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryServletBase.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryServletBase.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryServletBase.java (original) +++ incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryServletBase.java Wed Aug 11 17:10:24 2010 @@ -26,7 +26,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.ace.repository.SortedRangeSet; +import org.apache.ace.range.SortedRangeSet; import org.osgi.framework.BundleContext; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; Modified: incubator/ace/trunk/ace-repository-task/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-task/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-repository-task/pom.xml (original) +++ incubator/ace/trunk/ace-repository-task/pom.xml Wed Aug 11 17:10:24 2010 @@ -52,7 +52,7 @@ ${project.groupId} - ace-repository + ace-repository-api ${project.version} Modified: incubator/ace/trunk/ace-repository-task/src/main/java/org/apache/ace/repository/task/RepositoryReplicationTask.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-task/src/main/java/org/apache/ace/repository/task/RepositoryReplicationTask.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-repository-task/src/main/java/org/apache/ace/repository/task/RepositoryReplicationTask.java (original) +++ incubator/ace/trunk/ace-repository-task/src/main/java/org/apache/ace/repository/task/RepositoryReplicationTask.java Wed Aug 11 17:10:24 2010 @@ -22,11 +22,13 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; + import javax.servlet.http.HttpServletResponse; + import org.apache.ace.discovery.Discovery; -import org.apache.ace.repository.RangeIterator; +import org.apache.ace.range.RangeIterator; +import org.apache.ace.range.SortedRangeSet; import org.apache.ace.repository.RepositoryReplication; -import org.apache.ace.repository.SortedRangeSet; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.service.log.LogService; Modified: incubator/ace/trunk/ace-server-log-store/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-server-log-store/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-server-log-store/pom.xml (original) +++ incubator/ace/trunk/ace-server-log-store/pom.xml Wed Aug 11 17:10:24 2010 @@ -56,6 +56,11 @@ ${project.version} + ${project.groupId} + ace-range-api + ${project.version} + + org.osgi org.osgi.core Modified: incubator/ace/trunk/ace-server-log-store/src/main/java/org/apache/ace/server/log/store/impl/LogStoreImpl.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-server-log-store/src/main/java/org/apache/ace/server/log/store/impl/LogStoreImpl.java?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-server-log-store/src/main/java/org/apache/ace/server/log/store/impl/LogStoreImpl.java (original) +++ incubator/ace/trunk/ace-server-log-store/src/main/java/org/apache/ace/server/log/store/impl/LogStoreImpl.java Wed Aug 11 17:10:24 2010 @@ -35,7 +35,7 @@ import java.util.Map; import org.apache.ace.log.LogDescriptor; import org.apache.ace.log.LogEvent; -import org.apache.ace.repository.SortedRangeSet; +import org.apache.ace.range.SortedRangeSet; import org.apache.ace.server.log.store.LogStore; import org.osgi.service.event.Event; import org.osgi.service.event.EventAdmin; Modified: incubator/ace/trunk/ace-target-devgateway/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devgateway/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-target-devgateway/pom.xml (original) +++ incubator/ace/trunk/ace-target-devgateway/pom.xml Wed Aug 11 17:10:24 2010 @@ -137,7 +137,7 @@ ${project.groupId} - ace-repository-api + ace-range-api ${project.version} runtime @@ -151,63 +151,63 @@ ${project.groupId} - ace-discovery-property + ace-discovery-api ${project.version} runtime ${project.groupId} - ace-identification-property + ace-discovery-property ${project.version} runtime ${project.groupId} - ace-scheduler + ace-identification-api ${project.version} runtime ${project.groupId} - ace-configurator + ace-identification-property ${project.version} runtime ${project.groupId} - ace-deployment-api + ace-scheduler ${project.version} runtime ${project.groupId} - ace-deployment + ace-configurator ${project.version} runtime ${project.groupId} - ace-deployment-task + ace-deployment-api ${project.version} runtime ${project.groupId} - ace-deployment-provider-api + ace-deployment-deploymentadmin ${project.version} runtime - + ${project.groupId} - ace-util + ace-deployment-task ${project.version} runtime Modified: incubator/ace/trunk/ace-target-devserver/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/pom.xml?rev=984473&r1=984472&r2=984473&view=diff ============================================================================== --- incubator/ace/trunk/ace-target-devserver/pom.xml (original) +++ incubator/ace/trunk/ace-target-devserver/pom.xml Wed Aug 11 17:10:24 2010 @@ -173,10 +173,16 @@ 0.7.2     + + ${project.groupId} + ace-range-api + ${project.version} + runtime + ${project.groupId} - ace-client-repository + ace-client-repository-api ${project.version} runtime @@ -188,6 +194,12 @@ runtime     + + ${project.groupId} + ace-client-repository-helper-base + ${project.version} + runtime + ${project.groupId} @@ -235,6 +247,12 @@ ${project.groupId} + ace-deployment-provider-api + ${project.version} + runtime + + + ${project.groupId} ace-deployment-provider-repositorybased ${project.version} runtime @@ -256,6 +274,12 @@ ${project.groupId} + ace-discovery-api + ${project.version} + runtime + + + ${project.groupId} ace-discovery-property ${project.version} runtime @@ -291,14 +315,19 @@ ${project.groupId} + ace-repository-api + ${project.version} + runtime + + + ${project.groupId} ace-repository-servlet ${project.version} runtime - ${project.groupId} - ace-repository + ace-repository-impl ${project.version} runtime @@ -354,7 +383,6 @@ runtime - ${project.groupId} ace-webui @@ -363,5 +391,20 @@ runtime +     \ No newline at end of file