Return-Path: Delivered-To: apmail-incubator-ace-commits-archive@minotaur.apache.org Received: (qmail 83592 invoked from network); 18 Mar 2010 20:13:57 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 18 Mar 2010 20:13:57 -0000 Received: (qmail 22017 invoked by uid 500); 18 Mar 2010 20:13:57 -0000 Delivered-To: apmail-incubator-ace-commits-archive@incubator.apache.org Received: (qmail 21996 invoked by uid 500); 18 Mar 2010 20:13:57 -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 21988 invoked by uid 99); 18 Mar 2010 20:13:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Mar 2010 20:13:57 +0000 X-ASF-Spam-Status: No, hits=-1614.1 required=10.0 tests=ALL_TRUSTED,AWL 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, 18 Mar 2010 20:13:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3902923888E7; Thu, 18 Mar 2010 20:13:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r924975 - in /incubator/ace/trunk/ace-target-devserver: ./ src/main/assembly/ src/main/resources/ src/main/resources/conf/ src/main/resources/conf/org.apache.ace.server.log.servlet.factory/ src/main/resources/conf/org.apache.ace.server.log.... Date: Thu, 18 Mar 2010 20:13:35 -0000 To: ace-commits@incubator.apache.org From: marrs@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100318201335.3902923888E7@eris.apache.org> Author: marrs Date: Thu Mar 18 20:13:34 2010 New Revision: 924975 URL: http://svn.apache.org/viewvc?rev=924975&view=rev Log: Updates to the server assembly. Fixed missing configuration, added run script, removed obsolete platform settings. Added: incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.obr.servlet.cfg incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.obr.storage.file.cfg incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.servlet.factory/ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.servlet.factory/auditlog.cfg incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.servlet.factory/licenselog.cfg incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.store.factory/ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.store.factory/auditlog.cfg incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.store.factory/licenselog.cfg incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-activation.cfg incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-activationinfo.cfg incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-gateway.cfg incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-shop.cfg incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-user.cfg incubator/ace/trunk/ace-target-devserver/src/main/resources/run.sh Removed: incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/platform.properties incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/platform.setup Modified: incubator/ace/trunk/ace-target-devserver/pom.xml incubator/ace/trunk/ace-target-devserver/src/main/assembly/assembly.xml incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg Modified: incubator/ace/trunk/ace-target-devserver/pom.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/pom.xml?rev=924975&r1=924974&r2=924975&view=diff ============================================================================== --- incubator/ace/trunk/ace-target-devserver/pom.xml (original) +++ incubator/ace/trunk/ace-target-devserver/pom.xml Thu Mar 18 20:13:34 2010 @@ -72,11 +72,13 @@ provided + org.apache.felix @@ -101,13 +103,14 @@ provided + org.apache.felix org.apache.felix.prefs @@ -144,6 +147,25 @@ provided --> + + + + + org.ops4j.pax.web @@ -167,6 +189,14 @@ ${project.groupId} + ace-client-repository-impl + ${project.version} + runtime + + + + + ${project.groupId} ace-client-repository-helper-bundle ${project.version} runtime @@ -190,6 +220,20 @@ ${project.groupId} + ace-configurator-useradmin-task + ${project.version} + runtime + + + + ${project.groupId} + ace-configurator-serveruseradmin + ${project.version} + runtime + + + + ${project.groupId} ace-consolelogger ${project.version} runtime @@ -286,12 +330,14 @@ runtime + ${project.groupId} @@ -302,10 +348,27 @@ ${project.groupId} + ace-log + ${project.version} + runtime + + + + ${project.groupId} + ace-log-servlet + ${project.version} + runtime + + + + \ No newline at end of file Modified: incubator/ace/trunk/ace-target-devserver/src/main/assembly/assembly.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/assembly/assembly.xml?rev=924975&r1=924974&r2=924975&view=diff ============================================================================== --- incubator/ace/trunk/ace-target-devserver/src/main/assembly/assembly.xml (original) +++ incubator/ace/trunk/ace-target-devserver/src/main/assembly/assembly.xml Thu Mar 18 20:13:34 2010 @@ -24,6 +24,9 @@ src/main/resources/run.sh 0777 + + src/main/resources/platform.properties + Modified: incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg?rev=924975&r1=924974&r2=924975&view=diff ============================================================================== --- incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg (original) +++ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg Thu Mar 18 20:13:34 2010 @@ -1,3 +1,3 @@ repositoryLocation = http://localhost:8080/repository repositoryCustomer = apache -repositoryName = user \ No newline at end of file +repositoryName = user Added: incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.obr.servlet.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.obr.servlet.cfg?rev=924975&view=auto ============================================================================== --- incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.obr.servlet.cfg (added) +++ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.obr.servlet.cfg Thu Mar 18 20:13:34 2010 @@ -0,0 +1 @@ +org.apache.ace.server.servlet.endpoint=/obr \ No newline at end of file Added: incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.obr.storage.file.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.obr.storage.file.cfg?rev=924975&view=auto ============================================================================== --- incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.obr.storage.file.cfg (added) +++ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.obr.storage.file.cfg Thu Mar 18 20:13:34 2010 @@ -0,0 +1 @@ +fileLocation=store \ No newline at end of file Added: incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.servlet.factory/auditlog.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.servlet.factory/auditlog.cfg?rev=924975&view=auto ============================================================================== --- incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.servlet.factory/auditlog.cfg (added) +++ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.servlet.factory/auditlog.cfg Thu Mar 18 20:13:34 2010 @@ -0,0 +1,2 @@ +name=auditlog +org.apache.ace.server.servlet.endpoint=/auditlog Added: incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.servlet.factory/licenselog.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.servlet.factory/licenselog.cfg?rev=924975&view=auto ============================================================================== --- incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.servlet.factory/licenselog.cfg (added) +++ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.servlet.factory/licenselog.cfg Thu Mar 18 20:13:34 2010 @@ -0,0 +1,2 @@ +name=licenselog +org.apache.ace.server.servlet.endpoint=/licenselog Added: incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.store.factory/auditlog.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.store.factory/auditlog.cfg?rev=924975&view=auto ============================================================================== --- incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.store.factory/auditlog.cfg (added) +++ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.store.factory/auditlog.cfg Thu Mar 18 20:13:34 2010 @@ -0,0 +1 @@ +name=auditlog \ No newline at end of file Added: incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.store.factory/licenselog.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.store.factory/licenselog.cfg?rev=924975&view=auto ============================================================================== --- incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.store.factory/licenselog.cfg (added) +++ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.store.factory/licenselog.cfg Thu Mar 18 20:13:34 2010 @@ -0,0 +1 @@ +name=licenselog \ No newline at end of file Added: incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-activation.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-activation.cfg?rev=924975&view=auto ============================================================================== --- incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-activation.cfg (added) +++ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-activation.cfg Thu Mar 18 20:13:34 2010 @@ -0,0 +1,3 @@ +name=activation +customer=apache +master=true \ No newline at end of file Added: incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-activationinfo.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-activationinfo.cfg?rev=924975&view=auto ============================================================================== --- incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-activationinfo.cfg (added) +++ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-activationinfo.cfg Thu Mar 18 20:13:34 2010 @@ -0,0 +1,3 @@ +name=activationinfo +customer=apache +master=true \ No newline at end of file Added: incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg?rev=924975&view=auto ============================================================================== --- incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg (added) +++ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-deployment.cfg Thu Mar 18 20:13:34 2010 @@ -0,0 +1,3 @@ +name=deployment +customer=apache +master=true \ No newline at end of file Added: incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-gateway.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-gateway.cfg?rev=924975&view=auto ============================================================================== --- incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-gateway.cfg (added) +++ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-gateway.cfg Thu Mar 18 20:13:34 2010 @@ -0,0 +1,3 @@ +name=gateway +customer=apache +master=true \ No newline at end of file Added: incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-shop.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-shop.cfg?rev=924975&view=auto ============================================================================== --- incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-shop.cfg (added) +++ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-shop.cfg Thu Mar 18 20:13:34 2010 @@ -0,0 +1,3 @@ +name=shop +customer=apache +master=true \ No newline at end of file Added: incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-user.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-user.cfg?rev=924975&view=auto ============================================================================== --- incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-user.cfg (added) +++ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-user.cfg Thu Mar 18 20:13:34 2010 @@ -0,0 +1,308 @@ +name=user +customer=apache +master=true +initial= \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + permissionGroup \ + \ + \ + \ + \ + userGroup \ + \ + createBundle \ + updateBundle \ + removeBundle \ + viewBundle \ + editBundle \ + createGroup \ + removeGroup \ + associateBundleToGroup \ + associateGroupToLicense \ + removeBundleToGroupAssociation \ + removeGroupToLicenseAssociation \ + viewGroup \ + editGroup \ + viewLicense \ + editLicense \ + createLicense \ + removeLicense \ + associateLicenseToGateway \ + viewGateway \ + editGateway \ + createGateway \ + removeGateway \ + approveGateway \ + registerGateway \ + removeLicenseToGatewayAssociation \ + mock \ + \ + \ + \ + userGroup \ + \ + viewBundle \ + viewGroup \ + viewLicense \ + viewGateway \ + approveGateway \ + \ + \ + \ + userGroup \ + \ + viewBundle \ + viewGroup \ + viewLicense \ + editLicense \ + createLicense \ + removeLicense \ + associateLicenseToGateway \ + viewGateway \ + removeLicenseToGatewayAssociation \ + \ + \ + \ + userGroup \ + \ + createBundle \ + updateBundle \ + removeBundle \ + viewBundle \ + editBundle \ + createGroup \ + removeGroup \ + associateBundleToGroup \ + associateGroupToLicense \ + removeBundleToGroupAssociation \ + removeGroupToLicenseAssociation \ + viewGroup \ + editGroup \ + viewLicense \ + viewGateway \ + \ + \ + \ + userGroup \ + \ + viewBundle \ + viewGroup \ + viewLicense \ + viewGateway \ + editGateway \ + createGateway \ + removeGateway \ + registerGateway \ + \ + \ + \ + userGroup \ + \ + createBundle \ + updateBundle \ + removeBundle \ + viewBundle \ + editBundle \ + createGroup \ + removeGroup \ + associateBundleToGroup \ + associateGroupToLicense \ + removeBundleToGroupAssociation \ + removeGroupToLicenseAssociation \ + viewGroup \ + editGroup \ + viewLicense \ + editLicense \ + createLicense \ + removeLicense \ + associateLicenseToGateway \ + viewGateway \ + editGateway \ + createGateway \ + removeGateway \ + approveGateway \ + registerGateway \ + removeLicenseToGatewayAssociation \ + mock \ + \ + \ + \ + d \ + \ + \ + f \ + \ + TestGroup \ + \ + \ + \ + lm \ + \ + \ + lm \ + \ + License Manager \ + \ + \ + \ + go \ + \ + \ + go \ + \ + Gateway Operator \ + \ + \ + \ + rm \ + \ + \ + rm \ + \ + Release Manager \ + \ + \ + \ + gm \ + \ + \ + gm \ + \ + Gateway Manager \ + \ + \ + \ + elm \ + \ + \ + elm \ + \ + External License Manager \ + \ + Added: incubator/ace/trunk/ace-target-devserver/src/main/resources/run.sh URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/resources/run.sh?rev=924975&view=auto ============================================================================== --- incubator/ace/trunk/ace-target-devserver/src/main/resources/run.sh (added) +++ incubator/ace/trunk/ace-target-devserver/src/main/resources/run.sh Thu Mar 18 20:13:34 2010 @@ -0,0 +1 @@ +java -jar pax-runner.jar --workingDirectory=. scan-dir:required-bundles scan-dir:ace-bundles scan-file:file:platform.properties \ No newline at end of file