incubator-ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r788992 [6/25] - in /incubator/ace/trunk: gateway/ gateway/src/ gateway/src/net/ gateway/src/net/luminis/ gateway/src/net/luminis/liq/ gateway/src/net/luminis/liq/bootstrap/ gateway/src/net/luminis/liq/bootstrap/multigateway/ gateway/src/ne...
Date Sat, 27 Jun 2009 15:53:26 GMT
Added: incubator/ace/trunk/liq/conf/dev-server/net.luminis.liq.server.repository.factory/luminis-gateway.cfg
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server/net.luminis.liq.server.repository.factory/luminis-gateway.cfg?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/conf/dev-server/net.luminis.liq.server.repository.factory/luminis-gateway.cfg (added)
+++ incubator/ace/trunk/liq/conf/dev-server/net.luminis.liq.server.repository.factory/luminis-gateway.cfg Sat Jun 27 15:53:04 2009
@@ -0,0 +1,3 @@
+name=gateway
+customer=luminis
+master=true
\ No newline at end of file

Added: incubator/ace/trunk/liq/conf/dev-server/net.luminis.liq.server.repository.factory/luminis-shop.cfg
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server/net.luminis.liq.server.repository.factory/luminis-shop.cfg?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/conf/dev-server/net.luminis.liq.server.repository.factory/luminis-shop.cfg (added)
+++ incubator/ace/trunk/liq/conf/dev-server/net.luminis.liq.server.repository.factory/luminis-shop.cfg Sat Jun 27 15:53:04 2009
@@ -0,0 +1,3 @@
+name=shop
+customer=luminis
+master=true
\ No newline at end of file

Added: incubator/ace/trunk/liq/conf/dev-server/net.luminis.liq.server.repository.factory/luminis-user.cfg
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/dev-server/net.luminis.liq.server.repository.factory/luminis-user.cfg?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/conf/dev-server/net.luminis.liq.server.repository.factory/luminis-user.cfg (added)
+++ incubator/ace/trunk/liq/conf/dev-server/net.luminis.liq.server.repository.factory/luminis-user.cfg Sat Jun 27 15:53:04 2009
@@ -0,0 +1,472 @@
+name=user
+customer=luminis
+master=true
+initial=<roles> \
+       <group name="createBundle"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="updateBundle"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="removeBundle"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="viewBundle"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="editBundle"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="createGroup"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="removeGroup"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="associateBundleToGroup"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="associateGroupToLicense"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="removeBundleToGroupAssociation"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="removeGroupToLicenseAssociation"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="viewGroup"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="editGroup"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="viewLicense"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="editLicense"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="createLicense"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="removeLicense"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="associateLicenseToGateway"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="viewGateway"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="editGateway"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="createGateway"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="removeGateway"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="approveGateway"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="registerGateway"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="removeLicenseToGatewayAssociation"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="fadianDialog"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="iAlertAssignEngineer"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="iAlertManageUsers"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="iAlertLog"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="mock"> \
+           <properties> \
+               <type>permissionGroup</type> \
+           </properties> \
+       </group> \
+       <group name="iAlertAdmin"> \
+           <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>iAlertAssignEngineer</memberof> \
+           <memberof>iAlertManageUsers</memberof> \
+           <memberof>iAlertLog</memberof> \
+       </group> \
+       <group name="iAlertServiceOrganiser"> \
+           <properties> \
+               <type>userGroup</type> \
+           </properties> \
+           <memberof>viewGateway</memberof> \
+           <memberof>editGateway</memberof> \
+           <memberof>approveGateway</memberof> \
+           <memberof>registerGateway</memberof> \
+           <memberof>associateLicenseToGateway</memberof> \
+           <memberof>iAlertAssignEngineer</memberof> \
+           <memberof>iAlertLog</memberof> \
+       </group> \
+       <group name="iAlertServiceEngineer"> \
+           <properties> \
+               <type>userGroup</type> \
+           </properties> \
+           <memberof>viewGateway</memberof> \
+           <memberof>editGateway</memberof> \
+           <memberof>approveGateway</memberof> \
+           <memberof>registerGateway</memberof> \
+           <memberof>associateLicenseToGateway</memberof> \
+           <memberof>iAlertLog</memberof> \
+       </group> \
+       <group name="TestGroup"> \
+           <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>fadianDialog</memberof> \
+           <memberof>iAlertAssignEngineer</memberof> \
+           <memberof>iAlertManageUsers</memberof> \
+           <memberof>iAlertLog</memberof> \
+           <memberof>mock</memberof> \
+       </group> \
+       <group name="Gateway Operator"> \
+           <properties> \
+               <type>userGroup</type> \
+           </properties> \
+           <memberof>viewBundle</memberof> \
+           <memberof>viewGroup</memberof> \
+           <memberof>viewLicense</memberof> \
+           <memberof>viewGateway</memberof> \
+           <memberof>approveGateway</memberof> \
+       </group> \
+       <group name="License 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> \
+       </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> \
+       </group> \
+       <group name="Gateway 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> \
+       </group> \
+       <group name="Fadian Operator"> \
+           <properties> \
+               <type>userGroup</type> \
+           </properties> \
+           <memberof>viewLicense</memberof> \
+           <memberof>viewGateway</memberof> \
+           <memberof>associateLicenseToGateway</memberof> \
+           <memberof>approveGateway</memberof> \
+           <memberof>fadianDialog</memberof> \
+       </group> \
+       <group name="Fadian 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>createLicense</memberof> \
+           <memberof>editLicense</memberof> \
+           <memberof>removeLicense</memberof> \
+           <memberof>associateBundleToGroup</memberof> \
+           <memberof>associateGroupToLicense</memberof> \
+           <memberof>associateLicenseToGateway</memberof> \
+           <memberof>removeBundleToGroupAssociation</memberof> \
+           <memberof>removeGroupToLicenseAssociation</memberof> \
+           <memberof>removeLicenseToGatewayAssociation</memberof> \
+           <memberof>viewGroup</memberof> \
+           <memberof>editGroup</memberof> \
+           <memberof>viewLicense</memberof> \
+           <memberof>viewGateway</memberof> \
+       </group> \
+           <group name="External License 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>fadianDialog</memberof> \
+           <memberof>iAlertAssignEngineer</memberof> \
+           <memberof>iAlertManageUsers</memberof> \
+           <memberof>iAlertLog</memberof> \
+           <memberof>mock</memberof> \
+       </group> \
+       <user name="d"> \
+           <properties> \
+               <username>d</username> \
+           </properties> \
+           <credentials> \
+               <password>f</password> \
+           </credentials> \
+           <memberof>TestGroup</memberof> \
+       </user> \
+       <user name="lm"> \
+           <properties> \
+               <username>lm</username> \
+           </properties> \
+           <credentials> \
+               <password>lm</password> \
+           </credentials> \
+           <memberof>License Manager</memberof> \
+       </user> \
+       <user name="go"> \
+           <properties> \
+               <username>go</username> \
+           </properties> \
+           <credentials> \
+               <password>go</password> \
+           </credentials> \
+           <memberof>Gateway Operator</memberof> \
+       </user> \
+       <user name="rm"> \
+           <properties> \
+               <username>rm</username> \
+           </properties> \
+           <credentials> \
+               <password>rm</password> \
+           </credentials> \
+           <memberof>Release Manager</memberof> \
+       </user> \
+       <user name="gm"> \
+           <properties> \
+               <username>gm</username> \
+           </properties> \
+           <credentials> \
+               <password>gm</password> \
+           </credentials> \
+           <memberof>Gateway Manager</memberof> \
+       </user> \
+       <user name="fadian"> \
+           <properties> \
+               <username>fadian</username> \
+           </properties> \
+           <credentials> \
+               <password>fad!an</password> \
+           </credentials> \
+           <memberof>Fadian Operator</memberof> \
+       </user> \
+       <user name="fadianrm"> \
+           <properties> \
+               <username>fadianrm</username> \
+           </properties> \
+           <credentials> \
+               <password>fad!an</password> \
+           </credentials> \
+           <memberof>Fadian Release Manager</memberof> \
+       </user> \
+       <user name="admin"> \
+           <properties> \
+               <username>admin</username> \
+           </properties> \
+           <credentials> \
+               <password>admin</password> \
+           </credentials> \
+           <memberof>iAlertAdmin</memberof> \
+       </user> \
+       <user name="organiser"> \
+           <properties> \
+               <username>organiser</username> \
+           </properties> \
+           <credentials> \
+               <password>organiser</password> \
+           </credentials> \
+           <memberof>iAlertServiceOrganiser</memberof> \
+       </user> \
+       <user name="engineer"> \
+           <properties> \
+               <username>engineer</username> \
+           </properties> \
+           <credentials> \
+               <password>engineer</password> \
+           </credentials> \
+           <memberof>iAlertServiceEngineer</memberof> \
+       </user> \
+       <user name="elm"> \
+           <properties> \
+               <username>elm</username> \
+           </properties> \
+           <credentials> \
+               <password>elm</password> \
+           </credentials> \
+           <memberof>External License Manager</memberof> \
+       </user> \
+</roles>

