You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2014/03/26 17:08:11 UTC
svn commit: r1581901 [4/4] - in /ace/trunk: cnf/ cnf/ecj/ cnf/ext/
cnf/localrepo/ cnf/releaserepo/ cnf/releaserepo/org.apache.ace.agent.itest/
cnf/releaserepo/org.apache.ace.agent.launcher/
cnf/releaserepo/org.apache.ace.agent/ cnf/releaserepo/org.apac...
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.log.server.servlet/org.apache.ace.log.server.servlet-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.log.server.servlet/org.apache.ace.log.server.servlet-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.log.server.store.api/org.apache.ace.log.server.store.api-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.log.server.store.api/org.apache.ace.log.server.store.api-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.log.server.store.file/org.apache.ace.log.server.store.file-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.log.server.store.file/org.apache.ace.log.server.store.file-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.log.server.store.itest/org.apache.ace.log.server.store.itest-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.log.server.store.itest/org.apache.ace.log.server.store.itest-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.log.server.store.mongo/org.apache.ace.log.server.store.mongo-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.log.server.store.mongo/org.apache.ace.log.server.store.mongo-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.log.server.task/org.apache.ace.log.server.task-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.log.server.task/org.apache.ace.log.server.task-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.log.server.ui/org.apache.ace.log.server.ui-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.log.server.ui/org.apache.ace.log.server.ui-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.log.target.store.impl/org.apache.ace.log.target.store.impl-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.log.target.store.impl/org.apache.ace.log.target.store.impl-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.log.target/org.apache.ace.log.target-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.log.target/org.apache.ace.log.target-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.managementagent/org.apache.ace.managementagent-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.managementagent/org.apache.ace.managementagent-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.nodelauncher.amazon/org.apache.ace.nodelauncher.amazon-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.nodelauncher.amazon/org.apache.ace.nodelauncher.amazon-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.nodelauncher.api/org.apache.ace.nodelauncher.api-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.nodelauncher.api/org.apache.ace.nodelauncher.api-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.nodelauncher.ui/org.apache.ace.nodelauncher.ui-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.nodelauncher.ui/org.apache.ace.nodelauncher.ui-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.obr.metadata/org.apache.ace.obr.metadata-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.obr.metadata/org.apache.ace.obr.metadata-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.obr.servlet/org.apache.ace.obr.servlet-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.obr.servlet/org.apache.ace.obr.servlet-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.obr.storage/org.apache.ace.obr.storage-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.obr.storage/org.apache.ace.obr.storage-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.processlauncher/org.apache.ace.processlauncher-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.processlauncher/org.apache.ace.processlauncher-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.range.api/org.apache.ace.range.api-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.range.api/org.apache.ace.range.api-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.repository.api/org.apache.ace.repository.api-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.repository.api/org.apache.ace.repository.api-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.repository.ext/org.apache.ace.repository.ext-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.repository.ext/org.apache.ace.repository.ext-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.repository.impl/org.apache.ace.repository.impl-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.repository.impl/org.apache.ace.repository.impl-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.repository.itest/org.apache.ace.repository.itest-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.repository.itest/org.apache.ace.repository.itest-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.repository.servlet/org.apache.ace.repository.servlet-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.repository.servlet/org.apache.ace.repository.servlet-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.repository.task/org.apache.ace.repository.task-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.repository.task/org.apache.ace.repository.task-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.resourceprocessor.useradmin/org.apache.ace.resourceprocessor.useradmin-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.resourceprocessor.useradmin/org.apache.ace.resourceprocessor.useradmin-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.scheduler.api/org.apache.ace.scheduler.api-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.scheduler.api/org.apache.ace.scheduler.api-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.scheduler.impl/org.apache.ace.scheduler.impl-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.scheduler.impl/org.apache.ace.scheduler.impl-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.tageditor/org.apache.ace.tageditor-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.tageditor/org.apache.ace.tageditor-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.target.mgmt.ui/org.apache.ace.target.mgmt.ui-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.target.mgmt.ui/org.apache.ace.target.mgmt.ui-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.test/org.apache.ace.test-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.test/org.apache.ace.test-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.useradmin.ui.itest/org.apache.ace.useradmin.ui.itest-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.useradmin.ui.itest/org.apache.ace.useradmin.ui.itest-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.useradmin.ui/org.apache.ace.useradmin.ui-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.useradmin.ui/org.apache.ace.useradmin.ui-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.verifier.impl/org.apache.ace.verifier.impl-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.verifier.impl/org.apache.ace.verifier.impl-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.verifier.ui/org.apache.ace.verifier.ui-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.verifier.ui/org.apache.ace.verifier.ui-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/cnf/releaserepo/org.apache.ace.webui.vaadin/org.apache.ace.webui.vaadin-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/releaserepo/org.apache.ace.webui.vaadin/org.apache.ace.webui.vaadin-1.0.0.jar?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
Binary files - no diff available.
Modified: ace/trunk/org.apache.ace.agent.controller.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.controller.itest/.classpath?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.controller.itest/.classpath (original)
+++ ace/trunk/org.apache.ace.agent.controller.itest/.classpath Wed Mar 26 16:08:05 2014
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="src" output="bin_test" path="test"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.agent.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.itest/.classpath?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.itest/.classpath (original)
+++ ace/trunk/org.apache.ace.agent.itest/.classpath Wed Mar 26 16:08:05 2014
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="bin" path="src"/>
- <classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java (original)
+++ ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java Wed Mar 26 16:08:05 2014
@@ -29,15 +29,15 @@ import java.util.concurrent.TimeUnit;
import org.apache.ace.client.repository.SessionFactory;
import org.apache.ace.connectionfactory.ConnectionFactory;
-import org.apache.ace.discovery.property.constants.DiscoveryConstants;
+import org.apache.ace.discovery.DiscoveryConstants;
import org.apache.ace.feedback.Descriptor;
import org.apache.ace.feedback.Event;
import org.apache.ace.http.listener.constants.HttpConstants;
-import org.apache.ace.identification.property.constants.IdentificationConstants;
+import org.apache.ace.identification.IdentificationConstants;
import org.apache.ace.log.Log;
import org.apache.ace.log.server.store.LogStore;
import org.apache.ace.repository.Repository;
-import org.apache.ace.repository.impl.constants.RepositoryConstants;
+import org.apache.ace.repository.RepositoryConstants;
import org.apache.ace.test.constants.TestConstants;
import org.apache.felix.dm.Component;
import org.osgi.framework.Constants;
Modified: ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ObrAuthenticationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ObrAuthenticationTest.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ObrAuthenticationTest.java (original)
+++ ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ObrAuthenticationTest.java Wed Mar 26 16:08:05 2014
@@ -32,9 +32,9 @@ import org.apache.ace.client.repository.
import org.apache.ace.client.repository.helper.bundle.BundleHelper;
import org.apache.ace.client.repository.repository.ArtifactRepository;
import org.apache.ace.connectionfactory.ConnectionFactory;
-import org.apache.ace.obr.storage.file.constants.OBRFileStoreConstants;
+import org.apache.ace.obr.storage.OBRFileStoreConstants;
import org.apache.ace.repository.Repository;
-import org.apache.ace.repository.impl.constants.RepositoryConstants;
+import org.apache.ace.repository.RepositoryConstants;
import org.apache.ace.test.constants.TestConstants;
import org.apache.ace.test.utils.FileUtils;
import org.apache.ace.test.utils.NetUtils;
Modified: ace/trunk/org.apache.ace.bnd/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.bnd/bnd.bnd?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.bnd/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.bnd/bnd.bnd Wed Mar 26 16:08:05 2014
@@ -1,3 +1,3 @@
-sub: *.bnd
--buildpath: biz.aQute.bnd;version=2.1.0,\
- biz.aQute.repository;version=2.1.0
\ No newline at end of file
+-buildpath: biz.aQute.bnd,\
+ biz.aQute.repository
Modified: ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java (original)
+++ ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java Wed Mar 26 16:08:05 2014
@@ -56,9 +56,9 @@ import org.apache.ace.client.repository.
import org.apache.ace.http.listener.constants.HttpConstants;
import org.apache.ace.it.IntegrationTestBase;
import org.apache.ace.log.server.store.LogStore;
-import org.apache.ace.obr.storage.file.constants.OBRFileStoreConstants;
+import org.apache.ace.obr.storage.OBRFileStoreConstants;
import org.apache.ace.repository.Repository;
-import org.apache.ace.repository.impl.constants.RepositoryConstants;
+import org.apache.ace.repository.RepositoryConstants;
import org.apache.ace.test.constants.TestConstants;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.ComponentStateListener;
Modified: ace/trunk/org.apache.ace.configurator.useradmin.itest/src/org/apache/ace/it/useradminconfigurator/ConfiguratorTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.configurator.useradmin.itest/src/org/apache/ace/it/useradminconfigurator/ConfiguratorTest.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.configurator.useradmin.itest/src/org/apache/ace/it/useradminconfigurator/ConfiguratorTest.java (original)
+++ ace/trunk/org.apache.ace.configurator.useradmin.itest/src/org/apache/ace/it/useradminconfigurator/ConfiguratorTest.java Wed Mar 26 16:08:05 2014
@@ -23,7 +23,7 @@ import java.io.IOException;
import org.apache.ace.it.IntegrationTestBase;
import org.apache.ace.repository.Repository;
-import org.apache.ace.repository.impl.constants.RepositoryConstants;
+import org.apache.ace.repository.RepositoryConstants;
import org.apache.felix.dm.Component;
import org.osgi.service.useradmin.User;
import org.osgi.service.useradmin.UserAdmin;
Modified: ace/trunk/org.apache.ace.deployment.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment.itest/bnd.bnd?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.deployment.itest/bnd.bnd Wed Mar 26 16:08:05 2014
@@ -16,7 +16,9 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
org.apache.ace.deployment.provider.api;version=latest,\
org.apache.ace.deployment.provider.filebased;version=latest,\
org.apache.ace.deployment.util.test;version=latest,\
- org.apache.ace.feedback.common;version=latest
+ org.apache.ace.feedback.common;version=latest,\
+ org.apache.ace.deployment.provider.base;version=latest,\
+ org.apache.ace.deployment.task;version=latest
-runfw: org.apache.felix.framework;version='[4,5)'
-runvm: -ea
-runbundles: osgi.cmpn,\
Modified: ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java (original)
+++ ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java Wed Mar 26 16:08:05 2014
@@ -33,9 +33,9 @@ import java.util.concurrent.TimeUnit;
import org.apache.ace.deployment.provider.ArtifactData;
import org.apache.ace.deployment.provider.impl.ArtifactDataImpl;
import org.apache.ace.deployment.util.test.BundleStreamGenerator;
-import org.apache.ace.discovery.property.constants.DiscoveryConstants;
+import org.apache.ace.discovery.DiscoveryConstants;
import org.apache.ace.http.listener.constants.HttpConstants;
-import org.apache.ace.identification.property.constants.IdentificationConstants;
+import org.apache.ace.identification.IdentificationConstants;
import org.apache.ace.it.IntegrationTestBase;
import org.apache.ace.scheduler.constants.SchedulerConstants;
import org.apache.ace.test.constants.TestConstants;
@@ -327,9 +327,9 @@ public class DeploymentIntegrationTest e
private void configureServer() throws IOException {
// configure data bundle
- configure(org.apache.ace.deployment.servlet.Activator.DEPLOYMENT_PID, HttpConstants.ENDPOINT, "/deployment", "authentication.enabled", "false");
+ configure("org.apache.ace.deployment.servlet", HttpConstants.ENDPOINT, "/deployment", "authentication.enabled", "false");
// configure file based backend
- configure(org.apache.ace.deployment.provider.filebased.Activator.PID, "BaseDirectoryName", m_tempDir.getAbsolutePath());
+ configure("org.apache.ace.deployment.provider.filebased", "BaseDirectoryName", m_tempDir.getAbsolutePath());
}
private ArtifactData generateBundle(File file, String symbolicName, String version) throws Exception {
Modified: ace/trunk/org.apache.ace.deployment/task.base.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/task.base.bnd?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/task.base.bnd (original)
+++ ace/trunk/org.apache.ace.deployment/task.base.bnd Wed Mar 26 16:08:05 2014
@@ -1,6 +1,6 @@
Private-Package: org.apache.ace.deployment.service.impl
Bundle-Activator: org.apache.ace.deployment.service.impl.Activator
Export-Package: org.apache.ace.deployment.service
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Deployment Task base
-Bundle-Description: Provides the Deployment task base packages
\ No newline at end of file
+Bundle-Description: Provides the Deployment task base packages
Modified: ace/trunk/org.apache.ace.discovery/api.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/api.bnd?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/api.bnd (original)
+++ ace/trunk/org.apache.ace.discovery/api.bnd Wed Mar 26 16:08:05 2014
@@ -1,4 +1,4 @@
Export-Package: org.apache.ace.discovery
-Bundle-Version: 1.0.0
+Bundle-Version: 1.1.0
Bundle-Name: Apache ACE Discovery API
Bundle-Description: Provides the DIscovery API packages
\ No newline at end of file
Added: ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/DiscoveryConstants.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/DiscoveryConstants.java?rev=1581901&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/DiscoveryConstants.java (added)
+++ ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/DiscoveryConstants.java Wed Mar 26 16:08:05 2014
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.discovery;
+
+public interface DiscoveryConstants {
+ public static final String DISCOVERY_PID = "org.apache.ace.discovery.property";
+ public static final String DISCOVERY_FACTORY_PID = "org.apache.ace.discovery.property.factory";
+ public static final String DISCOVERY_URL_KEY = "serverURL";
+}
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/packageinfo?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/packageinfo (original)
+++ ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/packageinfo Wed Mar 26 16:08:05 2014
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.1.0
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/Activator.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/Activator.java (original)
+++ ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/Activator.java Wed Mar 26 16:08:05 2014
@@ -26,7 +26,7 @@ import java.util.Map;
import java.util.Properties;
import org.apache.ace.discovery.Discovery;
-import org.apache.ace.discovery.property.constants.DiscoveryConstants;
+import org.apache.ace.discovery.DiscoveryConstants;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
Modified: ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/PropertyBasedDiscovery.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/PropertyBasedDiscovery.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/PropertyBasedDiscovery.java (original)
+++ ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/PropertyBasedDiscovery.java Wed Mar 26 16:08:05 2014
@@ -23,7 +23,7 @@ import java.net.URL;
import java.util.Dictionary;
import org.apache.ace.discovery.Discovery;
-import org.apache.ace.discovery.property.constants.DiscoveryConstants;
+import org.apache.ace.discovery.DiscoveryConstants;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedService;
import org.osgi.service.log.LogService;
Modified: ace/trunk/org.apache.ace.discovery/test/org/apache/ace/discovery/property/PropertyBasedDiscoveryTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/test/org/apache/ace/discovery/property/PropertyBasedDiscoveryTest.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/test/org/apache/ace/discovery/property/PropertyBasedDiscoveryTest.java (original)
+++ ace/trunk/org.apache.ace.discovery/test/org/apache/ace/discovery/property/PropertyBasedDiscoveryTest.java Wed Mar 26 16:08:05 2014
@@ -23,7 +23,7 @@ import java.net.URL;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.apache.ace.discovery.property.constants.DiscoveryConstants;
+import org.apache.ace.discovery.DiscoveryConstants;
import org.osgi.service.cm.ConfigurationException;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: ace/trunk/org.apache.ace.discovery/test/org/apache/ace/discovery/property/SimpleDiscoveryTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/test/org/apache/ace/discovery/property/SimpleDiscoveryTest.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/test/org/apache/ace/discovery/property/SimpleDiscoveryTest.java (original)
+++ ace/trunk/org.apache.ace.discovery/test/org/apache/ace/discovery/property/SimpleDiscoveryTest.java Wed Mar 26 16:08:05 2014
@@ -24,7 +24,7 @@ import java.net.URL;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.apache.ace.discovery.property.constants.DiscoveryConstants;
+import org.apache.ace.discovery.DiscoveryConstants;
import org.apache.ace.test.constants.TestConstants;
import org.osgi.service.cm.ConfigurationException;
import org.testng.annotations.BeforeTest;
Modified: ace/trunk/org.apache.ace.gogo.servlet/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.gogo.servlet/.classpath?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.gogo.servlet/.classpath (original)
+++ ace/trunk/org.apache.ace.gogo.servlet/.classpath Wed Mar 26 16:08:05 2014
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="src" output="bin_test" path="test"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.identification/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/.classpath?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/.classpath (original)
+++ ace/trunk/org.apache.ace.identification/.classpath Wed Mar 26 16:08:05 2014
@@ -3,7 +3,7 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="bin_test" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
+ <classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.identification/api.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/api.bnd?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/api.bnd (original)
+++ ace/trunk/org.apache.ace.identification/api.bnd Wed Mar 26 16:08:05 2014
@@ -1,4 +1,4 @@
Export-Package: org.apache.ace.identification
-Bundle-Version: 1.0.0
+Bundle-Version: 1.1.0
Bundle-Name: Apache ACE Identification API
Bundle-Description: Provides the Identification API packages
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.identification/ifconfig.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/ifconfig.bnd?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/ifconfig.bnd (original)
+++ ace/trunk/org.apache.ace.identification/ifconfig.bnd Wed Mar 26 16:08:05 2014
@@ -1,5 +1,5 @@
Private-Package: org.apache.ace.identification.ifconfig
Bundle-Activator: org.apache.ace.identification.ifconfig.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Identification Ifconfig
Bundle-Description: Registers an Identification service based on interface
\ No newline at end of file
Added: ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/IdentificationConstants.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/IdentificationConstants.java?rev=1581901&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/IdentificationConstants.java (added)
+++ ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/IdentificationConstants.java Wed Mar 26 16:08:05 2014
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.identification;
+
+public interface IdentificationConstants {
+ public static final String IDENTIFICATION_PID = "org.apache.ace.identification.property";
+ public static final String IDENTIFICATION_FACTORY_PID = "org.apache.ace.identification.property.factory";
+ public static final String IDENTIFICATION_TARGETID_KEY = "targetID";
+}
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/packageinfo?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/packageinfo (original)
+++ ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/packageinfo Wed Mar 26 16:08:05 2014
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.1.0
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/Activator.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/Activator.java (original)
+++ ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/Activator.java Wed Mar 26 16:08:05 2014
@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.Properties;
import org.apache.ace.identification.Identification;
-import org.apache.ace.identification.property.constants.IdentificationConstants;
+import org.apache.ace.identification.IdentificationConstants;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
Modified: ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/PropertyBasedIdentification.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/PropertyBasedIdentification.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/PropertyBasedIdentification.java (original)
+++ ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/PropertyBasedIdentification.java Wed Mar 26 16:08:05 2014
@@ -21,7 +21,7 @@ package org.apache.ace.identification.pr
import java.util.Dictionary;
import org.apache.ace.identification.Identification;
-import org.apache.ace.identification.property.constants.IdentificationConstants;
+import org.apache.ace.identification.IdentificationConstants;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedService;
import org.osgi.service.log.LogService;
Modified: ace/trunk/org.apache.ace.identification/test/org/apache/ace/identification/property/PropertyBasedIdentificationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/test/org/apache/ace/identification/property/PropertyBasedIdentificationTest.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/test/org/apache/ace/identification/property/PropertyBasedIdentificationTest.java (original)
+++ ace/trunk/org.apache.ace.identification/test/org/apache/ace/identification/property/PropertyBasedIdentificationTest.java Wed Mar 26 16:08:05 2014
@@ -25,7 +25,7 @@ import java.lang.reflect.Field;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.apache.ace.identification.property.constants.IdentificationConstants;
+import org.apache.ace.identification.IdentificationConstants;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.log.LogService;
import org.testng.Assert;
Modified: ace/trunk/org.apache.ace.identification/test/org/apache/ace/identification/property/SimpleIdentificationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/test/org/apache/ace/identification/property/SimpleIdentificationTest.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/test/org/apache/ace/identification/property/SimpleIdentificationTest.java (original)
+++ ace/trunk/org.apache.ace.identification/test/org/apache/ace/identification/property/SimpleIdentificationTest.java Wed Mar 26 16:08:05 2014
@@ -22,7 +22,7 @@ import static org.apache.ace.test.utils.
import java.util.Properties;
-import org.apache.ace.identification.property.constants.IdentificationConstants;
+import org.apache.ace.identification.IdentificationConstants;
import org.apache.ace.test.utils.TestUtils;
import org.osgi.service.log.LogService;
import org.testng.annotations.BeforeTest;
Modified: ace/trunk/org.apache.ace.log.itest/src/org/apache/ace/it/log/LogIntegrationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.itest/src/org/apache/ace/it/log/LogIntegrationTest.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log.itest/src/org/apache/ace/it/log/LogIntegrationTest.java (original)
+++ ace/trunk/org.apache.ace.log.itest/src/org/apache/ace/it/log/LogIntegrationTest.java Wed Mar 26 16:08:05 2014
@@ -23,11 +23,11 @@ import java.util.List;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import org.apache.ace.discovery.property.constants.DiscoveryConstants;
+import org.apache.ace.discovery.DiscoveryConstants;
import org.apache.ace.feedback.Descriptor;
import org.apache.ace.feedback.Event;
import org.apache.ace.http.listener.constants.HttpConstants;
-import org.apache.ace.identification.property.constants.IdentificationConstants;
+import org.apache.ace.identification.IdentificationConstants;
import org.apache.ace.it.IntegrationTestBase;
import org.apache.ace.log.Log;
import org.apache.ace.log.server.store.LogStore;
Added: ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/OBRFileStoreConstants.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/OBRFileStoreConstants.java?rev=1581901&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/OBRFileStoreConstants.java (added)
+++ ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/OBRFileStoreConstants.java Wed Mar 26 16:08:05 2014
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.obr.storage;
+
+public interface OBRFileStoreConstants
+{
+ public static final String FILE_LOCATION_KEY = "fileLocation";
+}
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java Wed Mar 26 16:08:05 2014
@@ -38,7 +38,7 @@ import java.util.Stack;
import org.apache.ace.obr.metadata.MetadataGenerator;
import org.apache.ace.obr.metadata.util.ResourceMetaData;
import org.apache.ace.obr.storage.BundleStore;
-import org.apache.ace.obr.storage.file.constants.OBRFileStoreConstants;
+import org.apache.ace.obr.storage.OBRFileStoreConstants;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedService;
import org.osgi.service.log.LogService;
Modified: ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/storage/file/BundleFileStoreTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/storage/file/BundleFileStoreTest.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/storage/file/BundleFileStoreTest.java (original)
+++ ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/storage/file/BundleFileStoreTest.java Wed Mar 26 16:08:05 2014
@@ -35,7 +35,7 @@ import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
import org.apache.ace.obr.metadata.MetadataGenerator;
-import org.apache.ace.obr.storage.file.constants.OBRFileStoreConstants;
+import org.apache.ace.obr.storage.OBRFileStoreConstants;
import org.apache.ace.test.utils.FileUtils;
import org.apache.ace.test.utils.TestUtils;
import org.osgi.framework.Constants;
Added: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryConstants.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryConstants.java?rev=1581901&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryConstants.java (added)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryConstants.java Wed Mar 26 16:08:05 2014
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.repository;
+
+public interface RepositoryConstants
+{
+ public static final String REPOSITORY_NAME = "name";
+ public static final String REPOSITORY_CUSTOMER = "customer";
+ public static final String REPOSITORY_MASTER = "master";
+ public static final String REPOSITORY_INITIAL_CONTENT = "initial";
+ public static final String REPOSITORY_BASE_DIR = "basedir";
+ public static final String REPOSITORY_FILE_EXTENSION = "fileextension";
+ public static final String REPOSITORY_LIMIT = "limit";
+}
Modified: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryFactory.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryFactory.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryFactory.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryFactory.java Wed Mar 26 16:08:05 2014
@@ -18,13 +18,13 @@
*/
package org.apache.ace.repository.impl;
-import static org.apache.ace.repository.impl.constants.RepositoryConstants.REPOSITORY_BASE_DIR;
-import static org.apache.ace.repository.impl.constants.RepositoryConstants.REPOSITORY_CUSTOMER;
-import static org.apache.ace.repository.impl.constants.RepositoryConstants.REPOSITORY_FILE_EXTENSION;
-import static org.apache.ace.repository.impl.constants.RepositoryConstants.REPOSITORY_INITIAL_CONTENT;
-import static org.apache.ace.repository.impl.constants.RepositoryConstants.REPOSITORY_LIMIT;
-import static org.apache.ace.repository.impl.constants.RepositoryConstants.REPOSITORY_MASTER;
-import static org.apache.ace.repository.impl.constants.RepositoryConstants.REPOSITORY_NAME;
+import static org.apache.ace.repository.RepositoryConstants.REPOSITORY_BASE_DIR;
+import static org.apache.ace.repository.RepositoryConstants.REPOSITORY_CUSTOMER;
+import static org.apache.ace.repository.RepositoryConstants.REPOSITORY_FILE_EXTENSION;
+import static org.apache.ace.repository.RepositoryConstants.REPOSITORY_INITIAL_CONTENT;
+import static org.apache.ace.repository.RepositoryConstants.REPOSITORY_LIMIT;
+import static org.apache.ace.repository.RepositoryConstants.REPOSITORY_MASTER;
+import static org.apache.ace.repository.RepositoryConstants.REPOSITORY_NAME;
import java.io.ByteArrayInputStream;
import java.io.File;
Modified: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryImpl.java?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryImpl.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryImpl.java Wed Mar 26 16:08:05 2014
@@ -31,8 +31,8 @@ import java.util.Arrays;
import org.apache.ace.range.SortedRangeSet;
import org.apache.ace.repository.Repository;
+import org.apache.ace.repository.RepositoryConstants;
import org.apache.ace.repository.RepositoryReplication;
-import org.apache.ace.repository.impl.constants.RepositoryConstants;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.log.LogService;
Modified: ace/trunk/run-relay/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/run-relay/.classpath?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/run-relay/.classpath (original)
+++ ace/trunk/run-relay/.classpath Wed Mar 26 16:08:05 2014
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="src" output="bin_test" path="test"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>