ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1301381 [3/4] - in /ace/trunk: ./ ace-ant-tasks/ ace-client-automation/ ace-client-automation/src/main/java/org/apache/ace/client/automation/ ace-client-repository-api/ ace-client-repository-api/src/main/java/org/apache/ace/client/reposito...
Date Fri, 16 Mar 2012 08:58:23 GMT
Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/repositoryadmin/RepositoryAdminTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/repositoryadmin/RepositoryAdminTest.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/repositoryadmin/RepositoryAdminTest.java (original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/repositoryadmin/RepositoryAdminTest.java Fri Mar 16 08:58:19 2012
@@ -25,8 +25,8 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.helper.bundle.BundleHelper;
 import org.apache.ace.client.repository.object.*;
 import org.apache.ace.client.repository.repository.*;
-import org.apache.ace.client.repository.stateful.StatefulGatewayObject;
-import org.apache.ace.client.repository.stateful.StatefulGatewayRepository;
+import org.apache.ace.client.repository.stateful.StatefulTargetObject;
+import org.apache.ace.client.repository.stateful.StatefulTargetRepository;
 import org.apache.ace.http.listener.constants.HttpConstants;
 import org.apache.ace.it.IntegrationTestBase;
 import org.apache.ace.log.AuditEvent;
@@ -74,7 +74,7 @@ import junit.framework.Assert;
 import static org.apache.ace.client.repository.RepositoryObject.PRIVATE_TOPIC_ROOT;
 import static org.apache.ace.client.repository.RepositoryObject.PUBLIC_TOPIC_ROOT;
 import static org.apache.ace.client.repository.RepositoryObject.WorkingState;
-import static org.apache.ace.client.repository.stateful.StatefulGatewayObject.*;
+import static org.apache.ace.client.repository.stateful.StatefulTargetObject.*;
 import static org.apache.ace.it.Options.*;
 import static org.ops4j.pax.exam.CoreOptions.*;
 
@@ -143,9 +143,9 @@ public class RepositoryAdminTest extends
                     .add(createServiceDependency().setService(Group2LicenseAssociationRepository.class).setRequired(true))
                     .add(createServiceDependency().setService(LicenseRepository.class).setRequired(true))
                     .add(createServiceDependency().setService(License2GatewayAssociationRepository.class).setRequired(true))
-                    .add(createServiceDependency().setService(GatewayRepository.class).setRequired(true))
+                    .add(createServiceDependency().setService(TargetRepository.class).setRequired(true))
                     .add(createServiceDependency().setService(DeploymentVersionRepository.class).setRequired(true))
-                    .add(createServiceDependency().setService(StatefulGatewayRepository.class).setRequired(true))
+                    .add(createServiceDependency().setService(StatefulTargetRepository.class).setRequired(true))
                     .add(createServiceDependency().setService(LogStore.class, "(&(" + Constants.OBJECTCLASS + "=" + LogStore.class.getName() + ")(name=auditlog))").setRequired(true))
                     .add(createServiceDependency().setService(ConfigurationAdmin.class).setRequired(true))
         };
@@ -159,9 +159,9 @@ public class RepositoryAdminTest extends
     private volatile Group2LicenseAssociationRepository m_group2licenseRepository; /* Injected by dependency manager */
     private volatile LicenseRepository m_licenseRepository; /* Injected by dependency manager */
     private volatile License2GatewayAssociationRepository m_license2gatewayRepository; /* Injected by dependency manager */
-    private volatile GatewayRepository m_gatewayRepository; /* Injected by dependency manager */
+    private volatile TargetRepository m_gatewayRepository; /* Injected by dependency manager */
     private volatile DeploymentVersionRepository m_deploymentVersionRepository; /* Injected by dependency manager */
-    private volatile StatefulGatewayRepository m_statefulGatewayRepository; /* Injected by dependency manager */
+    private volatile StatefulTargetRepository m_statefulGatewayRepository; /* Injected by dependency manager */
     private volatile LogStore m_auditLogStore; /* Injected by dependency manager */
 
     public void cleanUp() throws IOException, InvalidSyntaxException, InterruptedException {
@@ -348,7 +348,7 @@ public class RepositoryAdminTest extends
 
         final RepositoryAdminLoginContext loginContext1 = m_repositoryAdmin.createLoginContext(user1);
         loginContext1.addShopRepository(new URL(HOST + ENDPOINT), "apache", "store", true);
-        loginContext1.addGatewayRepository(new URL(HOST + ENDPOINT), "apache", "gateway", true);
+        loginContext1.addTargetRepository(new URL(HOST + ENDPOINT), "apache", "gateway", true);
         m_repositoryAdmin.login(loginContext1);
 
         assert !m_repositoryAdmin.isCurrent() : "When first logging in without checking out, the repository cannot be current.";
@@ -428,7 +428,7 @@ public class RepositoryAdminTest extends
 
         final RepositoryAdminLoginContext loginContext2 = m_repositoryAdmin.createLoginContext(user2);
         loginContext2.addShopRepository(new URL(HOST + ENDPOINT), "apache", "store", true);
-        loginContext2.addGatewayRepository(new URL(HOST + ENDPOINT), "apache", "gateway", true);
+        loginContext2.addTargetRepository(new URL(HOST + ENDPOINT), "apache", "gateway", true);
 
         runAndWaitForEvent(new Callable<Object>() {
             public Object call() throws Exception {
@@ -529,7 +529,7 @@ public class RepositoryAdminTest extends
 
         RepositoryAdminLoginContext loginContext = m_repositoryAdmin.createLoginContext(user);
         loginContext.addShopRepository(new URL(HOST + ENDPOINT), "apache", "store", true);
-        loginContext.addGatewayRepository(new URL(HOST + ENDPOINT), "apache", "gateway", true);
+        loginContext.addTargetRepository(new URL(HOST + ENDPOINT), "apache", "gateway", true);
         loginContext.addDeploymentRepository(new URL(HOST + ENDPOINT), "apache", "deployment", true);
         m_repositoryAdmin.login(loginContext);
 
@@ -538,9 +538,9 @@ public class RepositoryAdminTest extends
                 createBasicGatewayObject("testAutoApproveGateway");
                 return null;
             }
-        }, false, GatewayObject.TOPIC_ADDED, TOPIC_ADDED);
+        }, false, TargetObject.TOPIC_ADDED, TOPIC_ADDED);
 