Added: incubator/ace/trunk/liq/conf/test-osgi/net.luminis.liq.discovery.property.cfg
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/test-osgi/net.luminis.liq.discovery.property.cfg?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/conf/test-osgi/net.luminis.liq.discovery.property.cfg (added)
+++ incubator/ace/trunk/liq/conf/test-osgi/net.luminis.liq.discovery.property.cfg Sat Jun 27 15:53:04 2009
@@ -0,0 +1 @@
+serverURL = http://localhost:8080
\ No newline at end of file

Added: incubator/ace/trunk/liq/conf/test-osgi/net.luminis.liq.gateway.identification.cfg
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/test-osgi/net.luminis.liq.gateway.identification.cfg?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/conf/test-osgi/net.luminis.liq.gateway.identification.cfg (added)
+++ incubator/ace/trunk/liq/conf/test-osgi/net.luminis.liq.gateway.identification.cfg Sat Jun 27 15:53:04 2009
@@ -0,0 +1 @@
+gatewayID = configuredGatewayID
\ No newline at end of file

Added: incubator/ace/trunk/liq/conf/test-osgi/net.luminis.liq.scheduler.cfg
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/test-osgi/net.luminis.liq.scheduler.cfg?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/conf/test-osgi/net.luminis.liq.scheduler.cfg (added)
+++ incubator/ace/trunk/liq/conf/test-osgi/net.luminis.liq.scheduler.cfg Sat Jun 27 15:53:04 2009
@@ -0,0 +1,2 @@
+auditlog = 2000
+net.luminis.liq.gateway.deploymentadmindeployer.task.DeploymentUpdateTask = 2000

Added: incubator/ace/trunk/liq/conf/test/net.luminis.liq.discovery.property.cfg
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/test/net.luminis.liq.discovery.property.cfg?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/conf/test/net.luminis.liq.discovery.property.cfg (added)
+++ incubator/ace/trunk/liq/conf/test/net.luminis.liq.discovery.property.cfg Sat Jun 27 15:53:04 2009
@@ -0,0 +1 @@
+serverURL = http://localhost:8080
\ No newline at end of file

Added: incubator/ace/trunk/liq/conf/test/net.luminis.liq.gateway.identification.cfg
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/test/net.luminis.liq.gateway.identification.cfg?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/conf/test/net.luminis.liq.gateway.identification.cfg (added)
+++ incubator/ace/trunk/liq/conf/test/net.luminis.liq.gateway.identification.cfg Sat Jun 27 15:53:04 2009
@@ -0,0 +1 @@
+gatewayID = configuredGatewayID
\ No newline at end of file

Added: incubator/ace/trunk/liq/conf/test/net.luminis.liq.scheduler.cfg
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/conf/test/net.luminis.liq.scheduler.cfg?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/conf/test/net.luminis.liq.scheduler.cfg (added)
+++ incubator/ace/trunk/liq/conf/test/net.luminis.liq.scheduler.cfg Sat Jun 27 15:53:04 2009
@@ -0,0 +1,2 @@
+auditlog = 2000
+net.luminis.liq.gateway.deploymentadmindeployer.task.DeploymentUpdateTask = 2000

