You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2016/12/04 10:40:07 UTC
svn commit: r1772519 -
/sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
Author: sseifert
Date: Sun Dec 4 10:40:07 2016
New Revision: 1772519
URL: http://svn.apache.org/viewvc?rev=1772519&view=rev
Log:
SLING-6363 add methods for OSGi R5/R6 support
Modified:
sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
Modified: sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java?rev=1772519&r1=1772518&r2=1772519&view=diff
==============================================================================
--- sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java (original)
+++ sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java Sun Dec 4 10:40:07 2016
@@ -18,6 +18,7 @@
*/
package org.apache.sling.testing.mock.sling.context;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
@@ -218,7 +219,7 @@ final class ModelAdapterFactoryUtil {
@Override
public Dictionary getHeaders() {
- Dictionary<String, Object> headers = new Hashtable<String, Object>();
+ Dictionary<String, String> headers = new Hashtable<String, String>();
headers.put(PACKAGE_HEADER, MAGIC_STRING);
return headers;
}
@@ -350,6 +351,21 @@ final class ModelAdapterFactoryUtil {
return null;
}
+ // this is part of osgi 5/6
+ public int compareTo(Bundle o) {
+ return 0;
+ }
+
+ // this is part of osgi 5/6
+ public <A> A adapt(Class<A> type) {
+ return null;
+ }
+
+ // this is part of osgi 5/6
+ public File getDataFile(String filename) {
+ return null;
+ }
+
}
}