-        final StatefulGatewayObject sgo = m_statefulGatewayRepository.get(m_bundleContext.createFilter("(" + GatewayObject.KEY_ID + "=" + "testAutoApproveGateway)")).get(0);
+        final StatefulTargetObject sgo = m_statefulGatewayRepository.get(m_bundleContext.createFilter("(" + TargetObject.KEY_ID + "=" + "testAutoApproveGateway)")).get(0);
 
         // Set up some deployment information for the gateway.
         final GroupObject g = runAndWaitForEvent(new Callable<GroupObject>() {
@@ -611,7 +611,7 @@ public class RepositoryAdminTest extends
 
         RepositoryAdminLoginContext loginContext = m_repositoryAdmin.createLoginContext(user);
         loginContext.addShopRepository(new URL(HOST + ENDPOINT), "apache", "store", true);
-        loginContext.addGatewayRepository(new URL(HOST + ENDPOINT), "apache", "gateway", true);
+        loginContext.addTargetRepository(new URL(HOST + ENDPOINT), "apache", "gateway", true);
         loginContext.addDeploymentRepository(new URL(HOST + ENDPOINT), "apache", "deployment", true);
         m_repositoryAdmin.login(loginContext);
 
@@ -643,15 +643,15 @@ public class RepositoryAdminTest extends
 
         // register gateway with
         final Map<String, String> attr = new HashMap<String, String>();
-        attr.put(GatewayObject.KEY_ID, "a_gateway");
-        attr.put(GatewayObject.KEY_AUTO_APPROVE, String.valueOf(true));
+        attr.put(TargetObject.KEY_ID, "a_gateway");
+        attr.put(TargetObject.KEY_AUTO_APPROVE, String.valueOf(true));
         final Map<String, String> tags = new HashMap<String, String>();
 
-        final StatefulGatewayObject sgo = runAndWaitForEvent(new Callable<StatefulGatewayObject>() {
-            public StatefulGatewayObject call() throws Exception {
+        final StatefulTargetObject sgo = runAndWaitForEvent(new Callable<StatefulTargetObject>() {
+            public StatefulTargetObject call() throws Exception {
                 return m_statefulGatewayRepository.preregister(attr, tags);
             }
-        }, false, GatewayObject.TOPIC_ADDED, TOPIC_ADDED);
+        }, false, TargetObject.TOPIC_ADDED, TOPIC_ADDED);
 
         assert m_gatewayRepository.get().size() == 1 : "We expect to find exactly one gateway in the repository, but we find " + m_gatewayRepository.get().size();
         assert m_statefulGatewayRepository.get().size() == 1 : "We expect to find exactly one stateful gateway in the repository, but we find " + m_statefulGatewayRepository.get().size();
@@ -668,12 +668,12 @@ public class RepositoryAdminTest extends
                 m_statefulGatewayRepository.unregister(sgo.getID());
                 return null;
             }
-        }, false, GatewayObject.TOPIC_REMOVED, TOPIC_REMOVED);
+        }, false, TargetObject.TOPIC_REMOVED, TOPIC_REMOVED);
     }
 
     private void testStatefulCreateRemove() throws Exception {
         final Map<String, String> attr = new HashMap<String, String>();
-        attr.put(GatewayObject.KEY_ID, "myNewGateway1");
+        attr.put(TargetObject.KEY_ID, "myNewGateway1");
         final Map<String, String> tags = new HashMap<String, String>();
 
         try {
@@ -684,11 +684,11 @@ public class RepositoryAdminTest extends
             // expected
         }
 
-        final StatefulGatewayObject sgo = runAndWaitForEvent(new Callable<StatefulGatewayObject>() {
-            public StatefulGatewayObject call() throws Exception {
+        final StatefulTargetObject sgo = runAndWaitForEvent(new Callable<StatefulTargetObject>() {
+            public StatefulTargetObject call() throws Exception {
                 return m_statefulGatewayRepository.preregister(attr, tags);
             }
-        }, false, GatewayObject.TOPIC_ADDED, TOPIC_ADDED);
+        }, false, TargetObject.TOPIC_ADDED, TOPIC_ADDED);
 
         assert m_gatewayRepository.get().size() == 1 : "We expect to find exactly one gateway in the repository, but we find " + m_gatewayRepository.get().size();
         assert m_statefulGatewayRepository.get().size() == 1 : "We expect to find exactly one stateful gateway in the repository, but we find " + m_statefulGatewayRepository.get().size();
@@ -709,7 +709,7 @@ public class RepositoryAdminTest extends
                 m_statefulGatewayRepository.unregister(sgo.getID());
                 return null;
             }
-        }, false, GatewayObject.TOPIC_REMOVED, TOPIC_REMOVED);
+        }, false, TargetObject.TOPIC_REMOVED, TOPIC_REMOVED);
 
         assert m_gatewayRepository.get().size() == 0 : "We expect to find no gateway in the repository, but we find " + m_gatewayRepository.get().size();
         assert m_statefulGatewayRepository.get().size() == 0 : "We expect to find no stateful gateway in the repository, but we find " + m_statefulGatewayRepository.get().size();
@@ -717,13 +717,13 @@ public class RepositoryAdminTest extends
 
     private void testStatefulApprove() throws Exception {
         final Map<String, String> attr = new HashMap<String, String>();
-        attr.put(GatewayObject.KEY_ID, "myNewGateway2");
+        attr.put(TargetObject.KEY_ID, "myNewGateway2");
         final Map<String, String> tags = new HashMap<String, String>();
-        final StatefulGatewayObject sgo = runAndWaitForEvent(new Callable<StatefulGatewayObject>() {
-            public StatefulGatewayObject call() throws Exception {
+        final StatefulTargetObject sgo = runAndWaitForEvent(new Callable<StatefulTargetObject>() {
+            public StatefulTargetObject call() throws Exception {
                 return m_statefulGatewayRepository.preregister(attr, tags);
             }
-        }, false, GatewayObject.TOPIC_ADDED, TOPIC_ADDED);
+        }, false, TargetObject.TOPIC_ADDED, TOPIC_ADDED);
 
         assert !sgo.needsApprove() : "Without any deployment versions, and no information in the shop, we should not need to approve.";
         assert sgo.getRegistrationState().equals(RegistrationState.Registered) : "We expect the registration state to be Registered, but it is " + sgo.getRegistrationState();
@@ -805,7 +805,7 @@ public class RepositoryAdminTest extends
                 m_statefulGatewayRepository.unregister(sgo.getID());
                 return null;
             }
-        }, false, GatewayObject.TOPIC_REMOVED, TOPIC_REMOVED);
+        }, false, TargetObject.TOPIC_REMOVED, TOPIC_REMOVED);
 
         assert m_statefulGatewayRepository.get().size() == 0;
     }
