You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ld...@apache.org on 2012/02/10 15:50:43 UTC
svn commit: r1242797 [3/3] - in /karaf/webconsole/trunk: assembly/src/main/resources/ core/src/test/java/org/apache/karaf/webconsole/core/page/ osgi/ osgi/blueprint/ osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/ osgi/blueprin...

Modified: karaf/webconsole/trunk/osgi/scr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/scr/pom.xml?rev=1242797&r1=1242796&r2=1242797&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/scr/pom.xml (original)
+++ karaf/webconsole/trunk/osgi/scr/pom.xml Fri Feb 10 14:50:38 2012
@@ -33,8 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.karaf.webconsole.osgi</groupId>
-            <artifactId>org.apache.karaf.webconsole.osgi.bundle</artifactId>
-            <version>${project.version}</version>
+            <artifactId>org.apache.karaf.webconsole.osgi.core</artifactId>
         </dependency>
 
         <dependency>

Modified: karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumnProvider.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumnProvider.java?rev=1242797&r1=1242796&r2=1242797&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumnProvider.java (original)
+++ karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumnProvider.java Fri Feb 10 14:50:38 2012
@@ -16,7 +16,7 @@
  */
 package org.apache.karaf.webconsole.osgi.scr;
 
-import org.apache.karaf.webconsole.osgi.bundle.IColumnProvider;
+import org.apache.karaf.webconsole.osgi.core.spi.IColumnProvider;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.osgi.framework.Bundle;
 
@@ -25,6 +25,8 @@ import org.osgi.framework.Bundle;
  */
 public class ScrColumnProvider extends ScrComponent implements IColumnProvider {
 
+    private static final long serialVersionUID = 1L;
+
     public IColumn<Bundle> getColumn() {
         return new ScrColumn(scr, "SCR");
     }

Modified: karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrDecorationProvider.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrDecorationProvider.java?rev=1242797&r1=1242796&r2=1242797&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrDecorationProvider.java (original)
+++ karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrDecorationProvider.java Fri Feb 10 14:50:38 2012
@@ -20,7 +20,7 @@ package org.apache.karaf.webconsole.osgi
 import static org.apache.wicket.markup.html.CSSPackageResource.getHeaderContribution;
 
 import org.apache.karaf.webconsole.core.panel.CssImagePanel;
-import org.apache.karaf.webconsole.osgi.bundle.IDecorationProvider;
+import org.apache.karaf.webconsole.osgi.core.spi.IDecorationProvider;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
 import org.osgi.framework.Bundle;

Modified: karaf/webconsole/trunk/osgi/scr/src/main/resources/OSGI-INF/column.xml
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/scr/src/main/resources/OSGI-INF/column.xml?rev=1242797&r1=1242796&r2=1242797&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/scr/src/main/resources/OSGI-INF/column.xml (original)
+++ karaf/webconsole/trunk/osgi/scr/src/main/resources/OSGI-INF/column.xml Fri Feb 10 14:50:38 2012
@@ -19,7 +19,7 @@
    <implementation class="org.apache.karaf.webconsole.osgi.scr.ScrColumnProvider"/>
 
    <service>
-      <provide interface="org.apache.karaf.webconsole.osgi.bundle.IColumnProvider"/>
+      <provide interface="org.apache.karaf.webconsole.osgi.core.spi.IColumnProvider"/>
    </service>
 
    <reference name="ScrService" cardinality="1..1" interface="org.apache.felix.scr.ScrService" policy="static" bind="bind" unbind="unbind" />

Modified: karaf/webconsole/trunk/osgi/scr/src/main/resources/OSGI-INF/decoration.xml
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/scr/src/main/resources/OSGI-INF/decoration.xml?rev=1242797&r1=1242796&r2=1242797&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/scr/src/main/resources/OSGI-INF/decoration.xml (original)
+++ karaf/webconsole/trunk/osgi/scr/src/main/resources/OSGI-INF/decoration.xml Fri Feb 10 14:50:38 2012
@@ -19,7 +19,7 @@
    <implementation class="org.apache.karaf.webconsole.osgi.scr.ScrDecorationProvider" />
 
    <service>
-      <provide interface="org.apache.karaf.webconsole.osgi.bundle.IDecorationProvider"/>
+      <provide interface="org.apache.karaf.webconsole.osgi.core.spi.IDecorationProvider"/>
    </service>
 
    <reference name="ScrService" cardinality="1..1" interface="org.apache.felix.scr.ScrService" policy="static" bind="bind" unbind="unbind" />