Added: incubator/ace/trunk/liq/ext/SwingHelper.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/ext/SwingHelper.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/ext/SwingHelper.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/ext/forms-1.0.7.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/ext/forms-1.0.7.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/ext/forms-1.0.7.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/ext/javax.servlet.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/ext/javax.servlet.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/ext/javax.servlet.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/ext/jcalendar-1.3.2.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/ext/jcalendar-1.3.2.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/ext/jcalendar-1.3.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/ext/kxml2-min.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/ext/kxml2-min.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/ext/kxml2-min.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/ext/mail.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/ext/mail.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/ext/mail.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/ext/miglayout15-swing.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/ext/miglayout15-swing.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/ext/miglayout15-swing.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/ext/org.apache.felix.dependencymanager.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/ext/org.apache.felix.dependencymanager.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/ext/org.apache.felix.dependencymanager.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/ext/org.apache.felix.dependencymanager.shell.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/ext/org.apache.felix.dependencymanager.shell.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/ext/org.apache.felix.dependencymanager.shell.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/ext/org.osgi.compendium.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/ext/org.osgi.compendium.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/ext/org.osgi.compendium.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/ext/org.osgi.core.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/ext/org.osgi.core.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/ext/org.osgi.core.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/ext/org.osgi.service.obr-1.1.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/ext/org.osgi.service.obr-1.1.0-SNAPSHOT.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/ext/org.osgi.service.obr-1.1.0-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/ext/osgi.mobile.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/ext/osgi.mobile.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/ext/osgi.mobile.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/ext/swingx-2007_03_18.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/ext/swingx-2007_03_18.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/ext/swingx-2007_03_18.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/ext/velocity-dep-1.5.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/ext/velocity-dep-1.5.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/ext/velocity-dep-1.5.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/ext/xstream-1.3.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/ext/xstream-1.3.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/ext/xstream-1.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/activation.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/activation.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/activation.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/ant-contrib-1.0b3.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/ant-contrib-1.0b3.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/ant-contrib-1.0b3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/ant.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/ant.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/ant.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/ecj.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/ecj.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/ecj.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/felix/1.4.1/bin/felix.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/felix/1.4.1/bin/felix.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/felix/1.4.1/bin/felix.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/felix/1.4.1/bundle/org.apache.felix.bundlerepository-1.2.1.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/felix/1.4.1/bundle/org.apache.felix.bundlerepository-1.2.1.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/felix/1.4.1/bundle/org.apache.felix.bundlerepository-1.2.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/felix/1.4.1/bundle/org.apache.felix.shell-1.0.2.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/felix/1.4.1/bundle/org.apache.felix.shell-1.0.2.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/felix/1.4.1/bundle/org.apache.felix.shell-1.0.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/felix/1.4.1/bundle/org.apache.felix.shell.tui-1.0.2.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/felix/1.4.1/bundle/org.apache.felix.shell.tui-1.0.2.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/felix/1.4.1/bundle/org.apache.felix.shell.tui-1.0.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/felix/1.4.1/conf/config.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/felix/1.4.1/conf/config.properties?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/lib/felix/1.4.1/conf/config.properties (added)
+++ incubator/ace/trunk/liq/lib/felix/1.4.1/conf/config.properties Sat Jun 27 15:53:04 2009
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#
+# Framework config properties.
+#org.osgi.framework.system.packages.extra=
+
+org.osgi.framework.bootdelegation=sun.*,com.sun.*
+
+felix.auto.start.1=@bundles@
+org.osgi.framework.storage=cache
+@properties@

Added: incubator/ace/trunk/liq/lib/felix/1.4.1/conf/dev-config.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/felix/1.4.1/conf/dev-config.properties?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/lib/felix/1.4.1/conf/dev-config.properties (added)
+++ incubator/ace/trunk/liq/lib/felix/1.4.1/conf/dev-config.properties Sat Jun 27 15:53:04 2009
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#
+# Framework config properties.
+#org.osgi.framework.system.packages.extra=
+
+org.osgi.framework.bootdelegation=sun.*,com.sun.*
+
+felix.auto.start.1=@bundles@
+org.osgi.framework.storage=cache
+@properties@

Added: incubator/ace/trunk/liq/lib/felix/1.4.1/conf/test-config.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/felix/1.4.1/conf/test-config.properties?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/lib/felix/1.4.1/conf/test-config.properties (added)
+++ incubator/ace/trunk/liq/lib/felix/1.4.1/conf/test-config.properties Sat Jun 27 15:53:04 2009
@@ -0,0 +1,110 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#
+# Framework config properties.
+#
+org.osgi.framework.system.packages.extra= ${testng}, \
+ ${cobertura} 
+
+org.osgi.framework.bootdelegation=sun.*,com.sun.*
+
+felix.auto.start.1=${test-bundles}
+org.osgi.framework.storage=cache
+
+#framework.service.urlhandlers=false
+
+#
+# Bundle config properties.
+#
+
+org.osgi.service.http.port=8080
+
+#obr.shell.telnet=on
+#obr.repository.url=http://bundles.osgi.org/obr/browse?_xml=1&cmd=repository
+
+#
+# TestNG 5.5
+#
+testng=com; \
+com.beust; \
+com.beust.testng; \
+org; \
+org.testng; \
+org.testng.annotations; \
+org.testng.internal; \
+org.testng.internal.annotations; \
+org.testng.internal.remote; \
+org.testng.internal.thread; \
+org.testng.internal.version; \
+org.testng.junit; \
+org.testng.log; \
+org.testng.log4testng; \
+org.testng.remote; \
+org.testng.remote.strprotocol; \
+org.testng.reporters; \
+org.testng.reporters.util; \
+org.testng.xml; \
+bsh; \
+bsh.classpath; \
+bsh.collection; \
+bsh.commands; \
+bsh.org; \
+bsh.org.objectweb; \
+bsh.org.objectweb.asm; \
+bsh.reflect; \
+bsh.servlet; \
+bsh.util; \
+bsh.util.lib; \
+com.thoughtworks; \
+com.thoughtworks.qdox; \
+com.thoughtworks.qdox.ant; \
+com.thoughtworks.qdox.directorywalker; \
+com.thoughtworks.qdox.junit; \
+com.thoughtworks.qdox.model; \
+com.thoughtworks.qdox.model.util; \
+com.thoughtworks.qdox.parser; \
+com.thoughtworks.qdox.parser.impl; \
+com.thoughtworks.qdox.parser.structs; \
+com.thoughtworks.qdox.tools; \
+version="5.5"
+
+#
+# Cobertura
+#
+cobertura=net.sourceforge; \
+net.sourceforge.cobertura; \
+net.sourceforge.cobertura.ant; \
+net.sourceforge.cobertura.check; \
+net.sourceforge.cobertura.coveragedata; \
+net.sourceforge.cobertura.instrument; \
+net.sourceforge.cobertura.javancss; \
+net.sourceforge.cobertura.merge; \
+net.sourceforge.cobertura.reporting; \
+net.sourceforge.cobertura.reporting.html.files; \
+net.sourceforge.cobertura.util; \
+org.objectweb.asm; \
+org.objectweb.asm.signature; \
+org.apache.oro; \
+org.apache.oro.io; \
+org.apache.oro.text; \
+org.apache.oro.text.regex; \
+org.apache.oro.text.awk; \
+org.apache.oro.text.perl; \
+org.apache.oro.util; \
+org.apache.log4j; \
+version="1.0"