@@ -823,7 +823,7 @@ public class RepositoryAdminTest extends
         int sgrSizeBefore = m_statefulGatewayRepository.get().size();
         m_statefulGatewayRepository.refresh();
         assert m_statefulGatewayRepository.get().size() == sgrSizeBefore + 1 : "After refresh, we expect " + (sgrSizeBefore + 1) + " gateway based on auditlogdata, but we find " + m_statefulGatewayRepository.get().size();
-        StatefulGatewayObject sgo = findStatefulGateway(":)");
+        StatefulTargetObject sgo = findStatefulGateway(":)");
         sgo.register();
         assert sgo.getRegistrationState().equals(RegistrationState.Registered) : "After registring our gateway, we assume it to be registered.";
         assert sgo.getProvisioningState().equals(ProvisioningState.Idle) : "We expect our object's provisioning state to be Idle, but it is " + m_statefulGatewayRepository.get().get(0).getProvisioningState();
@@ -842,7 +842,7 @@ public class RepositoryAdminTest extends
         assert m_statefulGatewayRepository.get().size() == 0 : "Before audit log refresh, we expect nothing in the stateful repository, but we find " + m_statefulGatewayRepository.get().size();
         m_statefulGatewayRepository.refresh();
         assert m_statefulGatewayRepository.get().size() == 1 : "After refresh, we expect 1 gateway based on auditlogdata, but we find " + m_statefulGatewayRepository.get().size();
-        StatefulGatewayObject sgo = m_statefulGatewayRepository.get().get(0);
+        StatefulTargetObject sgo = m_statefulGatewayRepository.get().get(0);
         assert sgo.getProvisioningState().equals(ProvisioningState.Idle) : "We expect our object's provisioning state to be Idle, but it is " + m_statefulGatewayRepository.get().get(0).getProvisioningState();
 
         //fill auditlog with complete-data
@@ -907,14 +907,14 @@ public class RepositoryAdminTest extends
     private void testStatefulAuditAndRegister() throws Exception {
         //preregister gateway
         final Map<String, String> attr = new HashMap<String, String>();
-        attr.put(GatewayObject.KEY_ID, "myNewGateway3");
+        attr.put(TargetObject.KEY_ID, "myNewGateway3");
         final Map<String, String> tags = new HashMap<String, String>();
 
-        final StatefulGatewayObject sgo1 = runAndWaitForEvent(new Callable<StatefulGatewayObject>() {
-            public StatefulGatewayObject call() throws Exception {
+        final StatefulTargetObject sgo1 = runAndWaitForEvent(new Callable<StatefulTargetObject>() {
+            public StatefulTargetObject call() throws Exception {
                 return m_statefulGatewayRepository.preregister(attr, tags);
             }
-        }, false, GatewayObject.TOPIC_ADDED, TOPIC_ADDED);
+        }, false, TargetObject.TOPIC_ADDED, TOPIC_ADDED);
 
         //do checks
         assert sgo1.isRegistered() : "We just preregistered a gateway, so it should be registered.";
@@ -946,7 +946,7 @@ public class RepositoryAdminTest extends
                 return false;
             }
         }, false, TOPIC_ADDED);
-        final StatefulGatewayObject sgo2 = findStatefulGateway("myNewGateway4");
+        final StatefulTargetObject sgo2 = findStatefulGateway("myNewGateway4");
 
         //do checks
         assert sgo1.isRegistered() : "Adding auditlog data for a gateway does not influence its isRegistered().";
@@ -971,7 +971,7 @@ public class RepositoryAdminTest extends
                 m_statefulGatewayRepository.unregister(sgo1.getID());
                 return null;
             }
-        }, false, GatewayObject.TOPIC_REMOVED, TOPIC_STATUS_CHANGED);
+        }, false, TargetObject.TOPIC_REMOVED, TOPIC_STATUS_CHANGED);
 
         //do checks
         assert !sgo1.isRegistered() : "sgo1 is now only found in the auditlog, so it cannot be registered.";
@@ -997,7 +997,7 @@ public class RepositoryAdminTest extends
                 sgo2.register();
                 return null;
             }
-        }, false, GatewayObject.TOPIC_ADDED, TOPIC_STATUS_CHANGED);
+        }, false, TargetObject.TOPIC_ADDED, TOPIC_STATUS_CHANGED);
 
         //do checks
         assert !sgo1.isRegistered() : "sgo1 is now only found in the auditlog, so it cannot be in registered.";
@@ -1030,7 +1030,7 @@ public class RepositoryAdminTest extends
                 sgo1.register();
                 return m_license2gatewayRepository.create(l1, sgo1.getGatewayObject());
             }
-        }, false, License2GatewayAssociation.TOPIC_ADDED, GatewayObject.TOPIC_ADDED, TOPIC_STATUS_CHANGED);
+        }, false, License2GatewayAssociation.TOPIC_ADDED, TargetObject.TOPIC_ADDED, TOPIC_STATUS_CHANGED);
 
         // checks
         nrRegistered = m_statefulGatewayRepository.get(m_bundleContext.createFilter("(" + KEY_REGISTRATION_STATE + "=" + RegistrationState.Registered + ")")).size();
@@ -1040,8 +1040,8 @@ public class RepositoryAdminTest extends
         assert lgw1.isSatisfied() : "Both ends of license - stateful gw should be satisfied.";
     }
 
