Author: cziegeler
Date: Wed Dec 12 00:30:16 2007
New Revision: 603511
URL: http://svn.apache.org/viewvc?rev=603511&view=rev
Log:
Defaults for scr plugin have changed: inherit is now true by default, therefore
we have to remove duplicate references.
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AjaxBundleDetailsAction.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AssemblyListRender.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/InstallAction.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/RefreshPackagesAction.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/StartAction.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/StopAction.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/UninstallAction.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/UpdateAction.java
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AjaxBundleDetailsAction.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AjaxBundleDetailsAction.java?rev=603511&r1=603510&r2=603511&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AjaxBundleDetailsAction.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AjaxBundleDetailsAction.java
Wed Dec 12 00:30:16 2007
@@ -40,7 +40,6 @@
* The <code>AjaxBundleDetailsAction</code> TODO
*
* @scr.component metatype="false"
- * @scr.reference name="log" interface="org.osgi.service.log.LogService"
* @scr.service
*/
public class AjaxBundleDetailsAction extends BundleAction {
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AssemblyListRender.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AssemblyListRender.java?rev=603511&r1=603510&r2=603511&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AssemblyListRender.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AssemblyListRender.java
Wed Dec 12 00:30:16 2007
@@ -25,8 +25,6 @@
* The <code>BundleListRender</code> TODO
*
* @scr.component metatype="false"
- * @scr.reference name="installerService"
interface="org.apache.sling.osgi.assembly.installer.InstallerService"
- * @scr.reference name="startLevel"
interface="org.osgi.service.startlevel.StartLevel"
* @scr.service
*/
public class AssemblyListRender extends BundleListRender {
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/InstallAction.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/InstallAction.java?rev=603511&r1=603510&r2=603511&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/InstallAction.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/InstallAction.java
Wed Dec 12 00:30:16 2007
@@ -40,7 +40,6 @@
* The <code>InstallAction</code> TODO
*
* @scr.component metatype="false"
- * @scr.reference name="log" interface="org.osgi.service.log.LogService"
* @scr.service
*/
public class InstallAction extends BundleAction {
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/RefreshPackagesAction.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/RefreshPackagesAction.java?rev=603511&r1=603510&r2=603511&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/RefreshPackagesAction.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/RefreshPackagesAction.java
Wed Dec 12 00:30:16 2007
@@ -25,7 +25,6 @@
* The <code>RefreshPackagesAction</code> TODO
*
* @scr.component metatype="false"
- * @scr.reference name="log" interface="org.osgi.service.log.LogService"
* @scr.service
*/
public class RefreshPackagesAction extends BundleAction {
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/StartAction.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/StartAction.java?rev=603511&r1=603510&r2=603511&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/StartAction.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/StartAction.java
Wed Dec 12 00:30:16 2007
@@ -26,7 +26,6 @@
* The <code>StopAction</code> TODO
*
* @scr.component metatype="false"
- * @scr.reference name="log" interface="org.osgi.service.log.LogService"
* @scr.service
*/
public class StartAction extends BundleAction {
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/StopAction.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/StopAction.java?rev=603511&r1=603510&r2=603511&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/StopAction.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/StopAction.java
Wed Dec 12 00:30:16 2007
@@ -26,7 +26,6 @@
* The <code>StopAction</code> TODO
*
* @scr.component metatype="false"
- * @scr.reference name="log" interface="org.osgi.service.log.LogService"
* @scr.service
*/
public class StopAction extends BundleAction {
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/UninstallAction.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/UninstallAction.java?rev=603511&r1=603510&r2=603511&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/UninstallAction.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/UninstallAction.java
Wed Dec 12 00:30:16 2007
@@ -26,7 +26,6 @@
* The <code>StopAction</code> TODO
*
* @scr.component metatype="false"
- * @scr.reference name="log" interface="org.osgi.service.log.LogService"
* @scr.service
*/
public class UninstallAction extends BundleAction {
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/UpdateAction.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/UpdateAction.java?rev=603511&r1=603510&r2=603511&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/UpdateAction.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/UpdateAction.java
Wed Dec 12 00:30:16 2007
@@ -30,7 +30,6 @@
* The <code>UpdateAction</code> TODO
*
* @scr.component metatype="false"
- * @scr.reference name="log" interface="org.osgi.service.log.LogService"
* @scr.service
*/
public class UpdateAction extends BundleAction {