Added: incubator/ace/trunk/liq/lib/http.jetty.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/http.jetty.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/http.jetty.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/log_all-2.0.0.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/log_all-2.0.0.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/log_all-2.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/net.luminis.build.plugin.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/net.luminis.build.plugin.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/net.luminis.build.plugin.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/net.luminis.liq.xstream-1.3.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/net.luminis.liq.xstream-1.3.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/net.luminis.liq.xstream-1.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/org.apache.felix.configadmin.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/org.apache.felix.configadmin.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/org.apache.felix.configadmin.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/org.apache.felix.eventadmin.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/org.apache.felix.eventadmin.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/org.apache.felix.eventadmin.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/org.apache.felix.prefs.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/org.apache.felix.prefs.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/org.apache.felix.prefs.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/org.apache.felix.upnp.basedriver-0.8.0.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/org.apache.felix.upnp.basedriver-0.8.0.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/org.apache.felix.upnp.basedriver-0.8.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/org.osgi.foundation.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/org.osgi.foundation.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/org.osgi.foundation.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/run-multigateways.sh
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/run-multigateways.sh?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/lib/run-multigateways.sh (added)
+++ incubator/ace/trunk/liq/lib/run-multigateways.sh Sat Jun 27 15:53:04 2009
@@ -0,0 +1,26 @@
+#!/bin/sh
+startnr=$1
+currentNr=$startnr
+nrOfGateway=$2
+max=`expr $startnr + $nrOfGateway`
+LIMIT=$max
+DIRNAME=`dirname $0`   
+
+if [ $# -ne 2 ]
+then
+    echo "Usage: `basename $0` startnr number_of_framework_instances"
+    exit 1
+fi
+
+instances="instances="
+while [ "$currentNr" -lt "$LIMIT" ]
+do
+    instances=$instances"gateway-"$currentNr","
+    currentNr=`expr $currentNr + 1`
+done
+echo "Starting framework"
+# startDate=`date`
+cd $DIRNAME
+java -jar multigatewaybootstrap.jar bundle ${instances%,*} > output-felix.txt 2>&1
+
+exit 0
\ No newline at end of file

Added: incubator/ace/trunk/liq/lib/servicebased.circle-1.0.0.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/servicebased.circle-1.0.0.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/servicebased.circle-1.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/servicebased.host-1.0.0.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/servicebased.host-1.0.0.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/servicebased.host-1.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/servicebased.square-1.0.0.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/servicebased.square-1.0.0.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/servicebased.square-1.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/servicebased.triangle-1.0.0.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/servicebased.triangle-1.0.0.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/servicebased.triangle-1.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/useradmin_all-2.0.0.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/useradmin_all-2.0.0.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/useradmin_all-2.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/xstream-build/1.3/build.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/xstream-build/1.3/build.xml?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/lib/xstream-build/1.3/build.xml (added)
+++ incubator/ace/trunk/liq/lib/xstream-build/1.3/build.xml Sat Jun 27 15:53:04 2009
@@ -0,0 +1,21 @@
+<project name="build" default="all">
+<path id="classpath">
+      <pathelement path="."/>
+</path>
+<taskdef name="bundle"
+        classname="net.luminis.build.plugin.bnd.BuildTask"
+        classpath="../../net.luminis.build.plugin.jar" />
+<target name="all">
+<zip destfile="xom-1.1-patched.jar"><zipfileset src="xom-1.1.jar" excludes="**/UnicodeUtil.class"/></zip>
+<bundle classpathrefid="classpath" 
+            bundlesymbolicname="net.luminis.liq.xstream" bundleversion="1.3" 
+            bundlename="XStream" outputdir="." 
+            exportpackage="com.thoughtworks.xstream.*"
+            importpackage="org.w3c.*, org.xml.*, !., com.thoughtworks.xstream.*, *;resolution:=optional"
+            bundleclasspath="cglib-nodep-2.1_3.jar,dom4j-1.6.1.jar,jdom-1.0.jar,jettison-1.0-RC2.jar,joda-time-1.5.1.jar,stax-1.2.0.jar,stax-api-1.0.1.jar,wstx-asl-3.2.3.jar,xml-writer-0.2.jar,xom-1.1.jar,xpp3_min-1.1.4c.jar,xstream-1.3.jar,xstream-benchmark-1.3.jar" 
+            includeresource="cglib-nodep-2.1_3.jar,dom4j-1.6.1.jar,jdom-1.0.jar,jettison-1.0-RC2.jar,joda-time-1.5.1.jar,stax-1.2.0.jar,stax-api-1.0.1.jar,wstx-asl-3.2.3.jar,xml-writer-0.2.jar,xom-1.1.jar=xom-1.1-patched.jar,xpp3_min-1.1.4c.jar,xstream-1.3.jar,xstream-benchmark-1.3.jar"/>
+                
+<jar file="net.luminis.liq.xstream-1.3.jar" update="true"><include name="xom-1.1.jar"/></jar>
+<delete file="xom-1.1-patched.jar"/>
+</target>
+</project>

Added: incubator/ace/trunk/liq/lib/xstream-build/1.3/cglib-nodep-2.1_3.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/xstream-build/1.3/cglib-nodep-2.1_3.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/xstream-build/1.3/cglib-nodep-2.1_3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/xstream-build/1.3/dom4j-1.6.1.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/xstream-build/1.3/dom4j-1.6.1.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/xstream-build/1.3/dom4j-1.6.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/xstream-build/1.3/jdom-1.0.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/xstream-build/1.3/jdom-1.0.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/xstream-build/1.3/jdom-1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/xstream-build/1.3/jettison-1.0-RC2.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/xstream-build/1.3/jettison-1.0-RC2.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/xstream-build/1.3/jettison-1.0-RC2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/xstream-build/1.3/joda-time-1.5.1.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/xstream-build/1.3/joda-time-1.5.1.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/xstream-build/1.3/joda-time-1.5.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/xstream-build/1.3/stax-1.2.0.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/xstream-build/1.3/stax-1.2.0.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/xstream-build/1.3/stax-1.2.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/xstream-build/1.3/stax-api-1.0.1.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/xstream-build/1.3/stax-api-1.0.1.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/xstream-build/1.3/stax-api-1.0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/xstream-build/1.3/wstx-asl-3.2.3.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/xstream-build/1.3/wstx-asl-3.2.3.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/xstream-build/1.3/wstx-asl-3.2.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/xstream-build/1.3/xml-writer-0.2.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/xstream-build/1.3/xml-writer-0.2.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/xstream-build/1.3/xml-writer-0.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/xstream-build/1.3/xom-1.1.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/xstream-build/1.3/xom-1.1.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/xstream-build/1.3/xom-1.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/xstream-build/1.3/xpp3_min-1.1.4c.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/xstream-build/1.3/xpp3_min-1.1.4c.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/xstream-build/1.3/xpp3_min-1.1.4c.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/xstream-build/1.3/xstream-1.3.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/xstream-build/1.3/xstream-1.3.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/xstream-build/1.3/xstream-1.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/xstream-build/1.3/xstream-benchmark-1.3.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/xstream-build/1.3/xstream-benchmark-1.3.jar?rev=788992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/xstream-build/1.3/xstream-benchmark-1.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/project.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/project.properties?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/project.properties (added)
+++ incubator/ace/trunk/liq/project.properties Sat Jun 27 15:53:04 2009
@@ -0,0 +1 @@
+failonerror.property=false

Added: incubator/ace/trunk/liq/src/net/luminis/liq/consolelogger/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/consolelogger/Activator.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/consolelogger/Activator.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/consolelogger/Activator.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,18 @@
+package net.luminis.liq.consolelogger;
+
+import org.apache.felix.dependencymanager.DependencyActivatorBase;
+import org.apache.felix.dependencymanager.DependencyManager;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.log.LogService;
+
+public class Activator extends DependencyActivatorBase {
+    public void init(BundleContext context, DependencyManager manager) throws Exception {
+        manager.add(createService()
+            .setInterface(LogService.class.getName(), null)
+            .setImplementation(Logger.class)
+        );
+    }
+
+    public void destroy(BundleContext context, DependencyManager manager) throws Exception {
+    }
+}

Added: incubator/ace/trunk/liq/src/net/luminis/liq/consolelogger/Logger.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/consolelogger/Logger.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/consolelogger/Logger.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/consolelogger/Logger.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,50 @@
+package net.luminis.liq.consolelogger;
+
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
+
+public class Logger implements LogService {
+    private static String[] LEVEL = { "", "Error", "Warn ", "Info ", "Debug" };
+
+    public void log(int level, String message) {
+        log(null, level, message, null);
+    }
+
+    public void log(int level, String message, Throwable throwable) {
+        log(null, level, message, throwable);
+    }
+
+    public void log(ServiceReference reference, int level, String message) {
+        log(reference, level, message, null);
+    }
+
+    public void log(ServiceReference reference, int level, String message, Throwable throwable) {
+        String bundle = " [   ]";
+        String service = " ";
+        if (reference != null) {
+            bundle = "00" + reference.getBundle().getBundleId();
+            bundle = " [" + bundle.substring(bundle.length() - 3) + "]";
+            Object objectClass = reference.getProperty(Constants.OBJECTCLASS);
+            if (objectClass instanceof String[]) {
+                StringBuffer buffer = new StringBuffer();
+                String[] objClassArr = ((String[]) objectClass);
+                for (int i = 0; i < objClassArr.length; i++) {
+                    String svc = objClassArr[i];
+                    if (buffer.length() > 0) {
+                        buffer.append(';');
+                    }
+                    buffer.append(svc);
+                    service = buffer.toString() + ": ";
+                }
+            }
+            else {
+                service = objectClass.toString() + ": ";
+            }
+        }
+        System.out.println("[" + LEVEL[level] + "]" + bundle + service + message);
+        if (throwable != null) {
+            throwable.printStackTrace();
+        }
+    }
+}

Added: incubator/ace/trunk/liq/src/net/luminis/liq/discovery/Discovery.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/discovery/Discovery.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/discovery/Discovery.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/discovery/Discovery.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,17 @@
+package net.luminis.liq.discovery;
+
+import java.net.URL;
+
+/**
+ * The <code>Discovery</code> interface can be used to locate the Provisioning Server.
+ */
+public interface Discovery {
+
+    /**
+     * Discovers the location of the Provisioning Server.
+     *
+     * @return URL pointing to the base address of the Provisioning Server
+     */
+    public URL discover();
+
+}

Added: incubator/ace/trunk/liq/src/net/luminis/liq/identification/Identification.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/identification/Identification.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/identification/Identification.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/identification/Identification.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,18 @@
+package net.luminis.liq.identification;
+
+
+/**
+ * The <code>Identification</code> can be used to identify the system it is running on. This
+ * identification is both unique and should not change. Nevertheless, don't cache the value
+ * but simply ask this service when you need it.
+ */
+public interface Identification {
+
+    /**
+     * Returns the identification of the system.
+     *
+     * @return the identification, or <code>null</code> if the identification could not be obtained
+     */
+    public String getID();
+
+}

Added: incubator/ace/trunk/liq/src/net/luminis/liq/log/AlertEvent.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/log/AlertEvent.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/log/AlertEvent.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/log/AlertEvent.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,40 @@
+package net.luminis.liq.log;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+public interface AlertEvent {
+	
+    public static final String KEY_TYPE = "type";
+    public static final String KEY_TIMESTAMP = "timestamp";
+    public static final String KEY_USER = "user";
+    public static final String KEY_MSG = "message";
+    public static final DateFormat DATE_FORMAT = new SimpleDateFormat("d/m/yyyy h:mm:ss a");
+
+    public static final int BASE = 0;
+
+    /**
+     * When SuperQ produces logging info, this event is logged with the following properties:
+     * <dl>
+     * <dt>id</dt>
+     * <dd>Error Number</dd>
+     * <dt>date</dt>
+     * <dd>Date the event occurred, in format: <pre>d/m/yyyy h:mm:ss a</pre></dd>
+     * <dt>user</dt>
+     * <dd>The related user</dd>
+     * <dt>message</dt>
+     * <dd>Textual description of the event</dd>
+     * </dl>
+     */
+    public static final int SUPERQ = (BASE + 1);
+    
+    /**
+     * When SuperQ produces logging info in a format that is not valid or recognized, this event
+     * is logged with the following properties:
+     * <dl>
+     * <dt>message</dt>
+     * <dd>The raw message that could not be recognized</dd>
+     * </dl>
+     */
+    public static final int SUPERQ_UNKNOWNFORMAT = (BASE + 2);
+}

Added: incubator/ace/trunk/liq/src/net/luminis/liq/log/AuditEvent.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/log/AuditEvent.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/log/AuditEvent.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/log/AuditEvent.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,231 @@
+package net.luminis.liq.log;
+
+/**
+ * Audit log event.
+ */
+public interface AuditEvent {
+    
+    public static final String KEY_ID = "id";
+    public static final String KEY_NAME = "name";
+    public static final String KEY_VERSION = "version";
+    public static final String KEY_LOCATION = "location";
+    public static final String KEY_MSG = "msg";
+    public static final String KEY_TYPE = "type";
+    public static final String KEY_SUCCESS = "success";
+    public static final long VALUE_FADIAN_LOGID = 0;
+    
+    public static final int BUNDLE_BASE = 0;
+
+    /**
+     * When a bundle is installed, this event is logged with the following properties:
+     * <dl>
+     * <dt>id</dt>
+     * <dd>bundle identifier</dd>
+     * <dt>name</dt>
+     * <dd>symbolic name (if present)</dd>
+     * <dt>version</dt>
+     * <dd>bundle version</dd>
+     * <dt>location</dt>
+     * <dd>bundle location</dd>
+     * </dl>
+     */
+    public static final int BUNDLE_INSTALLED = (BUNDLE_BASE + 1);
+
+    /**
+     * When a bundle is resolved, this event is logged with the following properties:
+     * <dl>
+     * <dt>id</dt>
+     * <dd>bundle identifier</dd>
+     * </dl>
+     */
+    public static final int BUNDLE_RESOLVED = (BUNDLE_BASE + 2);
+
+    /**
+     * When a bundle is started, this event is logged with the following properties:
+     * <dl>
+     * <dt>id</dt>
+     * <dd>bundle identifier</dd>
+     * </dl>
+     */
+    public static final int BUNDLE_STARTED = (BUNDLE_BASE + 3);
+
+    /**
+     * When a bundle is stopped, this event is logged with the following properties:
+     * <dl>
+     * <dt>id</dt>
+     * <dd>bundle identifier</dd>
+     * </dl>
+     */
+    public static final int BUNDLE_STOPPED = (BUNDLE_BASE + 4);
+
+    /**
+     * When a bundle is unresolved, this event is logged with the following properties:
+     * <dl>
+     * <dt>id</dt>
+     * <dd>bundle identifier</dd>
+     * </dl>
+     */
+    public static final int BUNDLE_UNRESOLVED = (BUNDLE_BASE + 5);
+
+    /**
+     * When a bundle is updated, this event is logged with the following properties:
+     * <dl>
+     * <dt>id</dt>
+     * <dd>bundle identifier</dd>
+     * <dt>version</dt>
+     * <dd>bundle version</dd>
+     * <dt>location</dt>
+     * <dd>bundle location</dd>
+     * </dl>
+     */
+    public static final int BUNDLE_UPDATED = (BUNDLE_BASE + 6);
+    
+    /**
+     * When a bundle is uninstalled, this event is logged with the following properties:
+     * <dl>
+     * <dt>id</dt>
+     * <dd>bundle identifier</dd>
+     * </dl>
+     */
+    public static final int BUNDLE_UNINSTALLED = (BUNDLE_BASE + 7);
+    
+    /**
+     * When a bundle is starting, this event is logged with the following properties:
+     * <dl>
+     * <dt>id</dt>
+     * <dd>bundle identifier</dd>
+     * </dl>
+     */
+    public static final int BUNDLE_STARTING = (BUNDLE_BASE + 8);
+
+    /**
+     * When a bundle is stopping, this event is logged with the following properties:
+     * <dl>
+     * <dt>id</dt>
+     * <dd>bundle identifier</dd>
+     * </dl>
+     */
+    public static final int BUNDLE_STOPPING = (BUNDLE_BASE + 9);
+
+
+
+    public static final int FRAMEWORK_BASE = 1000;
+
+    /**
+     * When a framework info message occurs, this event is logged with the following properties:
+     * <dl>
+     * <dt>id</dt>
+     * <dd>bundle identifier (if present)</dd>
+     * <dt>msg</dt>
+     * <dd>the error message (if present)</dd>
+     * <dt>type</dt>
+     * <dd>the fully qualified error type (if present)</dd>
+     * </dl>
+     */
+    public static final int FRAMEWORK_INFO = (FRAMEWORK_BASE + 1);
+
+    /**
+     * When a framework warning message occurs, this event is logged with the following properties:
+     * <dl>
+     * <dt>id</dt>
+     * <dd>bundle identifier (if present)</dd>
+     * <dt>msg</dt>
+     * <dd>the error message (if present)</dd>
+     * <dt>type</dt>
+     * <dd>the fully qualified error type (if present)</dd>
+     * </dl>
+     */
+    public static final int FRAMEWORK_WARNING = (FRAMEWORK_BASE + 2);
+
+    /**
+     * When a framework error message occurs, this event is logged with the following properties:
+     * <dl>
+     * <dt>id</dt>
+     * <dd>bundle identifier (if present)</dd>
+     * <dt>msg</dt>
+     * <dd>the error message (if present)</dd>
+     * <dt>type</dt>
+     * <dd>the fully qualified error type (if present)</dd>
+     * </dl>
+     */
+    public static final int FRAMEWORK_ERROR = (FRAMEWORK_BASE + 3);
+
+    /**
+     * When a framework refresh occurs, this event is logged.
+     */
+    public static final int FRAMEWORK_REFRESH = (FRAMEWORK_BASE + 4);
+
+    /**
+     * When a framework start occurs, this event is logged.
+     */
+    public static final int FRAMEWORK_STARTED = (FRAMEWORK_BASE + 5);
+
+    /**
+     * When a framework start level change occurs, this event is logged.
+     */
+    public static final int FRAMEWORK_STARTLEVEL = (FRAMEWORK_BASE + 6);
+
+    public static final int DEPLOYMENTADMIN_BASE = 2000;
+
+    /**
+     * When a deployment package is installed, this event is logged with the following properties:
+     * <dl>
+     * <dt>name</dt>
+     * <dd>deployment package symbolic name</dd>
+     * </dl>
+     */
+    public static final int DEPLOYMENTADMIN_INSTALL = (DEPLOYMENTADMIN_BASE + 1);
+
+    /**
+     * When a deployment package is uninstalled, this event is logged with the following properties:
+     * <dl>
+     * <dt>name</dt>
+     * <dd>deployment package symbolic name</dd>
+     * </dl>
+     */
+    public static final int DEPLOYMENTADMIN_UNINSTALL = (DEPLOYMENTADMIN_BASE + 2);
+
+    /**
+     * When a deployment package operation has completed, this event is logged with the following properties:
+     * <dl>
+     * <dt>name</dt>
+     * <dd>deployment package symbolic name</dd>
+     * <dt>success</dt>
+     * <dd>whether the operation was successful or not</dd>
+     * <dt>version</dt>
+     * <dd>deployment package version</dd>
+     * </dl>
+     */
+    public static final int DEPLOYMENTADMIN_COMPLETE = (DEPLOYMENTADMIN_BASE + 3);
+
+    public static final int DEPLOYMENTCONTROL_BASE = 3000;
+    
+    /**
+     * Before a deployment package install begins, this event is logged with the following properties:
+     * <dl>
+     * <dt>url</dt>
+     * <dd>deployment package url</dd>
+     * <dt>version</dt>
+     * <dd>deployment package version</dd>
+     * </dl>
+     */
+    public static final int DEPLOYMENTCONTROL_INSTALL = (DEPLOYMENTCONTROL_BASE + 1);
+    
+    public static final int FADIAN_BASE = 4000;
+    
+    /**
+     * This event is logged when a FADIAN device has completed it's network boot phase.
+     */
+    public static final int FADIAN_READYNETBOOT = (FADIAN_BASE + 1);
+
+    /**
+     * This event is logged when a FADIAN device has completed it's operating system phase.
+     */
+    public static final int FADIAN_READYOS = (FADIAN_BASE + 2);
+
+    /**
+     * This event is logged when a FADIAN device has completed it's middleware phase.
+     */
+    public static final int FADIAN_READYMIDDLEWARE = (FADIAN_BASE + 3);
+    
+}

Added: incubator/ace/trunk/liq/src/net/luminis/liq/log/Log.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/log/Log.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/log/Log.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/log/Log.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,16 @@
+package net.luminis.liq.log;
+
+import java.util.Dictionary;
+
+/**
+ * Log interface.
+ */
+public interface Log {
+    /**
+     * Logs a new message to the log.
+     * 
+     * @param type
+     * @param properties
+     */
+    public void log(int type, Dictionary properties);
+}

Added: incubator/ace/trunk/liq/src/net/luminis/liq/log/LogDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/log/LogDescriptor.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/log/LogDescriptor.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/log/LogDescriptor.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,105 @@
+package net.luminis.liq.log;
+
+import java.util.NoSuchElementException;
+import java.util.StringTokenizer;
+
+import net.luminis.liq.repository.SortedRangeSet;
+import net.luminis.liq.util.Codec;
+
+
+/**
+ * Instances of this class represent a range of log events. Such a range is defined by:
+ * <ul>
+ * <li>A unique gateway ID</li>
+ * <li>A log ID unique for this gateway</li>
+ * <li>A set of event IDs</li>
+ * </ul>
+ */
+public class LogDescriptor {
+    
+    private final SortedRangeSet m_rangeSet;
+    private final long m_logID;
+    private final String m_gatewayID;
+
+    /**
+     * Create a log event range.
+     * 
+     * @param gatewayID The unique gateway ID
+     * @param logID The unique log ID for this gateway
+     * @param rangeSet The set of event IDs
+     */
+    public LogDescriptor(String gatewayID, long logID, SortedRangeSet rangeSet) {
+        m_gatewayID = gatewayID;
+        m_logID = logID;
+        m_rangeSet = rangeSet;
+    }
+    
+    /**
+     * Create a log event range from a string representation. String representations
+     * should be formatted as "gatewayID,logID,eventIDs" where each substring is formatted
+     * using <code>Codec.encode(string)</code> method.
+     * 
+     * Throws an <code>IllegalArgumentException</code> when the string representation is not correctly formatted.
+     * 
+     * @param representation String representation of the log event range
+     */
+    public LogDescriptor(String representation) {
+        try {
+            StringTokenizer st = new StringTokenizer(representation, ",");
+            m_gatewayID = Codec.decode(st.nextToken());
+            m_logID = Long.parseLong(st.nextToken());
+            String rangeSet = "";
+            if (st.hasMoreTokens()) {
+                rangeSet = st.nextToken();
+            }
+            m_rangeSet = new SortedRangeSet(Codec.decode(rangeSet));
+        }
+        catch (NoSuchElementException e) {
+            throw new IllegalArgumentException("Could not create range from: " + representation);
+        }
+    }
+
+    /**
+     * Get the unique gateway identifier.
+     * 
+     * @return Unique gateway identifier.
+     */
+    public String getGatewayID() {
+        return m_gatewayID;
+    }
+
+    /**
+     * Get the unique log identifier for this gateway.
+     * 
+     * @return Unique log identifier for this gateway.
+     */
+    public long getLogID() {
+        return m_logID;
+    }
+
+    /**
+     * Get the range set of the log event range.
+     * 
+     * @return The range set
+     */
+    public SortedRangeSet getRangeSet() {
+        return m_rangeSet;
+    }
+    
+    /**
+     * Get a string representation of the log event range. String representations
+     * generated by this method can be used to construct new <code>LogDescriptor</code> instances.
+     * 
+     * @return A string representation of the log event range
+     */
+    public String toRepresentation() {
+        StringBuffer result = new StringBuffer();
+        result.append(Codec.encode(m_gatewayID));
+        result.append(',');
+        result.append(m_logID);
+        result.append(',');
+        result.append(Codec.encode(m_rangeSet.toRepresentation()));
+        return result.toString();
+    }
+    
+}

Added: incubator/ace/trunk/liq/src/net/luminis/liq/log/LogEvent.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/log/LogEvent.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/log/LogEvent.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/log/LogEvent.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,152 @@
+package net.luminis.liq.log;
+
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import net.luminis.liq.util.Codec;
+
+/**
+ * Log event.
+ */
+public class LogEvent implements Comparable {
+    
+    private final String m_gatewayID;
+    private final long m_logID;
+    private final long m_id;
+    private final long m_time;
+    private final int m_type;
+    private final Dictionary m_properties;
+
+    public LogEvent(String gatewayID, long logID, long id, long time,
+        int type, Dictionary properties) {
+        m_gatewayID = gatewayID;
+        m_logID = logID;
+        m_id = id;
+        m_time = time;
+        m_type = type;
+        m_properties = properties;
+    }
+
+    public LogEvent(String representation) {
+        try {
+            StringTokenizer st = new StringTokenizer(representation, ",");
+            m_gatewayID = Codec.decode(st.nextToken());
+            m_logID = Long.parseLong(st.nextToken());
+            m_id = Long.parseLong(st.nextToken());
+            m_time = Long.parseLong(st.nextToken());
+            m_type = Integer.parseInt(st.nextToken());
+            m_properties = new Properties();
+            while (st.hasMoreTokens()) {
+                m_properties.put(st.nextToken(), Codec.decode(st.nextToken()));
+            }
+        }
+        catch (Exception e) {
+            throw new IllegalArgumentException(
+                "Could not create log event from: " + representation);
+        }
+    }
+
+    public String toRepresentation() {
+        StringBuffer result = new StringBuffer();
+        result.append(Codec.encode(m_gatewayID));
+        result.append(',');
+        result.append(m_logID);
+        result.append(',');
+        result.append(m_id);
+        result.append(',');
+        result.append(m_time);
+        result.append(',');
+        result.append(m_type);
+        Enumeration e = m_properties.keys();
+        while (e.hasMoreElements()) {
+            String key = (String) e.nextElement();
+            result.append(',');
+            result.append(key);
+            result.append(',');
+            result.append(Codec.encode((String) m_properties.get(key)));
+        }
+        return result.toString();
+    }
+
+    /**
+     * Returns the unique ID of the gateway that created this event.
+     */
+    public String getGatewayID() {
+        return m_gatewayID;
+    }
+
+    /**
+     * Returns the unique log ID of the log. This ID is unique within a gateway.
+     */
+    public long getLogID() {
+        return m_logID;
+    }
+
+    /**
+     * Return the ID or sequence number of the event.
+     */
+    public long getID() {
+        return m_id;
+    }
+
+    /**
+     * Returns the timestamp of the event.
+     */
+    public long getTime() {
+        return m_time;
+    }
+
+    /**
+     * Returns the type of the event. Valid types are defined in this interface.
+     */
+    public int getType() {
+        return m_type;
+    }
+
+    /**
+     * Returns the properties of the event. Properties are restricted to simple key value pairs, only a couple of types are allowed: String, int, long, boolean (TODO what do we need?).
+     */
+    public Dictionary getProperties() {
+        return m_properties;
+    }
+
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        }
+        if (o instanceof LogEvent) {
+            LogEvent event = (LogEvent) o;
+            return m_gatewayID.equals(event.m_gatewayID)
+                && m_logID == event.m_logID && m_id == event.m_id;
+        }
+
+        return false;
+    }
+    
+    public int hashCode() {
+        return (int) (m_gatewayID.hashCode() + m_logID + m_id); 
+    }
+
+    public int compareTo(Object o) {
+        LogEvent e = (LogEvent) o;
+        final int cmp = m_gatewayID.compareTo(e.m_gatewayID);
+        if (cmp != 0) {
+            return cmp;
+        }
+        if (m_logID < e.m_logID) {
+            return -1;
+        }
+        if (m_logID > e.m_logID) {
+            return 1;
+        }
+        if (m_id < e.m_id) {
+            return -1;
+        }
+        if (m_id > e.m_id) {
+            return 1;
+        }
+        return 0;
+    }
+}