-    private StatefulGatewayObject findStatefulGateway(String gatewayID) throws InvalidSyntaxException {
-        for (StatefulGatewayObject sgo : m_statefulGatewayRepository.get()) {
+    private StatefulTargetObject findStatefulGateway(String gatewayID) throws InvalidSyntaxException {
+        for (StatefulTargetObject sgo : m_statefulGatewayRepository.get()) {
             if (sgo.getID().equals(gatewayID)) {
                 return sgo;
             }
@@ -1087,9 +1087,9 @@ public class RepositoryAdminTest extends
         LicenseObject l = createBasicLicenseObject("license");
 
         attr = new HashMap<String, String>();
-        attr.put(GatewayObject.KEY_ID, "myGateway");
+        attr.put(TargetObject.KEY_ID, "myGateway");
 
-        StatefulGatewayObject sgo = m_statefulGatewayRepository.preregister(attr, tags);
+        StatefulTargetObject sgo = m_statefulGatewayRepository.preregister(attr, tags);
 
         m_artifact2groupRepository.create(b1, g);
         m_artifact2groupRepository.create(a1, g);
@@ -1223,8 +1223,8 @@ public class RepositoryAdminTest extends
             }, false, RepositoryAdmin.TOPIC_REFRESH);
 
             assert m_statefulGatewayRepository.get().size() == initRepoSize + 1 : "After refresh, we expect 1 gateway based on auditlogdata, but we find " + m_statefulGatewayRepository.get().size();
-            List<StatefulGatewayObject> sgoList = m_statefulGatewayRepository.get(m_bundleContext.createFilter("(id=anotherG*)"));
-            StatefulGatewayObject sgo = sgoList.get(0);
+            List<StatefulTargetObject> sgoList = m_statefulGatewayRepository.get(m_bundleContext.createFilter("(id=anotherG*)"));
+            StatefulTargetObject sgo = sgoList.get(0);
             assert sgo != null : "Expected one (anotherGateway) in the list.";
 
             // should be registered and auto approved
@@ -1388,7 +1388,7 @@ public class RepositoryAdminTest extends
 
         final RepositoryAdminLoginContext loginContext1 = m_repositoryAdmin.createLoginContext(user1);
         loginContext1.addShopRepository(new URL(HOST + ENDPOINT), "apache", "store", true);
-        loginContext1.addGatewayRepository(new URL(HOST + ENDPOINT), "apache", "gateway", true);
+        loginContext1.addTargetRepository(new URL(HOST + ENDPOINT), "apache", "gateway", true);
         m_repositoryAdmin.login(loginContext1);
 
         GroupObject g1 = createBasicGroupObject("group1");
@@ -1423,7 +1423,7 @@ public class RepositoryAdminTest extends
 
         final RepositoryAdminLoginContext loginContext1 = m_repositoryAdmin.createLoginContext(user1);
         loginContext1.addShopRepository(new URL(HOST + ENDPOINT), "apache", "store", true);
-        loginContext1.addGatewayRepository(new URL(HOST + ENDPOINT), "apache", "gateway", false);
+        loginContext1.addTargetRepository(new URL(HOST + ENDPOINT), "apache", "gateway", false);
         m_repositoryAdmin.login(loginContext1);
 
         m_repositoryAdmin.checkout();
@@ -1520,7 +1520,7 @@ public class RepositoryAdminTest extends
                 ArtifactObject a1 = createBasicArtifactObject("myArtifact", "mymime", "myProcessor.pid");
                 GroupObject go = createBasicGroupObject("mygroup");
                 LicenseObject lo = createBasicLicenseObject("mylicense");
-                GatewayObject gwo = createBasicGatewayObject("templategateway");
+                TargetObject gwo = createBasicGatewayObject("templategateway");
                 m_artifact2groupRepository.create(b1, go);
                 // note that we do not associate b2: this is a resource processor, so it will be packed
                 // implicitly. It should not be available to a preprocessor either.
@@ -1531,7 +1531,7 @@ public class RepositoryAdminTest extends
             }
         }, false, TOPIC_ADDED);
 
-        StatefulGatewayObject sgo = m_statefulGatewayRepository.get(m_bundleContext.createFilter("(" + GatewayObject.KEY_ID + "=templategateway)")).get(0);
+        StatefulTargetObject sgo = m_statefulGatewayRepository.get(m_bundleContext.createFilter("(" + TargetObject.KEY_ID + "=templategateway)")).get(0);
 
         // wait until needsApprove is true; depending on timing, this could have happened before or after the TOPIC_ADDED.
         int attempts = 0;
@@ -1582,7 +1582,7 @@ public class RepositoryAdminTest extends
                 ArtifactObject b2 = createBasicBundleObject("myProcessor", "1.0.0", "org.osgi.deployment.rp.autoconf");
                 GroupObject go = createBasicGroupObject("mygroup");
                 LicenseObject lo = createBasicLicenseObject("mylicense");
-                GatewayObject gwo = createBasicGatewayObject("templategateway2");
+                TargetObject gwo = createBasicGatewayObject("templategateway2");
                 m_artifact2groupRepository.create(b1, go);
                 // note that we do not associate b2: this is a resource processor, so it will be packed
                 // implicitly. It should not be available to a preprocessor either.
@@ -1595,7 +1595,7 @@ public class RepositoryAdminTest extends
         ArtifactObject a1 = m_artifactRepository.importArtifact(noTemplateFile.toURI().toURL(), true);
         Artifact2GroupAssociation a2g = m_artifact2groupRepository.create(a1, go);
 
-        final StatefulGatewayObject sgo = m_statefulGatewayRepository.get(m_bundleContext.createFilter("(" + GatewayObject.KEY_ID + "=templategateway2)")).get(0);
+        final StatefulTargetObject sgo = m_statefulGatewayRepository.get(m_bundleContext.createFilter("(" + TargetObject.KEY_ID + "=templategateway2)")).get(0);
 
         // create a deploymentversion
         assert sgo.needsApprove() : "With the new assignments, the SGO should need approval.";
@@ -1764,9 +1764,9 @@ public class RepositoryAdminTest extends
         return m_licenseRepository.create(attr, tags);
     }
 
