Return-Path: Delivered-To: apmail-incubator-ace-commits-archive@minotaur.apache.org Received: (qmail 88143 invoked from network); 2 Jul 2009 22:29:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Jul 2009 22:29:07 -0000 Received: (qmail 66253 invoked by uid 500); 2 Jul 2009 22:29:17 -0000 Delivered-To: apmail-incubator-ace-commits-archive@incubator.apache.org Received: (qmail 66238 invoked by uid 500); 2 Jul 2009 22:29:17 -0000 Mailing-List: contact ace-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ace-dev@incubator.apache.org Delivered-To: mailing list ace-commits@incubator.apache.org Received: (qmail 66228 invoked by uid 99); 2 Jul 2009 22:29:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jul 2009 22:29:17 +0000 X-ASF-Spam-Status: No, hits=-1998.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jul 2009 22:29:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1327723888BD; Thu, 2 Jul 2009 22:28:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r790750 - in /incubator/ace/trunk: liq/conf/dev-client/ liq/conf/dev-customlicenseclient/ liq/conf/dev-customlicenseserver/ liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/ liq/conf/dev-relay/org.apache.ace.server.... Date: Thu, 02 Jul 2009 22:28:48 -0000 To: ace-commits@incubator.apache.org From: marrs@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090702222850.1327723888BD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: marrs Date: Thu Jul 2 22:28:47 2009 New Revision: 790750 URL: http://svn.apache.org/viewvc?rev=790750&view=rev Log: ACE-19 Applied Angelo's patch. Modified: incubator/ace/trunk/liq/conf/dev-client/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg incubator/ace/trunk/liq/conf/dev-client/org.apache.ace.swingui.components.Application.cfg incubator/ace/trunk/liq/conf/dev-client/org.apache.ace.swingui.externallicensemanager.cfg incubator/ace/trunk/liq/conf/dev-customlicenseclient/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg incubator/ace/trunk/liq/conf/dev-customlicenseclient/org.apache.ace.swingui.components.Application.cfg incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.client.automation.cfg incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.deployment.provider.repositorybased.cfg incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.licensing.servlet.cfg incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-deployment.cfg incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-gateway.cfg incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-shop.cfg incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-user.cfg incubator/ace/trunk/liq/conf/dev-relay/org.apache.ace.server.repository.factory/luminis-shop.cfg incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.client.automation.cfg incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.deployment.provider.repositorybased.cfg incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.activation.impl.cfg incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-activation.cfg incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-deployment.cfg incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-gateway.cfg incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-shop.cfg incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-user.cfg incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.activation.matcher.cfg incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.client.automation.cfg incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.deployment.provider.repositorybased.cfg incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.activation.impl.cfg incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-activation.cfg incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-activationinfo.cfg incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-deployment.cfg incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-gateway.cfg incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-shop.cfg incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-user.cfg incubator/ace/trunk/test/src/org/apache/ace/test/repository/RepositoryTest.java incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/Activator.java Modified: incubator/ace/trunk/liq/conf/dev-client/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-client/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-client/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-client/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ repositoryLocation = http://localhost:8080/repository -repositoryCustomer = luminis +repositoryCustomer = apache repositoryName = user \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-client/org.apache.ace.swingui.components.Application.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-client/org.apache.ace.swingui.components.Application.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-client/org.apache.ace.swingui.components.Application.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-client/org.apache.ace.swingui.components.Application.cfg Thu Jul 2 22:28:47 2009 @@ -2,7 +2,7 @@ org.apache.ace.swingui.actions.LoginAction.storeRepo = shop org.apache.ace.swingui.actions.LoginAction.deployRepo = deployment org.apache.ace.swingui.actions.LoginAction.userRepo = user -org.apache.ace.swingui.actions.LoginAction.customerName = luminis +org.apache.ace.swingui.actions.LoginAction.customerName = apache org.apache.ace.swingui.actions.LoginAction.host = http://localhost:8080 org.apache.ace.swingui.actions.LoginAction.endpoint = /repository org.apache.ace.swingui.actions.LoginAction.obr = http://localhost:8082/obr/ Modified: incubator/ace/trunk/liq/conf/dev-client/org.apache.ace.swingui.externallicensemanager.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-client/org.apache.ace.swingui.externallicensemanager.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-client/org.apache.ace.swingui.externallicensemanager.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-client/org.apache.ace.swingui.externallicensemanager.cfg Thu Jul 2 22:28:47 2009 @@ -1,5 +1,5 @@ activationRepo = activation activationInfoRepo = activationinfo -customerName = luminis +customerName = apache host = http://localhost:8080 endPoint = /repository \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-customlicenseclient/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-customlicenseclient/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-customlicenseclient/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-customlicenseclient/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ repositoryLocation = http://localhost:8080/repository -repositoryCustomer = luminis +repositoryCustomer = apache repositoryName = user \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-customlicenseclient/org.apache.ace.swingui.components.Application.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-customlicenseclient/org.apache.ace.swingui.components.Application.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-customlicenseclient/org.apache.ace.swingui.components.Application.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-customlicenseclient/org.apache.ace.swingui.components.Application.cfg Thu Jul 2 22:28:47 2009 @@ -2,7 +2,7 @@ org.apache.ace.swingui.actions.LoginAction.storeRepo = shop org.apache.ace.swingui.actions.LoginAction.deployRepo = deployment org.apache.ace.swingui.actions.LoginAction.userRepo = user -org.apache.ace.swingui.actions.LoginAction.customerName = luminis +org.apache.ace.swingui.actions.LoginAction.customerName = apache org.apache.ace.swingui.actions.LoginAction.host = http://localhost:8080 org.apache.ace.swingui.actions.LoginAction.endpoint = /repository org.apache.ace.swingui.actions.LoginAction.obr = http://localhost:8080/obr/ Modified: incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.client.automation.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.client.automation.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.client.automation.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.client.automation.cfg Thu Jul 2 22:28:47 2009 @@ -5,6 +5,6 @@ gatewayRepository = gateway deploymentRepository = deployment storeRepository = shop -customerName = luminis +customerName = apache hostName = http://localhost:8080 endpoint = /repository \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ repositoryLocation = http://localhost:8080/repository -repositoryCustomer = luminis +repositoryCustomer = apache repositoryName = user \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.deployment.provider.repositorybased.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.deployment.provider.repositorybased.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.deployment.provider.repositorybased.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.deployment.provider.repositorybased.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ url=http://localhost:8080/repository name=deployment -customer=luminis +customer=apache Modified: incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.licensing.servlet.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.licensing.servlet.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.licensing.servlet.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.licensing.servlet.cfg Thu Jul 2 22:28:47 2009 @@ -1,5 +1,5 @@ gatewayRepository = gateway storeRepository = shop -customerName = luminis +customerName = apache hostName = http://localhost:8080/repository -org.apache.ace.server.servlet.endpoint = /license +org.apache.ace.server.servlet.endpoint = /license Modified: incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-deployment.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-deployment.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-deployment.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-deployment.cfg Thu Jul 2 22:28:47 2009 @@ -1,5 +1,5 @@ name=deployment -customer=luminis +customer=apache master=true initial= \ \ Modified: incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-gateway.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-gateway.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-gateway.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-gateway.cfg Thu Jul 2 22:28:47 2009 @@ -1,5 +1,5 @@ name=gateway -customer=luminis +customer=apache master=true initial= \ \ Modified: incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-shop.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-shop.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-shop.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-shop.cfg Thu Jul 2 22:28:47 2009 @@ -1,5 +1,5 @@ name=shop -customer=luminis +customer=apache master=true initial= \ \ Modified: incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-user.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-user.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-user.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-customlicenseserver/org.apache.ace.server.repository.factory/luminis-user.cfg Thu Jul 2 22:28:47 2009 @@ -1,5 +1,5 @@ name=user -customer=luminis +customer=apache master=true initial= \ \ Modified: incubator/ace/trunk/liq/conf/dev-relay/org.apache.ace.server.repository.factory/luminis-shop.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-relay/org.apache.ace.server.repository.factory/luminis-shop.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-relay/org.apache.ace.server.repository.factory/luminis-shop.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-relay/org.apache.ace.server.repository.factory/luminis-shop.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ name=shop -customer=luminis +customer=apache master=false \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.client.automation.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.client.automation.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.client.automation.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.client.automation.cfg Thu Jul 2 22:28:47 2009 @@ -5,6 +5,6 @@ gatewayRepository = gateway deploymentRepository = deployment storeRepository = shop -customerName = luminis +customerName = apache hostName = http://localhost:8080 endpoint = /repository \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ repositoryLocation = http://localhost:8080/repository -repositoryCustomer = luminis +repositoryCustomer = apache repositoryName = user \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.deployment.provider.repositorybased.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.deployment.provider.repositorybased.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.deployment.provider.repositorybased.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.deployment.provider.repositorybased.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ url=http://localhost:8080/repository name=deployment -customer=luminis +customer=apache Modified: incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.activation.impl.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.activation.impl.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.activation.impl.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.activation.impl.cfg Thu Jul 2 22:28:47 2009 @@ -5,6 +5,6 @@ gatewayRepository = gateway deploymentRepository = deployment storeRepository = shop -customerName = luminis +customerName = apache hostName = http://localhost:8080 endpoint = /repository \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-activation.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-activation.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-activation.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-activation.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ name=activation -customer=luminis +customer=apache master=true \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-deployment.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-deployment.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-deployment.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-deployment.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ name=deployment -customer=luminis +customer=apache master=true \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-gateway.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-gateway.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-gateway.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-gateway.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ name=gateway -customer=luminis +customer=apache master=true \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-shop.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-shop.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-shop.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-shop.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ name=shop -customer=luminis +customer=apache master=true \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-user.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-user.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-user.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server-upnp/org.apache.ace.server.log.repository.factory/luminis-user.cfg Thu Jul 2 22:28:47 2009 @@ -1,5 +1,5 @@ name=user -customer=luminis +customer=apache master=true initial= \ \ Modified: incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.activation.matcher.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.activation.matcher.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.activation.matcher.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.activation.matcher.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ activationRepository = activation -customerName = luminis +customerName = apache repositoryURL = http://localhost:8080/repository Modified: incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.client.automation.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.client.automation.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.client.automation.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.client.automation.cfg Thu Jul 2 22:28:47 2009 @@ -5,6 +5,6 @@ gatewayRepository = gateway deploymentRepository = deployment storeRepository = shop -customerName = luminis +customerName = apache hostName = http://localhost:8080 endpoint = /repository \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ repositoryLocation = http://localhost:8080/repository -repositoryCustomer = luminis +repositoryCustomer = apache repositoryName = user \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.deployment.provider.repositorybased.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.deployment.provider.repositorybased.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.deployment.provider.repositorybased.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.deployment.provider.repositorybased.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ url=http://localhost:8080/repository name=deployment -customer=luminis +customer=apache Modified: incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.activation.impl.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.activation.impl.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.activation.impl.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.activation.impl.cfg Thu Jul 2 22:28:47 2009 @@ -5,7 +5,7 @@ gatewayRepository = gateway deploymentRepository = deployment storeRepository = shop -customerName = luminis +customerName = apache hostName = http://localhost:8080 endpoint = /repository obrUrl = http://localhost:8082/obr/ Modified: incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-activation.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-activation.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-activation.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-activation.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ name=activation -customer=luminis +customer=apache master=true \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-activationinfo.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-activationinfo.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-activationinfo.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-activationinfo.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ name=activationinfo -customer=luminis +customer=apache master=true \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-deployment.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-deployment.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-deployment.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-deployment.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ name=deployment -customer=luminis +customer=apache master=true \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-gateway.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-gateway.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-gateway.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-gateway.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ name=gateway -customer=luminis +customer=apache master=true \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-shop.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-shop.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-shop.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-shop.cfg Thu Jul 2 22:28:47 2009 @@ -1,3 +1,3 @@ name=shop -customer=luminis +customer=apache master=true \ No newline at end of file Modified: incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-user.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-user.cfg?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-user.cfg (original) +++ incubator/ace/trunk/liq/conf/dev-server/org.apache.ace.server.repository.factory/luminis-user.cfg Thu Jul 2 22:28:47 2009 @@ -1,5 +1,5 @@ name=user -customer=luminis +customer=apache master=true initial= \ \ Modified: incubator/ace/trunk/test/src/org/apache/ace/test/repository/RepositoryTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/repository/RepositoryTest.java?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/test/repository/RepositoryTest.java (original) +++ incubator/ace/trunk/test/src/org/apache/ace/test/repository/RepositoryTest.java Thu Jul 2 22:28:47 2009 @@ -187,27 +187,27 @@ @Test(groups = { INTEGRATION }) public void testCreation() throws Exception { - addRepository("testInstance", "luminis", "test", true); + addRepository("testInstance", "apache", "test", true); ByteArrayOutputStream out = new ByteArrayOutputStream(); int responseCode = query(HOST, "replication/query", null, null, out); assert responseCode == HttpURLConnection.HTTP_OK : "Expected responsecode " + HttpURLConnection.HTTP_OK + " instead of " + responseCode; - assert "luminis,test,\n".equals(out.toString()) : "Expected one repository without any versions as query result instead of : " + out.toString(); + assert "apache,test,\n".equals(out.toString()) : "Expected one repository without any versions as query result instead of : " + out.toString(); - addRepository("testInstance2", "luminis", "test2", true); + addRepository("testInstance2", "apache", "test2", true); out.reset(); responseCode = query(HOST, "replication/query", null, null, out); assert responseCode == HttpURLConnection.HTTP_OK : "Expected responsecode " + HttpURLConnection.HTTP_OK + " instead of " + responseCode; - assert "luminis,test,\nluminis,test2,\n".equals(out.toString()) || - "luminis,test2,\nluminis,test,\n".equals(out.toString()) : "Expected two repositories without any versions as query result instead of : " + out.toString(); + assert "apache,test,\napache,test2,\n".equals(out.toString()) || + "apache,test2,\napache,test,\n".equals(out.toString()) : "Expected two repositories without any versions as query result instead of : " + out.toString(); removeRepository("testInstance2"); out.reset(); responseCode = query(HOST, "replication/query", null, null, out); assert responseCode == HttpURLConnection.HTTP_OK : "Expected responsecode " + HttpURLConnection.HTTP_OK + " instead of " + responseCode; - assert "luminis,test,\n".equals(out.toString()) : "Expected one repository without any versions as query result instead of : " + out.toString(); + assert "apache,test,\n".equals(out.toString()) : "Expected one repository without any versions as query result instead of : " + out.toString(); removeRepository("testInstance"); @@ -219,18 +219,18 @@ @Test(groups = { INTEGRATION }) public void testGetAndPut() throws Exception { - addRepository("testInstance", "luminis", "test", true); + addRepository("testInstance", "apache", "test", true); ByteArrayOutputStream out = new ByteArrayOutputStream(); - int responseCode = get(HOST, "replication/get", "luminis", "test", "1", out); + int responseCode = get(HOST, "replication/get", "apache", "test", "1", out); assert responseCode == HttpURLConnection.HTTP_NOT_FOUND : "Expected responsecode " + HttpURLConnection.HTTP_NOT_FOUND + " instead of " + responseCode; ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream("test".getBytes()); - responseCode = put("replication/put", HOST, "luminis", "test", "1", byteArrayInputStream); + responseCode = put("replication/put", HOST, "apache", "test", "1", byteArrayInputStream); assert responseCode == HttpURLConnection.HTTP_OK : "Expected responsecode " + HttpURLConnection.HTTP_OK + " instead of " + responseCode; out.reset(); - responseCode = get(HOST, "replication/get", "luminis", "test", "1", out); + responseCode = get(HOST, "replication/get", "apache", "test", "1", out); assert responseCode == HttpURLConnection.HTTP_OK : "Expected responsecode " + HttpURLConnection.HTTP_OK + " instead of " + responseCode; assert "test".equals(out.toString()) : "Expected 'test' as a result of the get operation, not: " + out.toString(); @@ -239,22 +239,22 @@ @Test(groups = { INTEGRATION }) public void testCheckoutAndCommit() throws Exception { - addRepository("testInstance", "luminis", "test", true); + addRepository("testInstance", "apache", "test", true); ByteArrayOutputStream out = new ByteArrayOutputStream(); - int responseCode = get(HOST, "repository/checkout", "luminis", "test", "1", out); + int responseCode = get(HOST, "repository/checkout", "apache", "test", "1", out); assert responseCode == HttpURLConnection.HTTP_NOT_FOUND : "Expected responsecode " + HttpURLConnection.HTTP_NOT_FOUND + " instead of " + responseCode; ByteArrayInputStream input = new ByteArrayInputStream("test".getBytes()); - responseCode = put("repository/commit", HOST, "luminis", "test", "1", input); + responseCode = put("repository/commit", HOST, "apache", "test", "1", input); assert responseCode == HttpURLConnection.HTTP_INTERNAL_ERROR : "Expected responsecode " + HttpURLConnection.HTTP_INTERNAL_ERROR + " instead of " + responseCode; input.reset(); - responseCode = put("repository/commit", HOST, "luminis", "test", "0", input); + responseCode = put("repository/commit", HOST, "apache", "test", "0", input); assert responseCode == HttpURLConnection.HTTP_OK : "Expected responsecode " + HttpURLConnection.HTTP_OK + " instead of " + responseCode; out.reset(); - responseCode = get(HOST, "repository/checkout", "luminis", "test", "1", out); + responseCode = get(HOST, "repository/checkout", "apache", "test", "1", out); assert responseCode == HttpURLConnection.HTTP_OK : "Expected responsecode " + HttpURLConnection.HTTP_OK + " instead of " + responseCode; removeRepository("testInstance"); @@ -262,14 +262,14 @@ @Test(groups = { INTEGRATION }) public void testMaster() throws Exception { - addRepository("testInstance", "luminis", "test", false); + addRepository("testInstance", "apache", "test", false); ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream("test".getBytes()); - int responseCode = put("replication/put", HOST, "luminis", "test", "1", byteArrayInputStream); + int responseCode = put("replication/put", HOST, "apache", "test", "1", byteArrayInputStream); assert responseCode == HttpURLConnection.HTTP_OK; byteArrayInputStream.reset(); - responseCode = put("repository/commit", HOST, "luminis", "test", "0", byteArrayInputStream); + responseCode = put("repository/commit", HOST, "apache", "test", "0", byteArrayInputStream); assert responseCode == HttpURLConnection.HTTP_INTERNAL_ERROR : "Expected responsecode " + HttpURLConnection.HTTP_OK + " instead of " + responseCode; removeRepository("testInstance"); @@ -277,14 +277,14 @@ @Test(groups = { INTEGRATION }) public void testBadRequests() throws Exception { - addRepository("testInstance", "luminis", "test", false); + addRepository("testInstance", "apache", "test", false); - URL url = new URL(new URL(HOST), "replication/query?customer=luminis&name=test&filter=test"); + URL url = new URL(new URL(HOST), "replication/query?customer=apache&name=test&filter=test"); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); int responseCode = connection.getResponseCode(); assert responseCode == HttpURLConnection.HTTP_BAD_REQUEST : "Expected responsecode " + HttpURLConnection.HTTP_BAD_REQUEST + " instead of " + responseCode; - url = new URL(new URL(HOST), "repository/query?customer=luminis&name=test&filter=test"); + url = new URL(new URL(HOST), "repository/query?customer=apache&name=test&filter=test"); connection = (HttpURLConnection) url.openConnection(); responseCode = connection.getResponseCode(); assert responseCode == HttpURLConnection.HTTP_BAD_REQUEST : "Expected responsecode " + HttpURLConnection.HTTP_BAD_REQUEST + " instead of " + responseCode; @@ -294,10 +294,10 @@ @Test(groups = { INTEGRATION }) public void testInitialContent() throws Exception { - addRepository("testInstance", "luminis", "test", "somecontent", true); + addRepository("testInstance", "apache", "test", "somecontent", true); ByteArrayOutputStream out = new ByteArrayOutputStream(); - int responseCode = get(HOST, "repository/checkout", "luminis", "test", "1", out); + int responseCode = get(HOST, "repository/checkout", "apache", "test", "1", out); assert responseCode == HttpURLConnection.HTTP_OK : "Expected responsecode " + HttpURLConnection.HTTP_OK + " instead of " + responseCode; assert Arrays.equals(out.toByteArray(), "somecontent".getBytes()); Modified: incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java (original) +++ incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java Thu Jul 2 22:28:47 2009 @@ -304,8 +304,8 @@ startRepositoryService(); - addRepository("storeInstance", "luminis", "store", true); - addRepository("gatewayInstance", "luminis", "gateway", true); + addRepository("storeInstance", "apache", "store", true); + addRepository("gatewayInstance", "apache", "gateway", true); try { m_repositoryAdmin.checkout(); @@ -316,8 +316,8 @@ } final RepositoryAdminLoginContext loginContext1 = m_repositoryAdmin.createLoginContext(user1); - loginContext1.addShopRepository(new URL(HOST + ENDPOINT), "luminis", "store", true); - loginContext1.addGatewayRepository(new URL(HOST + ENDPOINT), "luminis", "gateway", true); + loginContext1.addShopRepository(new URL(HOST + ENDPOINT), "apache", "store", true); + loginContext1.addGatewayRepository(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."; @@ -396,8 +396,8 @@ cleanUp(); final RepositoryAdminLoginContext loginContext2 = m_repositoryAdmin.createLoginContext(user2); - loginContext2.addShopRepository(new URL(HOST + ENDPOINT), "luminis", "store", true); - loginContext2.addGatewayRepository(new URL(HOST + ENDPOINT), "luminis", "gateway", true); + loginContext2.addShopRepository(new URL(HOST + ENDPOINT), "apache", "store", true); + loginContext2.addGatewayRepository(new URL(HOST + ENDPOINT), "apache", "gateway", true); runAndWaitForEvent(new Callable() { public Object call() throws Exception { @@ -492,14 +492,14 @@ startRepositoryService(); - addRepository("storeInstance", "luminis", "store", true); - addRepository("gatewayInstance", "luminis", "gateway", true); - addRepository("deploymentInstance", "luminis", "deployment", true); + addRepository("storeInstance", "apache", "store", true); + addRepository("gatewayInstance", "apache", "gateway", true); + addRepository("deploymentInstance", "apache", "deployment", true); RepositoryAdminLoginContext loginContext = m_repositoryAdmin.createLoginContext(user); - loginContext.addShopRepository(new URL(HOST + ENDPOINT), "luminis", "store", true); - loginContext.addGatewayRepository(new URL(HOST + ENDPOINT), "luminis", "gateway", true); - loginContext.addDeploymentRepository(new URL(HOST + ENDPOINT), "luminis", "deployment", true); + loginContext.addShopRepository(new URL(HOST + ENDPOINT), "apache", "store", true); + loginContext.addGatewayRepository(new URL(HOST + ENDPOINT), "apache", "gateway", true); + loginContext.addDeploymentRepository(new URL(HOST + ENDPOINT), "apache", "deployment", true); m_repositoryAdmin.login(loginContext); runAndWaitForEvent(new Callable() { @@ -574,14 +574,14 @@ startRepositoryService(); - addRepository("storeInstance", "luminis", "store", true); - addRepository("gatewayInstance", "luminis", "gateway", true); - addRepository("deploymentInstance", "luminis", "deployment", true); + addRepository("storeInstance", "apache", "store", true); + addRepository("gatewayInstance", "apache", "gateway", true); + addRepository("deploymentInstance", "apache", "deployment", true); RepositoryAdminLoginContext loginContext = m_repositoryAdmin.createLoginContext(user); - loginContext.addShopRepository(new URL(HOST + ENDPOINT), "luminis", "store", true); - loginContext.addGatewayRepository(new URL(HOST + ENDPOINT), "luminis", "gateway", true); - loginContext.addDeploymentRepository(new URL(HOST + ENDPOINT), "luminis", "deployment", true); + loginContext.addShopRepository(new URL(HOST + ENDPOINT), "apache", "store", true); + loginContext.addGatewayRepository(new URL(HOST + ENDPOINT), "apache", "gateway", true); + loginContext.addDeploymentRepository(new URL(HOST + ENDPOINT), "apache", "deployment", true); m_repositoryAdmin.login(loginContext); /* @@ -1100,9 +1100,9 @@ public void testAutoGatewayOperator() throws Exception { startRepositoryService(); - addRepository("storeInstance", "luminis", "store", true); - addRepository("gatewayInstance", "luminis", "gateway", true); - addRepository("deploymentInstance", "luminis", "deployment", true); + addRepository("storeInstance", "apache", "store", true); + addRepository("gatewayInstance", "apache", "gateway", true); + addRepository("deploymentInstance", "apache", "deployment", true); // configure automation bundle; new configuration properties; bundle will start final Properties props = new Properties(); @@ -1113,7 +1113,7 @@ props.put("gatewayRepository","gateway"); props.put("deploymentRepository","deployment"); props.put("storeRepository","store"); - props.put("customerName","luminis"); + props.put("customerName","apache"); props.put("hostName",HOST); props.put("endpoint",ENDPOINT); @@ -1333,12 +1333,12 @@ startRepositoryService(); - addRepository("storeInstance", "luminis", "store", true); - addRepository("gatewayInstance", "luminis", "gateway", true); + addRepository("storeInstance", "apache", "store", true); + addRepository("gatewayInstance", "apache", "gateway", true); final RepositoryAdminLoginContext loginContext1 = m_repositoryAdmin.createLoginContext(user1); - loginContext1.addShopRepository(new URL(HOST + ENDPOINT), "luminis", "store", true); - loginContext1.addGatewayRepository(new URL(HOST + ENDPOINT), "luminis", "gateway", true); + loginContext1.addShopRepository(new URL(HOST + ENDPOINT), "apache", "store", true); + loginContext1.addGatewayRepository(new URL(HOST + ENDPOINT), "apache", "gateway", true); m_repositoryAdmin.login(loginContext1); GroupObject g1 = createBasicGroupObject("group1"); @@ -1368,12 +1368,12 @@ startRepositoryService(); - addRepository("storeInstance", "luminis", "store", true); - addRepository("gatewayInstance", "luminis", "gateway", true); + addRepository("storeInstance", "apache", "store", true); + addRepository("gatewayInstance", "apache", "gateway", true); final RepositoryAdminLoginContext loginContext1 = m_repositoryAdmin.createLoginContext(user1); - loginContext1.addShopRepository(new URL(HOST + ENDPOINT), "luminis", "store", true); - loginContext1.addGatewayRepository(new URL(HOST + ENDPOINT), "luminis", "gateway", false); + loginContext1.addShopRepository(new URL(HOST + ENDPOINT), "apache", "store", true); + loginContext1.addGatewayRepository(new URL(HOST + ENDPOINT), "apache", "gateway", false); m_repositoryAdmin.login(loginContext1); m_repositoryAdmin.checkout(); @@ -1412,8 +1412,8 @@ @Test( groups = { TestUtils.INTEGRATION } ) public void testRepostoryLoginDoubleRepository() throws Exception { RepositoryAdminLoginContext context = m_repositoryAdmin.createLoginContext(new MockUser("user")); - context.addRepositories(new URL("http://localhost:8080"), "luminis", "shop", true, ArtifactRepository.class, Artifact2GroupAssociationRepository.class, GroupRepository.class); - context.addRepositories(new URL("http://localhost:8080"), "luminis", "deployment", true, GroupRepository.class, Group2LicenseAssociationRepository.class, LicenseRepository.class); + context.addRepositories(new URL("http://localhost:8080"), "apache", "shop", true, ArtifactRepository.class, Artifact2GroupAssociationRepository.class, GroupRepository.class); + context.addRepositories(new URL("http://localhost:8080"), "apache", "deployment", true, GroupRepository.class, Group2LicenseAssociationRepository.class, LicenseRepository.class); try { m_repositoryAdmin.login(context); assert false : "We tried to log in with two repositories that try to access the same repository service; this should not be allowed."; @@ -1429,8 +1429,8 @@ @Test( groups = { TestUtils.INTEGRATION } ) public void testRepostoryLoginRepositoryWithoutImplementation() throws Exception { RepositoryAdminLoginContext context = m_repositoryAdmin.createLoginContext(new MockUser("user")); - context.addRepositories(new URL("http://localhost:8080"), "luminis", "shop", true, ArtifactRepository.class, Artifact2GroupAssociationRepository.class, GroupRepository.class); - context.addRepositories(new URL("http://localhost:8080"), "luminis", "deployment", true, GroupRepository.class, Group2LicenseAssociationRepository.class, newRepository.class); + context.addRepositories(new URL("http://localhost:8080"), "apache", "shop", true, ArtifactRepository.class, Artifact2GroupAssociationRepository.class, GroupRepository.class); + context.addRepositories(new URL("http://localhost:8080"), "apache", "deployment", true, GroupRepository.class, Group2LicenseAssociationRepository.class, newRepository.class); try { m_repositoryAdmin.login(context); assert false : "We tried to log in with a repository for which no implementation is available; this should not be allowed."; Modified: incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/Activator.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/Activator.java?rev=790750&r1=790749&r2=790750&view=diff ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/Activator.java (original) +++ incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/Activator.java Thu Jul 2 22:28:47 2009 @@ -42,7 +42,7 @@ .setService(UserAdmin.class) .setRequired(true)) .add(createServiceDependency() - .setService(Repository.class, "(&(" + RepositoryConstants.REPOSITORY_NAME + "=users)(" + RepositoryConstants.REPOSITORY_CUSTOMER + "=luminis))") + .setService(Repository.class, "(&(" + RepositoryConstants.REPOSITORY_NAME + "=users)(" + RepositoryConstants.REPOSITORY_CUSTOMER + "=apache))") .setRequired(true))); // We need to do some configuration for this test to run; therefore, @@ -65,7 +65,7 @@ Properties props = new Properties(); props.put(RepositoryConstants.REPOSITORY_NAME, "users"); - props.put(RepositoryConstants.REPOSITORY_CUSTOMER, "luminis"); + props.put(RepositoryConstants.REPOSITORY_CUSTOMER, "apache"); props.put(RepositoryConstants.REPOSITORY_MASTER, "true"); config.update(props); @@ -83,7 +83,7 @@ props = new Properties(); props.put("repositoryName", "users"); - props.put("repositoryCustomer", "luminis"); + props.put("repositoryCustomer", "apache"); props.put("repositoryLocation", "http://localhost:8080/repository"); config.update(props);