You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2010/09/13 10:07:50 UTC
svn commit: r996446 - in
/sling/trunk/installer/osgi/installer/src/test/java/org/apache/sling/osgi/installer/impl:
MockBundleContext.java MockBundleResource.java
Author: cziegeler
Date: Mon Sep 13 08:07:49 2010
New Revision: 996446
URL: http://svn.apache.org/viewvc?rev=996446&view=rev
Log:
SLING-1737 : Add state management for resources
Modified:
sling/trunk/installer/osgi/installer/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleContext.java
sling/trunk/installer/osgi/installer/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleResource.java
Modified: sling/trunk/installer/osgi/installer/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleContext.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/installer/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleContext.java?rev=996446&r1=996445&r2=996446&view=diff
==============================================================================
--- sling/trunk/installer/osgi/installer/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleContext.java (original)
+++ sling/trunk/installer/osgi/installer/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleContext.java Mon Sep 13 08:07:49 2010
@@ -56,14 +56,14 @@ public class MockBundleContext implement
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public ServiceRegistration registerService(String clazz, Object service,
Dictionary properties) {
// TODO Auto-generated method stub
return null;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public ServiceRegistration registerService(String[] clazzes,
Object service, Dictionary properties) {
// TODO Auto-generated method stub
Modified: sling/trunk/installer/osgi/installer/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleResource.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/installer/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleResource.java?rev=996446&r1=996445&r2=996446&view=diff
==============================================================================
--- sling/trunk/installer/osgi/installer/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleResource.java (original)
+++ sling/trunk/installer/osgi/installer/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleResource.java Mon Sep 13 08:07:49 2010
@@ -124,17 +124,10 @@ public class MockBundleResource implemen
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getId()
- */
- public String getId() {
- return this.attributes.get(Constants.BUNDLE_SYMBOLICNAME) + "-" + this.attributes.get(Constants.BUNDLE_VERSION);
- }
-
- /**
* @see org.apache.sling.osgi.installer.impl.RegisteredResource#getURL()
*/
public String getURL() {
- return this.getScheme() + ":" + this.getId();
+ return this.getScheme() + ":" + this.attributes.get(Constants.BUNDLE_SYMBOLICNAME) + "-" + this.attributes.get(Constants.BUNDLE_VERSION);
}
/**