-    private GatewayObject createBasicGatewayObject(String id) {
+    private TargetObject createBasicGatewayObject(String id) {
         Map<String, String> attr = new HashMap<String, String>();
-        attr.put(GatewayObject.KEY_ID, id);
+        attr.put(TargetObject.KEY_ID, id);
         Map<String, String> tags = new HashMap<String, String>();
 
         return m_gatewayRepository.create(attr, tags);

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/AssemblyConfigureTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/AssemblyConfigureTest.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/AssemblyConfigureTest.java (original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/AssemblyConfigureTest.java Fri Mar 16 08:58:19 2012
@@ -32,6 +32,6 @@ public class AssemblyConfigureTest
     {
         System.setProperty( "java.protocol.handler.pkgs", "org.ops4j.pax.url" );
         // TODO avoid to use hard coded version
-        Option[] options = AssemblyConfigure.get( "ace-gateway","mvn:org.apache.ace/org.apache.ace.target.devgateway/0.8.1-incubator-SNAPSHOT/zip/distribution" );
+        Option[] options = AssemblyConfigure.get( "ace-gateway","mvn:org.apache.ace/org.apache.ace.target.devgateway/0.8.1-SNAPSHOT/zip/distribution" );
     }
 }

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/MinimalGatewayTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/MinimalGatewayTest.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/MinimalGatewayTest.java (original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/MinimalGatewayTest.java Fri Mar 16 08:58:19 2012
@@ -52,7 +52,7 @@ public class MinimalGatewayTest
                 felix().version( "3.0.2" )
             ),
             // TODO avoid to use hard coded version
-            AssemblyConfigure.get( "ace-gateway", "mvn:org.apache.ace/org.apache.ace.target.devgateway/0.8.1-incubator-SNAPSHOT/zip/distribution" )
+            AssemblyConfigure.get( "ace-gateway", "mvn:org.apache.ace/org.apache.ace.target.devgateway/0.8.1-SNAPSHOT/zip/distribution" )
 
         );
     }

Modified: ace/trunk/ace-karaf-features/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-karaf-features/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-karaf-features/pom.xml (original)
+++ ace/trunk/ace-karaf-features/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
@@ -34,9 +34,9 @@
     <name>Apache ACE :: Karaf Features</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-karaf-features</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-karaf-features</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-karaf-features</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-karaf-features</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-karaf-features</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-karaf-features</url>
     </scm>
 
     <build>
@@ -86,4 +86,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-launcher/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-launcher/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-launcher/pom.xml (original)
+++ ace/trunk/ace-launcher/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,20 +24,20 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.ace.launcher</artifactId>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <name>Apache ACE :: Launcher</name>
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-launcher</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-launcher</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-launcher</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-launcher</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-launcher</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-launcher</url>
     </scm>
 
     <build>

Modified: ace/trunk/ace-location-upnp/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-location-upnp/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-location-upnp/pom.xml (original)
+++ ace/trunk/ace-location-upnp/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.location.upnp</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-location-upnp</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-location-upnp</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-location-upnp</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-location-upnp</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-location-upnp</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-location-upnp</url>
     </scm>
 
     <properties>
@@ -76,4 +76,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-location-upnp/src/main/java/org/apache/ace/location/upnp/ProvisioningDevice.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-location-upnp/src/main/java/org/apache/ace/location/upnp/ProvisioningDevice.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-location-upnp/src/main/java/org/apache/ace/location/upnp/ProvisioningDevice.java (original)
+++ ace/trunk/ace-location-upnp/src/main/java/org/apache/ace/location/upnp/ProvisioningDevice.java Fri Mar 16 08:58:19 2012
@@ -81,11 +81,11 @@ public class ProvisioningDevice extends 
 
 		m_properties.put(UPnPDevice.FRIENDLY_NAME,"UPnP Provisioning Device");
 		m_properties.put(UPnPDevice.MANUFACTURER,"Apache ACE");
-		m_properties.put(UPnPDevice.MANUFACTURER_URL,"http://incubator.apache.org/ace/");
+		m_properties.put(UPnPDevice.MANUFACTURER_URL,"http://ace.apache.org/");
 		m_properties.put(UPnPDevice.MODEL_DESCRIPTION,"A device that is automagically locatable by targets.");
 		m_properties.put(UPnPDevice.MODEL_NAME,"Apache ACE Device");
 		m_properties.put(UPnPDevice.MODEL_NUMBER,"1.0");
-		m_properties.put(UPnPDevice.MODEL_URL,"http://incubator.apache/org/ace/upnp-models/");
+		m_properties.put(UPnPDevice.MODEL_URL,"http://ace.apache.org/upnp-models/");
 
         m_properties.put(UPnPDevice.PRESENTATION_URL, "http://" + m_host + ":" + m_port + BASE_URL);
 		m_properties.put(UPnPDevice.SERIAL_NUMBER,"123456789");

Modified: ace/trunk/ace-log-listener/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-log-listener/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-log-listener/pom.xml (original)
+++ ace/trunk/ace-log-listener/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.log.listener</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-log-listener</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-log-listener</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-log-listener</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-log-listener</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-log-listener</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-log-listener</url>
     </scm>
 
     <properties>
@@ -73,4 +73,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-log-servlet/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-log-servlet/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-log-servlet/pom.xml (original)
+++ ace/trunk/ace-log-servlet/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.log.servlet</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-log-servlet</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-log-servlet</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-log-servlet</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-log-servlet</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-log-servlet</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-log-servlet</url>
     </scm>
 
     <properties>
@@ -92,4 +92,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-log-task/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-log-task/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-log-task/pom.xml (original)
+++ ace/trunk/ace-log-task/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.log.task</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-log-task</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-log-task</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-log-task</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-log-task</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-log-task</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-log-task</url>
     </scm>
 
     <properties>
@@ -88,4 +88,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-log/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-log/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-log/pom.xml (original)
+++ ace/trunk/ace-log/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.log</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-log</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-log</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-log</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-log</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-log</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-log</url>
     </scm>
     
     <properties>
@@ -66,4 +66,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-managementagent/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-managementagent/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-managementagent/pom.xml (original)
+++ ace/trunk/ace-managementagent/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.managementagent</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-managementagent</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-managementagent</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-managementagent</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-managementagent</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-managementagent</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-managementagent</url>
     </scm>
 
     <properties>
