ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1301456 - in /ace/trunk: ace-target-devgateway/ ace-target-devgateway/src/main/assembly/ ace-target-devgateway/src/main/resources/conf/ ace-target-devserver/src/main/resources/conf/ ace-target-devserver/src/main/resources/conf/org.apache.a...
Date Fri, 16 Mar 2012 12:19:52 GMT
Author: marrs
Date: Fri Mar 16 12:19:52 2012
New Revision: 1301456

URL: http://svn.apache.org/viewvc?rev=1301456&view=rev
Log:
ACE-63 updated configuration files for development server/target.

Added:
    ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-target.cfg
      - copied, changed from r1301455, ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-gateway.cfg
Removed:
    ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.servlet.factory/licenselog.cfg
    ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.log.store.factory/licenselog.cfg
    ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-gateway.cfg
Modified:
    ace/trunk/ace-target-devgateway/pom.xml
    ace/trunk/ace-target-devgateway/src/main/assembly/assembly.xml
    ace/trunk/ace-target-devgateway/src/main/resources/conf/org.apache.ace.identification.property.cfg
    ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.client.automation.cfg
    ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.distribution.servlet.cfg
    ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.activation.impl.cfg
    ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-user.cfg

Modified: ace/trunk/ace-target-devgateway/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-target-devgateway/pom.xml?rev=1301456&r1=1301455&r2=1301456&view=diff
==============================================================================
--- ace/trunk/ace-target-devgateway/pom.xml (original)
+++ ace/trunk/ace-target-devgateway/pom.xml Fri Mar 16 12:19:52 2012
@@ -28,10 +28,11 @@
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
     <version>0.8.1-SNAPSHOT</version>
+    <!-- TODO rename to devtarget -->
     <artifactId>org.apache.ace.target.devgateway</artifactId>
     <packaging>pom</packaging>
 
-    <name>Apache ACE :: Target :: Dev Gateway</name>
+    <name>Apache ACE :: Target :: Dev Target</name>
     <description />
 
     <scm>

Modified: ace/trunk/ace-target-devgateway/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-target-devgateway/src/main/assembly/assembly.xml?rev=1301456&r1=1301455&r2=1301456&view=diff
==============================================================================
--- ace/trunk/ace-target-devgateway/src/main/assembly/assembly.xml (original)
+++ ace/trunk/ace-target-devgateway/src/main/assembly/assembly.xml Fri Mar 16 12:19:52 2012
@@ -6,7 +6,7 @@
         <format>dir</format>
         <format>zip</format>
     </formats>
-    <baseDirectory>ace-gateway</baseDirectory>
+    <baseDirectory>ace-target</baseDirectory>
 
     <fileSets>
 <fileSet>

Modified: ace/trunk/ace-target-devgateway/src/main/resources/conf/org.apache.ace.identification.property.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/ace-target-devgateway/src/main/resources/conf/org.apache.ace.identification.property.cfg?rev=1301456&r1=1301455&r2=1301456&view=diff
==============================================================================
--- ace/trunk/ace-target-devgateway/src/main/resources/conf/org.apache.ace.identification.property.cfg
(original)
+++ ace/trunk/ace-target-devgateway/src/main/resources/conf/org.apache.ace.identification.property.cfg
Fri Mar 16 12:19:52 2012
@@ -1 +1 @@
-gatewayID = configuredGatewayID
\ No newline at end of file
+targetID = defaultTargetID
\ No newline at end of file

Modified: ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.client.automation.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.client.automation.cfg?rev=1301456&r1=1301455&r2=1301456&view=diff
==============================================================================
--- ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.client.automation.cfg
(original)
+++ ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.client.automation.cfg
Fri Mar 16 12:19:52 2012
@@ -1,8 +1,8 @@
-registerGatewayFilter      = (id=*)
-approveGatewayFilter       = (id=*)
-autoApproveGatewayFilter   = (id=*)
+registerTargetFilter       = (id=*)
+approveTargetFilter        = (id=*)
+autoApproveTargetFilter    = (id=*)
 commitRepositories 		   = true
-gatewayRepository          = gateway
+targetRepository           = target
 deploymentRepository       = deployment
 storeRepository            = shop
 customerName               = apache

Modified: ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.distribution.servlet.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.distribution.servlet.cfg?rev=1301456&r1=1301455&r2=1301456&view=diff
==============================================================================
--- ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.distribution.servlet.cfg
(original)
+++ ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.distribution.servlet.cfg
Fri Mar 16 12:19:52 2012
@@ -1,4 +1,4 @@
-gatewayRepository = gateway
+targetRepository = target
 storeRepository = shop
 customerName = apache
 hostName = http://localhost:8080/repository