Added: incubator/ace/trunk/liq/src/net/luminis/liq/log/LogSync.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/log/LogSync.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/log/LogSync.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/log/LogSync.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,41 @@
+package net.luminis.liq.log;
+
+import java.io.IOException;
+
+/**
+ * Log synchronizing interface. It is intended to give direct access to the synchronizing
+ * possibilities of the server side log.
+ */
+public interface LogSync {
+
+    /**
+     * Pushes local changes and updates them in the remote repository.
+     * @throws IOException when there is an error communicating with the server.
+     * @return <code>true</code> when changes have been made the local log store,
+     * <code>false</code> otherwise.
+     */
+    public boolean push() throws IOException;
+    
+    /**
+     * Pulls remote changes and updates them in the local repository.
+     * @throws IOException when there is an error communicating with the server.
+     * @return <code>true</code> when changes have been made the local log store,
+     * <code>false</code> otherwise.
+     */
+    public boolean pull() throws IOException;
+    
+    /**
+     * Both pushes and pulls changes, and updates them in the both repositories.
+     * @throws IOException when there is an error communicating with the server.
+     * @return <code>true</code> when changes have been made the local log store,
+     * <code>false</code> otherwise.
+     */
+    public boolean pushpull() throws IOException;
+    
+    /**
+     * Returns the name of the log 'channel' this log sync task is assigned to.
+     * 
+     * @return The name of the log 'channel' this log sync task is assigned to.
+     */
+    public String getName();
+}