@@ -155,4 +155,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-nodelauncher-amazon/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-nodelauncher-amazon/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-nodelauncher-amazon/pom.xml (original)
+++ ace/trunk/ace-nodelauncher-amazon/pom.xml Fri Mar 16 08:58:19 2012
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.nodelauncher.amazon</artifactId>
     <packaging>bundle</packaging>
 
@@ -37,10 +37,10 @@
     <description/>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-nodelauncher-amazon</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-nodelauncher-amazon
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-nodelauncher-amazon</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-nodelauncher-amazon
         </developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-nodelauncher-amazon</url>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-nodelauncher-amazon</url>
     </scm>
 
     <properties>
@@ -118,4 +118,4 @@
             <artifactId>org.apache.ace.util</artifactId>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-nodelauncher-api/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-nodelauncher-api/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-nodelauncher-api/pom.xml (original)
+++ ace/trunk/ace-nodelauncher-api/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.nodelauncher.api</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-nodelauncher-api</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-nodelauncher-api</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-nodelauncher-api</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-nodelauncher-api</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-nodelauncher-api</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-nodelauncher-api</url>
     </scm>
 
     <properties>
@@ -50,4 +50,4 @@
         </import.package>
     </properties>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-nodelauncher-ui/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-nodelauncher-ui/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-nodelauncher-ui/pom.xml (original)
+++ ace/trunk/ace-nodelauncher-ui/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.nodelauncher.ui</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-nodelauncher-ui</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-nodelauncher-ui</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-nodelauncher-ui</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-nodelauncher-ui</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-nodelauncher-ui</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-nodelauncher-ui</url>
     </scm>
 
     <properties>
@@ -81,4 +81,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-nodelauncher-ui/src/main/java/org/apache/ace/nodelauncher/ui/NodeLauncherPanelFactory.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-nodelauncher-ui/src/main/java/org/apache/ace/nodelauncher/ui/NodeLauncherPanelFactory.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-nodelauncher-ui/src/main/java/org/apache/ace/nodelauncher/ui/NodeLauncherPanelFactory.java (original)
+++ ace/trunk/ace-nodelauncher-ui/src/main/java/org/apache/ace/nodelauncher/ui/NodeLauncherPanelFactory.java Fri Mar 16 08:58:19 2012
@@ -23,7 +23,7 @@ import java.util.concurrent.ExecutorServ
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import org.apache.ace.client.repository.stateful.StatefulGatewayObject;
+import org.apache.ace.client.repository.stateful.StatefulTargetObject;
 import org.apache.ace.nodelauncher.NodeLauncher;
 import org.apache.ace.webui.NamedObject;
 import org.apache.ace.webui.UIExtensionFactory;
@@ -39,7 +39,7 @@ public class NodeLauncherPanelFactory im
     
     public Panel create(Map<String, Object> context) {
         NamedObject namedObject = (NamedObject) context.get("object");
-        StatefulGatewayObject target = (StatefulGatewayObject) namedObject.getObject();
+        StatefulTargetObject target = (StatefulTargetObject) namedObject.getObject();
         return new NodePanel(this, target.getID());
     }
     

Modified: ace/trunk/ace-obr-metadata/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-obr-metadata/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-obr-metadata/pom.xml (original)
+++ ace/trunk/ace-obr-metadata/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.obr.metadata</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-obr-metadata</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-obr-metadata</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-obr-metadata</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-obr-metadata</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-obr-metadata</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-obr-metadata</url>
     </scm>
 
     <properties>
@@ -91,4 +91,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-obr-servlet/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-obr-servlet/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-obr-servlet/pom.xml (original)
+++ ace/trunk/ace-obr-servlet/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.obr.servlet</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-obr-servlet</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-obr-servlet</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-obr-servlet</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-obr-servlet</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-obr-servlet</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-obr-servlet</url>
     </scm>
 
     <properties>
@@ -85,4 +85,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-obr-storage/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-obr-storage/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-obr-storage/pom.xml (original)
+++ ace/trunk/ace-obr-storage/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.obr.storage</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-obr-storage</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-obr-storage</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-obr-storage</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-obr-storage</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-obr-storage</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-obr-storage</url>
     </scm>
 
     <properties>
@@ -88,4 +88,4 @@
             <version>2.0.1</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-range-api/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-range-api/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-range-api/pom.xml (original)
+++ ace/trunk/ace-range-api/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,18 +24,18 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.range.api</artifactId>
     <packaging>bundle</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-range-api</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-range-api</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-range-api</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-range-api</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-range-api</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-range-api</url>
     </scm>
 
     <name>Apache ACE :: Range :: API</name>
@@ -57,4 +57,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-repository-api/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-repository-api/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-repository-api/pom.xml (original)
+++ ace/trunk/ace-repository-api/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,21 +24,21 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.ace.repository.api</artifactId>
     <packaging>bundle</packaging>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <name>Apache ACE :: Repository :: API</name>
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-repository-api</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-repository-api</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-repository-api</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-repository-api</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-repository-api</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-repository-api</url>
     </scm>
 
     <properties>
@@ -62,4 +62,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-repository-ext/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-repository-ext/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-repository-ext/pom.xml (original)
+++ ace/trunk/ace-repository-ext/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,19 +24,19 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.repository.ext</artifactId>
     <name>Apache ACE :: Repository :: Extensions</name>
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-repository-ext</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-repository-ext</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-repository-ext</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-repository-ext</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-repository-ext</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-repository-ext</url>
     </scm>
 
     <dependencies>
@@ -66,4 +66,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-repository-impl/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-repository-impl/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-repository-impl/pom.xml (original)
+++ ace/trunk/ace-repository-impl/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.repository.impl</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-repository-impl</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-repository-impl</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-repository-impl</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-repository-impl</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-repository-impl</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-repository-impl</url>
     </scm>
 
     <properties>
@@ -91,4 +91,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-repository-servlet/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-repository-servlet/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-repository-servlet/pom.xml (original)
+++ ace/trunk/ace-repository-servlet/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.repository.servlet</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-repository-servlet</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-repository-servlet</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-repository-servlet</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-repository-servlet</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-repository-servlet</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-repository-servlet</url>
     </scm>
 
     <properties>
