You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2011/09/30 21:32:43 UTC
svn commit: r1177795 - in /incubator/ace/trunk: ace-deployment-task/
ace-deployment-task/src/main/java/org/apache/ace/deployment/task/
ace-deployment-task/src/main/resources/
ace-deployment-task/src/main/resources/OSGI-INF/
ace-deployment-task/src/main...
Author: marrs
Date: Fri Sep 30 19:32:42 2011
New Revision: 1177795
URL: http://svn.apache.org/viewvc?rev=1177795&view=rev
Log:
ACE-184 applied Jeremias' patch
Added:
incubator/ace/trunk/ace-deployment-task/src/main/resources/
incubator/ace/trunk/ace-deployment-task/src/main/resources/OSGI-INF/
incubator/ace/trunk/ace-deployment-task/src/main/resources/OSGI-INF/metatype/
incubator/ace/trunk/ace-deployment-task/src/main/resources/OSGI-INF/metatype/metatype.properties
incubator/ace/trunk/ace-deployment-task/src/main/resources/OSGI-INF/metatype/metatype.xml
incubator/ace/trunk/ace-discovery-property/src/main/resources/
incubator/ace/trunk/ace-discovery-property/src/main/resources/OSGI-INF/
incubator/ace/trunk/ace-discovery-property/src/main/resources/OSGI-INF/metatype/
incubator/ace/trunk/ace-discovery-property/src/main/resources/OSGI-INF/metatype/metatype.properties
incubator/ace/trunk/ace-discovery-property/src/main/resources/OSGI-INF/metatype/metatype.xml
incubator/ace/trunk/ace-gateway-log-store/src/main/resources/
incubator/ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/
incubator/ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/
incubator/ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.properties
incubator/ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.xml
incubator/ace/trunk/ace-gateway-log/src/main/resources/
incubator/ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/
incubator/ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/
incubator/ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.properties
incubator/ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.xml
incubator/ace/trunk/ace-identification-property/src/main/resources/
incubator/ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/
incubator/ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/
incubator/ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.properties
incubator/ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.xml
Modified:
incubator/ace/trunk/ace-deployment-task/pom.xml
incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java
incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogSyncConfigurator.java
incubator/ace/trunk/ace-location-upnp/src/main/java/org/apache/ace/location/upnp/Activator.java
Modified: incubator/ace/trunk/ace-deployment-task/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-task/pom.xml?rev=1177795&r1=1177794&r2=1177795&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-task/pom.xml (original)
+++ incubator/ace/trunk/ace-deployment-task/pom.xml Fri Sep 30 19:32:42 2011
@@ -33,7 +33,7 @@
<packaging>bundle</packaging>
<name>Apache ACE :: Deployment :: Task</name>
- <description />
+ <description>This bundle is responsible for checking the deployment server for updates and for synchronizing the local instance with the server.</description>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-deployment-task</connection>
Modified: incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java?rev=1177795&r1=1177794&r2=1177795&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java (original)
+++ incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java Fri Sep 30 19:32:42 2011
@@ -73,7 +73,7 @@ public class Activator extends Dependenc
String discoveryFilter;
String deploymentFilter;
- if (ma == null) {
+ if (ma == null || "".equals(ma)) {
updateSchedulerName = DeploymentUpdateTask.class.getName();
updateDescription = "Task that synchronizes the artifacts (bundles, resources) installed on this target with the server.";
checkSchedulerName = DeploymentCheckTask.class.getName();
Added: incubator/ace/trunk/ace-deployment-task/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-task/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1177795&view=auto
==============================================================================
--- incubator/ace/trunk/ace-deployment-task/src/main/resources/OSGI-INF/metatype/metatype.properties (added)
+++ incubator/ace/trunk/ace-deployment-task/src/main/resources/OSGI-INF/metatype/metatype.properties Fri Sep 30 19:32:42 2011
@@ -0,0 +1,5 @@
+service.name=Apache ACE :: Deployment :: Task
+service.desc=This component is responsible for checking the deployment server for updates and for synchronizing the local instance with the server. A new configuration is only required if there are multiple management agents.
+
+ma.name=Management Agent Name
+ma.desc=The name of the management agent that the deployment should be synchronized with.
Added: incubator/ace/trunk/ace-deployment-task/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-task/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=1177795&view=auto
==============================================================================
--- incubator/ace/trunk/ace-deployment-task/src/main/resources/OSGI-INF/metatype/metatype.xml (added)
+++ incubator/ace/trunk/ace-deployment-task/src/main/resources/OSGI-INF/metatype/metatype.xml Fri Sep 30 19:32:42 2011
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0"
+ localization="OSGI-INF/metatype/metatype">
+ <metatype:OCD id="org.apache.ace.deployment" name="%service.name" description="%service.desc">
+ <metatype:AD id="ma" type="String" name="%ma.name" description="%ma.desc" required="false"/>
+ </metatype:OCD>
+ <metatype:Designate pid="org.apache.ace.deployment.factory">
+ <metatype:Object ocdref="org.apache.ace.deployment"/>
+ </metatype:Designate>
+</metatype:MetaData>
Added: incubator/ace/trunk/ace-discovery-property/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-discovery-property/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1177795&view=auto
==============================================================================
--- incubator/ace/trunk/ace-discovery-property/src/main/resources/OSGI-INF/metatype/metatype.properties (added)
+++ incubator/ace/trunk/ace-discovery-property/src/main/resources/OSGI-INF/metatype/metatype.properties Fri Sep 30 19:32:42 2011
@@ -0,0 +1,5 @@
+service.name=Apache ACE :: Discovery :: Property Based
+service.desc=Property-based configuration for Apache ACE discovery.
+
+serverURL.name=Server URL
+serverURL.desc=The server URL (ex. http://provisioning.company.com:8080)
Added: incubator/ace/trunk/ace-discovery-property/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-discovery-property/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=1177795&view=auto
==============================================================================
--- incubator/ace/trunk/ace-discovery-property/src/main/resources/OSGI-INF/metatype/metatype.xml (added)
+++ incubator/ace/trunk/ace-discovery-property/src/main/resources/OSGI-INF/metatype/metatype.xml Fri Sep 30 19:32:42 2011
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0"
+ localization="OSGI-INF/metatype/metatype">
+ <metatype:OCD id="org.apache.ace.discovery.property" name="%service.name" description="%service.desc">
+ <metatype:AD id="serverURL" type="String" name="%serverURL.name" description="%serverURL.desc"/>
+ </metatype:OCD>
+ <metatype:Designate pid="org.apache.ace.discovery.property">
+ <metatype:Object ocdref="org.apache.ace.discovery.property"/>
+ </metatype:Designate>
+ <metatype:Designate pid="org.apache.ace.discovery.property.factory">
+ <metatype:Object ocdref="org.apache.ace.discovery.property"/>
+ </metatype:Designate>
+</metatype:MetaData>
Added: incubator/ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1177795&view=auto
==============================================================================
--- incubator/ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.properties (added)
+++ incubator/ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.properties Fri Sep 30 19:32:42 2011
@@ -0,0 +1,9 @@
+service.name=Apache ACE :: Gateway :: Log :: Store
+service.desc=Log store for a gateway.
+
+name.name=Log Store Name
+name.desc=The name of the log store.
+
+ma.name=Management Agent Name
+ma.desc=The optional name of the management agent. This is used when there are multiple management agents and this log store is to be used by a specific one.
+
Added: incubator/ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=1177795&view=auto
==============================================================================
--- incubator/ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.xml (added)
+++ incubator/ace/trunk/ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.xml Fri Sep 30 19:32:42 2011
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0"
+ localization="OSGI-INF/metatype/metatype">
+ <metatype:OCD id="org.apache.ace.gateway.log.store" name="%service.name" description="%service.desc">
+ <metatype:AD id="name" type="String" name="%name.name" description="%name.desc"/>
+ <metatype:AD id="ma" type="String" name="%ma.name" description="%ma.desc" required="false"/>
+ </metatype:OCD>
+ <metatype:Designate pid="org.apache.ace.gateway.log.store.factory"
+ factoryPid="org.apache.ace.gateway.log.store.factory">
+ <metatype:Object ocdref="org.apache.ace.gateway.log.store"/>
+ </metatype:Designate>
+</metatype:MetaData>
Modified: incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogSyncConfigurator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogSyncConfigurator.java?rev=1177795&r1=1177794&r2=1177795&view=diff
==============================================================================
--- incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogSyncConfigurator.java (original)
+++ incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogSyncConfigurator.java Fri Sep 30 19:32:42 2011
@@ -52,7 +52,7 @@ public class LogSyncConfigurator impleme
String filterForIdentification;
String schedulerName;
String description;
- if (ma == null) {
+ if (ma == null || "".equals(ma)) {
filterString = "(&("+Constants.OBJECTCLASS+"="+LogStore.class.getName()+")(name=" + name + "))";
filterForDiscovery = "(&("+Constants.OBJECTCLASS+"="+Discovery.class.getName()+")(!(ma=*)))";
filterForIdentification = "(&("+Constants.OBJECTCLASS+"="+Identification.class.getName()+")(!(ma=*)))";
Added: incubator/ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1177795&view=auto
==============================================================================
--- incubator/ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.properties (added)
+++ incubator/ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.properties Fri Sep 30 19:32:42 2011
@@ -0,0 +1,11 @@
+log.service.name=Apache ACE :: Gateway :: Log Service
+log.service.desc=Log service for a gateway. It receives log entries and stores them in a log store.
+
+sync.service.name=Apache ACE :: Gateway :: Log Synchronization Task
+sync.service.desc=Task that synchronizes a log store on the gateway with an upstream server.
+
+name.name=Log Store Name
+name.desc=The name of the log store to use.
+
+ma.name=Management Agent Name
+ma.desc=The optional name of the management agent. This is used when there are multiple management agents and this log store is to be synchronized with a specific one.
Added: incubator/ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=1177795&view=auto
==============================================================================
--- incubator/ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.xml (added)
+++ incubator/ace/trunk/ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.xml Fri Sep 30 19:32:42 2011
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0"
+ localization="OSGI-INF/metatype/metatype">
+ <metatype:OCD id="org.apache.ace.gateway.log" name="%log.service.name" description="%log.service.desc">
+ <metatype:AD id="name" type="String" name="%name.name" description="%name.desc"/>
+ </metatype:OCD>
+ <metatype:OCD id="org.apache.ace.gateway.log.sync" name="%sync.service.name" description="%sync.service.desc">
+ <metatype:AD id="name" type="String" name="%name.name" description="%name.desc"/>
+ <metatype:AD id="ma" type="String" name="%ma.name" description="%ma.desc" required="false"/>
+ </metatype:OCD>
+ <metatype:Designate pid="org.apache.ace.gateway.log.factory"
+ factoryPid="org.apache.ace.gateway.log.factory">
+ <metatype:Object ocdref="org.apache.ace.gateway.log"/>
+ </metatype:Designate>
+ <metatype:Designate pid="org.apache.ace.gateway.log.sync.factory"
+ factoryPid="org.apache.ace.gateway.log.sync.factory">
+ <metatype:Object ocdref="org.apache.ace.gateway.log.sync"/>
+ </metatype:Designate>
+</metatype:MetaData>
Added: incubator/ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1177795&view=auto
==============================================================================
--- incubator/ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.properties (added)
+++ incubator/ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.properties Fri Sep 30 19:32:42 2011
@@ -0,0 +1,5 @@
+service.name=Apache ACE :: Target Identification
+service.desc=Configuration for the property-based ACE deployment target identification.
+
+gatewayID.name=Target ID
+gatewayID.desc=The identification of the deployment target.
Added: incubator/ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=1177795&view=auto
==============================================================================
--- incubator/ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.xml (added)
+++ incubator/ace/trunk/ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.xml Fri Sep 30 19:32:42 2011
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0"
+ localization="OSGI-INF/metatype/metatype">
+ <metatype:OCD id="org.apache.ace.identification.property" name="%service.name">
+ <metatype:AD id="gatewayID" type="String" name="%gatewayID.name" description="%gatewayID.desc"/>
+ </metatype:OCD>
+ <metatype:Designate pid="org.apache.ace.identification.property">
+ <metatype:Object ocdref="org.apache.ace.identification.property"/>
+ </metatype:Designate>
+ <metatype:Designate pid="org.apache.ace.identification.property.factory">
+ <metatype:Object ocdref="org.apache.ace.identification.property"/>
+ </metatype:Designate>
+</metatype:MetaData>
Modified: incubator/ace/trunk/ace-location-upnp/src/main/java/org/apache/ace/location/upnp/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-location-upnp/src/main/java/org/apache/ace/location/upnp/Activator.java?rev=1177795&r1=1177794&r2=1177795&view=diff
==============================================================================
--- incubator/ace/trunk/ace-location-upnp/src/main/java/org/apache/ace/location/upnp/Activator.java (original)
+++ incubator/ace/trunk/ace-location-upnp/src/main/java/org/apache/ace/location/upnp/Activator.java Fri Sep 30 19:32:42 2011
@@ -30,8 +30,9 @@ public class Activator extends Dependenc
@Override
public void init(BundleContext context, DependencyManager manager) throws Exception {
- //we need these to construct the actual presentation url for the service
- int port = Integer.valueOf(context.getProperty("org.osgi.service.http.port"));
+ //we need these to construct the actual presentation url for the service
+ String httpPort = context.getProperty("org.osgi.service.http.port");
+ int port = (httpPort != null ? Integer.valueOf(httpPort) : 8080);
String host = HostUtil.getHost();
ProvisioningDevice psDevice = new ProvisioningDevice(host, port);