Added: incubator/ace/trunk/liq/src/net/luminis/liq/repository/Range.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/repository/Range.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/repository/Range.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/repository/Range.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,76 @@
+package net.luminis.liq.repository;
+
+/**
+ * Class that captures a simple, modifiable range.
+ */
+public class Range {
+    private long m_low;
+    private long m_high;
+    
+    public Range(String representation) {
+        int i = representation.indexOf('-');
+        if (i == -1) {
+            m_low = m_high = Long.parseLong(representation);
+        }
+        else {
+            long low = Long.parseLong(representation.substring(0, i));
+            long high = Long.parseLong(representation.substring(i + 1));
+            if (low <= high) {
+                m_low = low;
+                m_high = high;
+            }
+            else {
+                throw new IllegalArgumentException("illegal range");
+            }
+        }
+    }
+    
+    public Range(long number) {
+        m_low = m_high = number;
+    }
+    
+    public Range(long low, long high) {
+        if (low <= high) {
+            m_low = low;
+            m_high = high;
+        }
+        else {
+            throw new IllegalArgumentException("illegal range");
+        }
+    }
+    
+    public long getLow() {
+        return m_low;
+    }
+    
+    public void setLow(long low) {
+        m_low = low;
+        if (m_high < m_low) {
+            m_high = m_low;
+        }
+    }
+
+    public long getHigh() {
+        return m_high;
+    }
+    
+    public void setHigh(long high) {
+        m_high = high;
+        if (m_low > m_high) {
+            m_low = m_high;
+        }
+    }
+    
+    public boolean contains(long number) {
+        return (m_low <= number) && (m_high >= number);
+    }
+    
+    public String toRepresentation() {
+        if (m_low == m_high) {
+            return Long.toString(m_low);
+        }
+        else {
+            return Long.toString(m_low) + '-' + Long.toString(m_high);
+        }
+    }
+}