@@ -83,4 +83,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-repository-task/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-repository-task/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-repository-task/pom.xml (original)
+++ ace/trunk/ace-repository-task/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.repository.task</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-repository-task</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-repository-task</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-repository-task</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-repository-task</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-repository-task</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-repository-task</url>
     </scm>
 
     <properties>
@@ -88,4 +88,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-resourceprocessor-useradmin/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-resourceprocessor-useradmin/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-resourceprocessor-useradmin/pom.xml (original)
+++ ace/trunk/ace-resourceprocessor-useradmin/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,21 +24,21 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.ace.resourceprocessor.useradmin</artifactId>
     <packaging>bundle</packaging>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <name>Apache ACE :: Resourceprocessor :: UserAdmin</name>
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-resourceprocessor-useradmin</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-resourceprocessor-useradmin</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-resourceprocessor-useradmin</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-resourceprocessor-useradmin</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-resourceprocessor-useradmin</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-resourceprocessor-useradmin</url>
     </scm>
 
     <properties>
@@ -75,4 +75,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-scheduler-api/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-scheduler-api/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-scheduler-api/pom.xml (original)
+++ ace/trunk/ace-scheduler-api/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.scheduler.api</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-scheduler-api</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-scheduler-api</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-scheduler-api</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-scheduler-api</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-scheduler-api</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-scheduler-api</url>
     </scm>
 
     <properties>
@@ -50,4 +50,4 @@
         </import.package>
     </properties>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-scheduler/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-scheduler/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-scheduler/pom.xml (original)
+++ ace/trunk/ace-scheduler/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.scheduler</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-scheduler</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-scheduler</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-scheduler</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-scheduler</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-scheduler</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-scheduler</url>
     </scm>
 
     <properties>
@@ -77,4 +77,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-server-action-popupmessage/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-server-action-popupmessage/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-server-action-popupmessage/pom.xml (original)
+++ ace/trunk/ace-server-action-popupmessage/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.server.action.popupmessage</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-server-action-popupmessage</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-server-action-popupmessage</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-server-action-popupmessage</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-server-action-popupmessage</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-server-action-popupmessage</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-server-action-popupmessage</url>
     </scm>
 
     <properties>
@@ -74,4 +74,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-server-action/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-server-action/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-server-action/pom.xml (original)
+++ ace/trunk/ace-server-action/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.server.action</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-server-action</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-server-action</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-server-action</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-server-action</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-server-action</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-server-action</url>
     </scm>
 
     <properties>
@@ -58,4 +58,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-server-log-store/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-server-log-store/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-server-log-store/pom.xml (original)
+++ ace/trunk/ace-server-log-store/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.server.log.store</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-server-log-store</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-server-log-store</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-server-log-store</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-server-log-store</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-server-log-store</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-server-log-store</url>
     </scm>
 
     <properties>
@@ -82,4 +82,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-server-log-ui/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-server-log-ui/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-server-log-ui/pom.xml (original)
+++ ace/trunk/ace-server-log-ui/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.server.log.ui</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-server-log-ui</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-server-log-ui</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-server-log-ui</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-server-log-ui</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-server-log-ui</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-server-log-ui</url>
     </scm>
 
    <properties>

Modified: ace/trunk/ace-server-log-ui/src/main/java/org/apache/ace/server/log/ui/LogViewerExtension.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-server-log-ui/src/main/java/org/apache/ace/server/log/ui/LogViewerExtension.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-server-log-ui/src/main/java/org/apache/ace/server/log/ui/LogViewerExtension.java (original)
+++ ace/trunk/ace-server-log-ui/src/main/java/org/apache/ace/server/log/ui/LogViewerExtension.java Fri Mar 16 08:58:19 2012
@@ -29,8 +29,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ace.client.repository.RepositoryObject;
-import org.apache.ace.client.repository.object.GatewayObject;
-import org.apache.ace.client.repository.stateful.StatefulGatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
+import org.apache.ace.client.repository.stateful.StatefulTargetObject;
 import org.apache.ace.log.AuditEvent;
 import org.apache.ace.log.LogDescriptor;
 import org.apache.ace.log.LogEvent;