Modified: ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.activation.impl.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.activation.impl.cfg?rev=1301456&r1=1301455&r2=1301456&view=diff
==============================================================================
--- ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.activation.impl.cfg
(original)
+++ ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.activation.impl.cfg
Fri Mar 16 12:19:52 2012
@@ -1,8 +1,8 @@
-registerGatewayFilter      = (id=*)
-approveGatewayFilter       = (id=*)
-autoApproveGatewayFilter   = (id=*)
+registerTargetFilter       = (id=*)
+approveTargetFilter        = (id=*)
+autoApproveTargetFilter    = (id=*)
 commitRepositories         = true
-gatewayRepository          = gateway
+targetRepository           = target
 deploymentRepository       = deployment
 storeRepository            = shop
 customerName               = apache

Copied: ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-target.cfg
(from r1301455, ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-gateway.cfg)
URL: http://svn.apache.org/viewvc/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-target.cfg?p2=ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-target.cfg&p1=ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-gateway.cfg&r1=1301455&r2=1301456&rev=1301456&view=diff
==============================================================================
--- ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-gateway.cfg
(original)
+++ ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-target.cfg
Fri Mar 16 12:19:52 2012
@@ -1,3 +1,3 @@
-name=gateway
+name=target
 customer=apache
 master=true
\ No newline at end of file

Modified: ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-user.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-user.cfg?rev=1301456&r1=1301455&r2=1301456&view=diff
==============================================================================
--- ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-user.cfg
(original)
+++ ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.repository.factory/ace-user.cfg
Fri Mar 16 12:19:52 2012
@@ -2,127 +2,127 @@ name=user
 customer=apache
 master=true
 initial=<roles> \
-       <group name="createBundle"> \
+       <group name="createArtifact"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="updateBundle"> \
+       <group name="updateArtifact"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="removeBundle"> \
+       <group name="removeArtifact"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="viewBundle"> \
+       <group name="viewArtifact"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="editBundle"> \
+       <group name="editArtifact"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="createGroup"> \
+       <group name="createFeature"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="removeGroup"> \
+       <group name="removeFeature"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="associateBundleToGroup"> \
+       <group name="associateArtifactToFeature"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="associateGroupToLicense"> \
+       <group name="associateFeatureToDistribution"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="removeBundleToGroupAssociation"> \
+       <group name="removeArtifactToFeatureAssociation"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="removeGroupToLicenseAssociation"> \
+       <group name="removeFeatureToDistributionAssociation"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="viewGroup"> \
+       <group name="viewFeature"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="editGroup"> \
+       <group name="editFeature"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="viewLicense"> \
+       <group name="viewDistribution"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="editLicense"> \
+       <group name="editDistribution"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="createLicense"> \
+       <group name="createDistribution"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="removeLicense"> \
+       <group name="removeDistribution"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="associateLicenseToGateway"> \
+       <group name="associateDistributionToTarget"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="viewGateway"> \
+       <group name="viewTarget"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="editGateway"> \
+       <group name="editTarget"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="createGateway"> \
+       <group name="createTarget"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="removeGateway"> \
+       <group name="removeTarget"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="approveGateway"> \
+       <group name="approveTarget"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="registerGateway"> \
+       <group name="registerTarget"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
        </group> \
-       <group name="removeLicenseToGatewayAssociation"> \
+       <group name="removeDistributionToTargetAssociation"> \
            <properties> \
                <type>permissionGroup</type> \
            </properties> \
@@ -136,119 +136,119 @@ initial=<roles> \
            <properties> \
                <type>userGroup</type> \
            </properties> \
-           <memberof>createBundle</memberof> \
-           <memberof>updateBundle</memberof> \
-           <memberof>removeBundle</memberof> \
-           <memberof>viewBundle</memberof> \
-           <memberof>editBundle</memberof> \
-           <memberof>createGroup</memberof> \
-           <memberof>removeGroup</memberof> \
-           <memberof>associateBundleToGroup</memberof> \
-           <memberof>associateGroupToLicense</memberof> \
-           <memberof>removeBundleToGroupAssociation</memberof> \
-           <memberof>removeGroupToLicenseAssociation</memberof> \
-           <memberof>viewGroup</memberof> \
-           <memberof>editGroup</memberof> \
-           <memberof>viewLicense</memberof> \
-           <memberof>editLicense</memberof> \
-           <memberof>createLicense</memberof> \
-           <memberof>removeLicense</memberof> \
-           <memberof>associateLicenseToGateway</memberof> \
-           <memberof>viewGateway</memberof> \
-           <memberof>editGateway</memberof> \
-           <memberof>createGateway</memberof> \
-           <memberof>removeGateway</memberof> \
-           <memberof>approveGateway</memberof> \
-           <memberof>registerGateway</memberof> \
-           <memberof>removeLicenseToGatewayAssociation</memberof> \
+           <memberof>createArtifact</memberof> \
+           <memberof>updateArtifact</memberof> \
+           <memberof>removeArtifact</memberof> \
+           <memberof>viewArtifact</memberof> \
+           <memberof>editArtifact</memberof> \
+           <memberof>createFeature</memberof> \
+           <memberof>removeFeature</memberof> \
+           <memberof>associateArtifactToFeature</memberof> \
+           <memberof>associateFeatureToDistribution</memberof> \
+           <memberof>removeArtifactToFeatureAssociation</memberof> \
+           <memberof>removeFeatureToDistributionAssociation</memberof> \
+           <memberof>viewFeature</memberof> \
+           <memberof>editFeature</memberof> \
+           <memberof>viewDistribution</memberof> \
+           <memberof>editDistribution</memberof> \
+           <memberof>createDistribution</memberof> \
+           <memberof>removeDistribution</memberof> \
+           <memberof>associateDistributionToTarget</memberof> \
+           <memberof>viewTarget</memberof> \
+           <memberof>editTarget</memberof> \
+           <memberof>createTarget</memberof> \
+           <memberof>removeTarget</memberof> \
+           <memberof>approveTarget</memberof> \
+           <memberof>registerTarget</memberof> \
+           <memberof>removeDistributionToTargetAssociation</memberof> \
            <memberof>mock</memberof> \
        </group> \
