Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2018-04-26 15:28:12 -0400
committerslewis2018-04-26 15:28:12 -0400
commitce4318cdbbb7e1a47dc3c6d295117b254607fcd3 (patch)
tree6faecbe408ac009d8725903788b75f1023f18eb3
parent5313ed37811bfed0c3f5e7ca84da92a3dc3e7278 (diff)
downloadorg.eclipse.ecf-ce4318cdbbb7e1a47dc3c6d295117b254607fcd3.tar.gz
org.eclipse.ecf-ce4318cdbbb7e1a47dc3c6d295117b254607fcd3.tar.xz
org.eclipse.ecf-ce4318cdbbb7e1a47dc3c6d295117b254607fcd3.zip
Added photon target platform and updated slp LogService impl in SLP
-rw-r--r--protocols/bundles/ch.ethz.iks.slp/src/main/java/ch/ethz/iks/slp/impl/OSGiPlatformAbstraction.java22
-rw-r--r--releng/org.eclipse.ecf.releng.target/ecf-photon.target43
2 files changed, 65 insertions, 0 deletions
diff --git a/protocols/bundles/ch.ethz.iks.slp/src/main/java/ch/ethz/iks/slp/impl/OSGiPlatformAbstraction.java b/protocols/bundles/ch.ethz.iks.slp/src/main/java/ch/ethz/iks/slp/impl/OSGiPlatformAbstraction.java
index 0e3a1d29f..df118407e 100644
--- a/protocols/bundles/ch.ethz.iks.slp/src/main/java/ch/ethz/iks/slp/impl/OSGiPlatformAbstraction.java
+++ b/protocols/bundles/ch.ethz.iks.slp/src/main/java/ch/ethz/iks/slp/impl/OSGiPlatformAbstraction.java
@@ -15,6 +15,7 @@ package ch.ethz.iks.slp.impl;
import java.util.Dictionary;
+import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
@@ -22,6 +23,7 @@ import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
import org.osgi.service.log.LogService;
+import org.osgi.service.log.Logger;
import ch.ethz.iks.slp.impl.filter.Filter;
@@ -216,5 +218,25 @@ public class OSGiPlatformAbstraction implements PlatformAbstraction,
log(null, level, message, t);
}
+ public Logger getLogger(Class<?> clazz) {
+ throw new UnsupportedOperationException();
+ }
+
+ public <L extends Logger> L getLogger(String name, Class<L> loggerType) {
+ throw new UnsupportedOperationException();
+ }
+
+ public <L extends Logger> L getLogger(Class<?> clazz, Class<L> loggerType) {
+ throw new UnsupportedOperationException();
+ }
+
+ public <L extends Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) {
+ throw new UnsupportedOperationException();
+ }
+
+ public Logger getLogger(String name) {
+ throw new UnsupportedOperationException();
+ }
+
}
}
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-photon.target b/releng/org.eclipse.ecf.releng.target/ecf-photon.target
new file mode 100644
index 000000000..84bd71c12
--- /dev/null
+++ b/releng/org.eclipse.ecf.releng.target/ecf-photon.target
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="Photon" sequenceNumber="20">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+<repository location="http://download.eclipse.org/cbi/updates/license/1.0.1.v20140414-1359"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
+<unit id="com.sun.syndication.source" version="0.9.0.v200803061811"/>
+<unit id="org.apache.hadoop.zookeeper" version="3.3.3.v201105210832"/>
+<unit id="org.apache.hadoop.zookeeper.source" version="3.3.3.v201105210832"/>
+<unit id="org.apache.ws.commons.util" version="1.0.1.v20100518-1140"/>
+<unit id="org.apache.xmlrpc" version="3.0.0.v20100427-1100"/>
+<unit id="org.jdom" version="1.1.1.v201101151400"/>
+<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
+<unit id="org.xbill.dns" version="2.0.8.v201112050911"/>
+<unit id="org.xbill.dns.source" version="2.0.8.v201112050911"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.commons.codec" version="1.9.0.v20170208-1614"/>
+<unit id="org.apache.commons.codec.source" version="1.9.0.v20170208-1614"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
+<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.2.v20170210-0925"/>
+<unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>
+<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.6.v20170210-0925"/>
+<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
+<unit id="org.json" version="1.0.0.v201011060100"/>
+<repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.14.0.v20180213-0527"/>
+<unit id="org.eclipse.emf.edit.ui.source.feature.group" version="2.14.0.v20180213-0527"/>
+<unit id="org.eclipse.pde.feature.group" version="3.13.100.v20180308-0630"/>
+<unit id="org.eclipse.pde.source.feature.group" version="3.13.100.v20180308-0630"/>
+<unit id="org.eclipse.platform.feature.group" version="4.8.0.v20180308-0630"/>
+<unit id="org.eclipse.platform.source.feature.group" version="4.8.0.v20180308-0630"/>
+<repository location="http://download.eclipse.org/releases/photon"/>
+</location>
+</locations>
+</target>

Back to the top