@@ -69,7 +69,7 @@ public class LogViewerExtension implemen
      */
     public Component create(Map<String, Object> context) {
         RepositoryObject object = getRepositoryObjectFromContext(context);
-        if (object instanceof StatefulGatewayObject && !((StatefulGatewayObject) object).isRegistered()) {
+        if (object instanceof StatefulTargetObject && !((StatefulTargetObject) object).isRegistered()) {
             VerticalLayout result = new VerticalLayout();
             result.setCaption(CAPTION);
             result.addComponent(new Label("This target is not yet registered, so it has no log."));
@@ -101,7 +101,7 @@ public class LogViewerExtension implemen
      * @throws IOException in case of I/O problems accessing the log store.
      */
     private void fillTable(RepositoryObject object, Table table) throws IOException {
-        String id = object.getAttribute(GatewayObject.KEY_ID);
+        String id = object.getAttribute(TargetObject.KEY_ID);
         List<LogDescriptor> desc = m_store.getDescriptors(id);
         if (desc != null) {
             for (LogDescriptor log : desc) {

Modified: ace/trunk/ace-tageditor/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-tageditor/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-tageditor/pom.xml (original)
+++ ace/trunk/ace-tageditor/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.tageditor</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-tageditor</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-tageditor</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-tageditor</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-tageditor</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-tageditor</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-tageditor</url>
     </scm>
 
     <properties>

Modified: ace/trunk/ace-tageditor/src/main/java/org/apache/ace/tageditor/ACETagEditorExtension.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-tageditor/src/main/java/org/apache/ace/tageditor/ACETagEditorExtension.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-tageditor/src/main/java/org/apache/ace/tageditor/ACETagEditorExtension.java (original)
+++ ace/trunk/ace-tageditor/src/main/java/org/apache/ace/tageditor/ACETagEditorExtension.java Fri Mar 16 08:58:19 2012
@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.ace.client.repository.RepositoryObject;
-import org.apache.ace.client.repository.stateful.StatefulGatewayObject;
+import org.apache.ace.client.repository.stateful.StatefulTargetObject;
 import org.apache.ace.webui.NamedObject;
 import org.apache.ace.webui.UIExtensionFactory;
 
@@ -41,8 +41,8 @@ public class ACETagEditorExtension imple
         final RepositoryObject sgo = getRepositoryObjectFromContext(context);
         VerticalLayout result = new VerticalLayout();
         result.setCaption("Tag Editor");
-        if (sgo instanceof StatefulGatewayObject) {
-            StatefulGatewayObject statefulTarget = (StatefulGatewayObject) sgo;
+        if (sgo instanceof StatefulTargetObject) {
+            StatefulTargetObject statefulTarget = (StatefulTargetObject) sgo;
             if (statefulTarget.isRegistered()) {
                 final Table table = new Table();
                 table.setWidth("100%");

Modified: ace/trunk/ace-target-defaults/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-target-defaults/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-target-defaults/pom.xml (original)
+++ ace/trunk/ace-target-defaults/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,20 +24,20 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.target.defaults</artifactId>
 
     <name>Apache ACE :: Target :: Defaults</name>
     <description>Holds descriptors for certain ace launch configurations.</description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-target-defaults</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-target-defaults</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-target-defaults</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-target-defaults</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-target-defaults</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-target-defaults</url>
     </scm>
 
     <build>
@@ -49,4 +49,4 @@
         </resources>
     </build>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-target-devgateway/DISCLAIMER
URL: http://svn.apache.org/viewvc/ace/trunk/ace-target-devgateway/DISCLAIMER?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-target-devgateway/DISCLAIMER (original)
+++ ace/trunk/ace-target-devgateway/DISCLAIMER Fri Mar 16 08:58:19 2012
@@ -1,9 +0,0 @@
-Apache ACE is an effort undergoing incubation at The Apache
-Software Foundation (ASF), sponsored by the Apache Incubator.
-Incubation is required of all newly accepted projects until
-a further review indicates that the infrastructure,
-communications, and decision make progress have stabilized
-in a manner consistent with other successful ASF projects.
-While incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the
-project has yet to be fully endorsed by the ASF.
\ No newline at end of file

Modified: ace/trunk/ace-target-devgateway/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-target-devgateway/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-target-devgateway/pom.xml (original)
+++ ace/trunk/ace-target-devgateway/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,10 +24,10 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.target.devgateway</artifactId>
     <packaging>pom</packaging>
 
@@ -35,9 +35,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-target-devgateway</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-target-devgateway</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-target-devgateway</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-target-devgateway</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-target-devgateway</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-target-devgateway</url>
     </scm>
 
     <build>

Modified: ace/trunk/ace-target-devserver/DISCLAIMER
URL: http://svn.apache.org/viewvc/ace/trunk/ace-target-devserver/DISCLAIMER?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-target-devserver/DISCLAIMER (original)
+++ ace/trunk/ace-target-devserver/DISCLAIMER Fri Mar 16 08:58:19 2012
@@ -1,9 +0,0 @@
-Apache ACE is an effort undergoing incubation at The Apache
-Software Foundation (ASF), sponsored by the Apache Incubator.
-Incubation is required of all newly accepted projects until
-a further review indicates that the infrastructure,
-communications, and decision make progress have stabilized
-in a manner consistent with other successful ASF projects.
-While incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the
-project has yet to be fully endorsed by the ASF.
\ No newline at end of file

Modified: ace/trunk/ace-target-devserver/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-target-devserver/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-target-devserver/pom.xml (original)
+++ ace/trunk/ace-target-devserver/pom.xml Fri Mar 16 08:58:19 2012
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.target.devserver</artifactId>
     <packaging>pom</packaging>
 
@@ -37,10 +37,10 @@
     <description/>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-target-devserver</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-target-devserver
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-target-devserver</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-target-devserver
         </developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-target-devserver</url>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-target-devserver</url>
     </scm>
 
     <build>

Modified: ace/trunk/ace-target-mgmt-ui/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-target-mgmt-ui/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-target-mgmt-ui/pom.xml (original)
+++ ace/trunk/ace-target-mgmt-ui/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.target.mgmt.ui</artifactId>
     <packaging>bundle</packaging>
 

Modified: ace/trunk/ace-target-mgmt-ui/src/main/java/org/apache/ace/target/management/ui/TargetManagementExtension.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-target-mgmt-ui/src/main/java/org/apache/ace/target/management/ui/TargetManagementExtension.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-target-mgmt-ui/src/main/java/org/apache/ace/target/management/ui/TargetManagementExtension.java (original)
+++ ace/trunk/ace-target-mgmt-ui/src/main/java/org/apache/ace/target/management/ui/TargetManagementExtension.java Fri Mar 16 08:58:19 2012
@@ -21,7 +21,7 @@ package org.apache.ace.target.management
 import java.util.Map;
 
 import org.apache.ace.client.repository.RepositoryObject;
-import org.apache.ace.client.repository.stateful.StatefulGatewayObject;
+import org.apache.ace.client.repository.stateful.StatefulTargetObject;
 import org.apache.ace.webui.NamedObject;
 import org.apache.ace.webui.UIExtensionFactory;
 
@@ -51,12 +51,12 @@ public class TargetManagementExtension i
         result.setSizeFull();
 
         RepositoryObject object = getRepositoryObjectFromContext(context);
-        if (!(object instanceof StatefulGatewayObject)) {
+        if (!(object instanceof StatefulTargetObject)) {
             result.addComponent(new Label("This target is not a stateful gateway object."));
             return result;
         }
 
-        final StatefulGatewayObject target = (StatefulGatewayObject) object;
+        final StatefulTargetObject target = (StatefulTargetObject) object;
 
         CheckBox registerCB = new CheckBox("Registered?");
         registerCB.setImmediate(true);
@@ -107,7 +107,7 @@ public class TargetManagementExtension i
      * @param target
      * @return
      */
-    private boolean hasUnapprovedChanges(StatefulGatewayObject target) {
+    private boolean hasUnapprovedChanges(StatefulTargetObject target) {
         String availableVersion = target.getCurrentVersion();
         String currentVersion = target.getLastInstallVersion();
         return (availableVersion != null) && !availableVersion.equals(currentVersion);



Mime
View raw message