-       <group name="Gateway Operator"> \
+       <group name="Target Operator"> \
            <properties> \
                <type>userGroup</type> \
            </properties> \
-           <memberof>viewBundle</memberof> \
-           <memberof>viewGroup</memberof> \
-           <memberof>viewLicense</memberof> \
-           <memberof>viewGateway</memberof> \
-           <memberof>approveGateway</memberof> \
+           <memberof>viewArtifact</memberof> \
+           <memberof>viewFeature</memberof> \
+           <memberof>viewDistribution</memberof> \
+           <memberof>viewTarget</memberof> \
+           <memberof>approveTarget</memberof> \
        </group> \
-       <group name="License Manager"> \
+       <group name="Distribution Manager"> \
            <properties> \
                <type>userGroup</type> \
            </properties> \
-           <memberof>viewBundle</memberof> \
-           <memberof>viewGroup</memberof> \
-           <memberof>viewLicense</memberof> \
-           <memberof>editLicense</memberof> \
-           <memberof>createLicense</memberof> \
-           <memberof>removeLicense</memberof> \
-           <memberof>associateLicenseToGateway</memberof> \
-           <memberof>viewGateway</memberof> \
-           <memberof>removeLicenseToGatewayAssociation</memberof> \
+           <memberof>viewArtifact</memberof> \
+           <memberof>viewFeature</memberof> \
+           <memberof>viewDistribution</memberof> \
+           <memberof>editDistribution</memberof> \
+           <memberof>createDistribution</memberof> \
+           <memberof>removeDistribution</memberof> \
+           <memberof>associateDistributionToTarget</memberof> \
+           <memberof>viewTarget</memberof> \
+           <memberof>removeDistributionToTargetAssociation</memberof> \
        </group> \
        <group name="Release Manager"> \
            <properties> \
                <type>userGroup</type> \
            </properties> \
-           <memberof>createBundle</memberof> \
-           <memberof>updateBundle</memberof> \
-           <memberof>removeBundle</memberof> \
-           <memberof>viewBundle</memberof> \
-           <memberof>editBundle</memberof> \
-           <memberof>createGroup</memberof> \
-           <memberof>removeGroup</memberof> \
-           <memberof>associateBundleToGroup</memberof> \
-           <memberof>associateGroupToLicense</memberof> \
-           <memberof>removeBundleToGroupAssociation</memberof> \
-           <memberof>removeGroupToLicenseAssociation</memberof> \
-           <memberof>viewGroup</memberof> \
-           <memberof>editGroup</memberof> \
-           <memberof>viewLicense</memberof> \
-           <memberof>viewGateway</memberof> \
+           <memberof>createArtifact</memberof> \
+           <memberof>updateArtifact</memberof> \
+           <memberof>removeArtifact</memberof> \
+           <memberof>viewArtifact</memberof> \
+           <memberof>editArtifact</memberof> \
+           <memberof>createFeature</memberof> \
+           <memberof>removeFeature</memberof> \
+           <memberof>associateArtifactToFeature</memberof> \
+           <memberof>associateFeatureToDistribution</memberof> \
+           <memberof>removeArtifactToFeatureAssociation</memberof> \
+           <memberof>removeFeatureToDistributionAssociation</memberof> \
+           <memberof>viewFeature</memberof> \
+           <memberof>editFeature</memberof> \
+           <memberof>viewDistribution</memberof> \
+           <memberof>viewTarget</memberof> \
        </group> \
-       <group name="Gateway Manager"> \
+       <group name="Target Manager"> \
            <properties> \
                <type>userGroup</type> \
            </properties> \
