Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

ACE-184 applied Jeremias' patch

git-svn-id: https://svn.apache.org/repos/asf/incubator/ace/trunk@1177795 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit a7b2907db938466f154c57a5e9de829bee83e703 1 parent 3624d48
@m4rr5 m4rr5 authored
View
2  ace-deployment-task/pom.xml
@@ -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>
View
2  ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java
@@ -73,7 +73,7 @@ public void init(BundleContext context, DependencyManager manager) throws Except
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();
View
5 ace-deployment-task/src/main/resources/OSGI-INF/metatype/metatype.properties
@@ -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.
View
10 ace-deployment-task/src/main/resources/OSGI-INF/metatype/metatype.xml
@@ -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>
View
5 ace-discovery-property/src/main/resources/OSGI-INF/metatype/metatype.properties
@@ -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)
View
13 ace-discovery-property/src/main/resources/OSGI-INF/metatype/metatype.xml
@@ -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>
View
9 ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.properties
@@ -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.
+
View
12 ace-gateway-log-store/src/main/resources/OSGI-INF/metatype/metatype.xml
@@ -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>
View
2  ace-gateway-log/src/main/java/org/apache/ace/gateway/log/LogSyncConfigurator.java
@@ -52,7 +52,7 @@ public synchronized void updated(String pid, Dictionary dict) throws Configurati
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=*)))";
View
11 ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.properties
@@ -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.
View
19 ace-gateway-log/src/main/resources/OSGI-INF/metatype/metatype.xml
@@ -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>
View
5 ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.properties
@@ -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.
View
13 ace-identification-property/src/main/resources/OSGI-INF/metatype/metatype.xml
@@ -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>
View
5 ace-location-upnp/src/main/java/org/apache/ace/location/upnp/Activator.java
@@ -30,8 +30,9 @@
@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);
Please sign in to comment.
Something went wrong with that request. Please try again.