Added: incubator/ace/trunk/liq/src/net/luminis/liq/repository/RangeIterator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/repository/RangeIterator.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/repository/RangeIterator.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/repository/RangeIterator.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,57 @@
+package net.luminis.liq.repository;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+/**
+ * Iterates over a <code>SortedRangeSet</code>. Does not exactly implement
+ * the <code>Iterator</code> interface because we have <code>long</code>
+ * primitives in our collection instead of full-blown objects. This iterator
+ * is not thread-safe and results are unpredictable if the underlying set is
+ * modified.
+ */
+public class RangeIterator {
+    private final Iterator m_iterator;
+    private Range m_current;
+    private long m_number;
+    
+    RangeIterator(Iterator iterator) {
+        m_iterator = iterator;
+    }
+    
+    public boolean hasNext() {
+        if (m_current == null) {
+            return m_iterator.hasNext();
+        }
+        if (m_number == m_current.getHigh()) {
+            return m_iterator.hasNext();
+        }
+        else {
+            return true;
+        }
+    }
+    
+    public long next() {
+        if (m_current == null) {
+            if (m_iterator.hasNext()) {
+                m_current = (Range) m_iterator.next();
+                m_number = m_current.getLow();
+                return m_number;
+            }
+        }
+        else {
+            if (m_number == m_current.getHigh()) {
+                if (m_iterator.hasNext()) {
+                    m_current = (Range) m_iterator.next();
+                    m_number = m_current.getLow();
+                    return m_number;
+                }
+            }
+            else {
+                m_number++;
+                return m_number;
+            }
+        }
+        throw new NoSuchElementException();
+    }
+}



Mime
View raw message