-           <memberof>viewBundle</memberof> \
-           <memberof>viewGroup</memberof> \
-           <memberof>viewLicense</memberof> \
-           <memberof>viewGateway</memberof> \
-           <memberof>editGateway</memberof> \
-           <memberof>createGateway</memberof> \
-           <memberof>removeGateway</memberof> \
-           <memberof>registerGateway</memberof> \
+           <memberof>viewArtifact</memberof> \
+           <memberof>viewFeature</memberof> \
+           <memberof>viewDistribution</memberof> \
+           <memberof>viewTarget</memberof> \
+           <memberof>editTarget</memberof> \
+           <memberof>createTarget</memberof> \
+           <memberof>removeTarget</memberof> \
+           <memberof>registerTarget</memberof> \
        </group> \
-       <group name="External License Manager"> \
+       <group name="External Distribution Manager"> \
            <properties> \
                <type>userGroup</type> \
            </properties> \
-           <memberof>createBundle</memberof> \
-           <memberof>updateBundle</memberof> \
-           <memberof>removeBundle</memberof> \
-           <memberof>viewBundle</memberof> \
-           <memberof>editBundle</memberof> \
-           <memberof>createGroup</memberof> \
-           <memberof>removeGroup</memberof> \
-           <memberof>associateBundleToGroup</memberof> \
-           <memberof>associateGroupToLicense</memberof> \
-           <memberof>removeBundleToGroupAssociation</memberof> \
-           <memberof>removeGroupToLicenseAssociation</memberof> \
-           <memberof>viewGroup</memberof> \
-           <memberof>editGroup</memberof> \
-           <memberof>viewLicense</memberof> \
-           <memberof>editLicense</memberof> \
-           <memberof>createLicense</memberof> \
-           <memberof>removeLicense</memberof> \
-           <memberof>associateLicenseToGateway</memberof> \
-           <memberof>viewGateway</memberof> \
-           <memberof>editGateway</memberof> \
-           <memberof>createGateway</memberof> \
-           <memberof>removeGateway</memberof> \
-           <memberof>approveGateway</memberof> \
-           <memberof>registerGateway</memberof> \
-           <memberof>removeLicenseToGatewayAssociation</memberof> \
+           <memberof>createArtifact</memberof> \
+           <memberof>updateArtifact</memberof> \
+           <memberof>removeArtifact</memberof> \
+           <memberof>viewArtifact</memberof> \
+           <memberof>editArtifact</memberof> \
+           <memberof>createFeature</memberof> \
+           <memberof>removeFeature</memberof> \
+           <memberof>associateArtifactToFeature</memberof> \
+           <memberof>associateFeatureToDistribution</memberof> \
+           <memberof>removeArtifactToFeatureAssociation</memberof> \
+           <memberof>removeFeatureToLicenseAssociation</memberof> \
+           <memberof>viewFeature</memberof> \
+           <memberof>editFeature</memberof> \
+           <memberof>viewDistribution</memberof> \
+           <memberof>editDistribution</memberof> \
+           <memberof>createDistribution</memberof> \
+           <memberof>removeDistribution</memberof> \
+           <memberof>associateDistributionToTarget</memberof> \
+           <memberof>viewTarget</memberof> \
+           <memberof>editTarget</memberof> \
+           <memberof>createTarget</memberof> \
+           <memberof>removeTarget</memberof> \
+           <memberof>approveTarget</memberof> \
+           <memberof>registerTarget</memberof> \
+           <memberof>removeDistributionToTargetAssociation</memberof> \
            <memberof>mock</memberof> \
        </group> \
        <user name="d"> \
@@ -267,7 +267,7 @@ initial=<roles> \
            <credentials> \
                <password>lm</password> \
            </credentials> \
-           <memberof>License Manager</memberof> \
+           <memberof>Distribution Manager</memberof> \
        </user> \
        <user name="go"> \
            <properties> \
@@ -276,7 +276,7 @@ initial=<roles> \
            <credentials> \
                <password>go</password> \
            </credentials> \
-           <memberof>Gateway Operator</memberof> \
+           <memberof>Target Operator</memberof> \
        </user> \
        <user name="rm"> \
            <properties> \
@@ -294,7 +294,7 @@ initial=<roles> \
            <credentials> \
                <password>gm</password> \
            </credentials> \
-           <memberof>Gateway Manager</memberof> \
+           <memberof>Target Manager</memberof> \
        </user> \
        <user name="elm"> \
            <properties> \
@@ -303,6 +303,6 @@ initial=<roles> \
            <credentials> \
                <password>elm</password> \
            </credentials> \
-           <memberof>External License Manager</memberof> \
+           <memberof>External Distribution Manager</memberof> \
        </user> \
 </roles>



Mime
View raw message