You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/04/10 18:16:53 UTC
svn commit: r1311828 - in /karaf/trunk: ./
assemblies/features/standard/src/main/feature/ management/
management/mbeans/ obr/ obr/command/
obr/command/src/main/java/org/apache/karaf/obr/
obr/command/src/main/java/org/apache/karaf/obr/command/ obr/comma...
Author: cschneider
Date: Tue Apr 10 16:16:52 2012
New Revision: 1311828
URL: http://svn.apache.org/viewvc?rev=1311828&view=rev
Log:
KARAF-963 obr modules refactored
Added:
karaf/trunk/obr/ (with props)
karaf/trunk/obr/command/
- copied from r1309898, karaf/trunk/shell/obr/
karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/
karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/
- copied from r1309898, karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/
karaf/trunk/obr/command/src/main/resources/OSGI-INF/blueprint/blueprint.xml
- copied, changed from r1309898, karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
karaf/trunk/obr/command/src/test/java/org/apache/karaf/obr/
karaf/trunk/obr/command/src/test/java/org/apache/karaf/obr/command/
- copied from r1309898, karaf/trunk/shell/obr/src/test/java/org/apache/karaf/shell/obr/
karaf/trunk/obr/core/
- copied from r1309898, karaf/trunk/management/mbeans/obr/
karaf/trunk/obr/core/src/main/java/org/apache/karaf/obr/
karaf/trunk/obr/core/src/main/java/org/apache/karaf/obr/core/
- copied from r1309898, karaf/trunk/management/mbeans/obr/src/main/java/org/apache/karaf/management/mbeans/obr/
karaf/trunk/obr/core/src/main/java/org/apache/karaf/obr/core/internal/Obr.java
- copied, changed from r1309898, karaf/trunk/management/mbeans/obr/src/main/java/org/apache/karaf/management/mbeans/obr/internal/ObrMBeanImpl.java
karaf/trunk/obr/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
- copied, changed from r1309898, karaf/trunk/management/mbeans/obr/src/main/resources/OSGI-INF/blueprint/obr-management.xml
karaf/trunk/obr/pom.xml
Removed:
karaf/trunk/management/mbeans/
karaf/trunk/obr/command/src/main/java/org/apache/karaf/shell/
karaf/trunk/obr/command/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
karaf/trunk/obr/command/src/test/java/org/apache/karaf/shell/
karaf/trunk/obr/core/src/main/java/org/apache/karaf/management/
karaf/trunk/obr/core/src/main/java/org/apache/karaf/obr/core/internal/ObrMBeanImpl.java
karaf/trunk/obr/core/src/main/resources/OSGI-INF/blueprint/obr-management.xml
karaf/trunk/shell/obr/
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/management/pom.xml
karaf/trunk/obr/command/pom.xml
karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/AddUrlCommand.java
karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/DeployCommand.java
karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/FindCommand.java
karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/InfoCommand.java
karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ListCommand.java
karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ListUrlCommand.java
karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java
karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/RefreshUrlCommand.java
karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/RemoveUrlCommand.java
karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ResolveCommand.java
karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/SourceCommand.java
karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/StartCommand.java
karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/util/FileUtil.java
karaf/trunk/obr/command/src/test/java/org/apache/karaf/obr/command/ListCommandTest.java
karaf/trunk/obr/core/pom.xml
karaf/trunk/obr/core/src/main/java/org/apache/karaf/obr/core/ObrMBean.java
karaf/trunk/pom.xml
karaf/trunk/shell/pom.xml
Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1311828&r1=1311827&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Tue Apr 10 16:16:52 2012
@@ -64,12 +64,12 @@
<bundle dependency="true" start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
<bundle start-level="30">mvn:org.apache.felix/org.osgi.service.obr/${felix.obr.version}</bundle>
<bundle start-level="30">mvn:org.apache.felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.obr/${project.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.features/org.apache.karaf.features.obr/${project.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.obr/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.obr/org.apache.karaf.obr.core/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.obr/org.apache.karaf.obr.command/${project.version}</bundle>
<bundle start-level="30">mvn:org.ops4j.pax.swissbox/pax-swissbox-lifecycle/${pax.swissbox.version}</bundle>
<bundle start-level="30">mvn:org.ops4j.pax.swissbox/pax-swissbox-tracker/${pax.swissbox.version}</bundle>
<bundle start-level="30">mvn:org.ops4j.pax.url/pax-url-obr/${pax.url.version}</bundle>
+ <bundle start-level="31">mvn:org.apache.karaf.features/org.apache.karaf.features.obr/${project.version}</bundle>
</feature>
<feature name="config" description="Provide OSGi ConfigAdmin support" version="${project.version}">
Modified: karaf/trunk/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/pom.xml?rev=1311828&r1=1311827&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/management/pom.xml (original)
+++ karaf/trunk/management/pom.xml Tue Apr 10 16:16:52 2012
@@ -35,7 +35,6 @@
<modules>
<module>server</module>
- <module>mbeans</module>
</modules>
</project>
\ No newline at end of file
Propchange: karaf/trunk/obr/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 10 16:16:52 2012
@@ -0,0 +1 @@
+target
Modified: karaf/trunk/obr/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/pom.xml?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/command/pom.xml (original)
+++ karaf/trunk/obr/command/pom.xml Tue Apr 10 16:16:52 2012
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>shell</artifactId>
+ <groupId>org.apache.karaf.obr</groupId>
+ <artifactId>obr</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>org.apache.karaf.shell.obr</artifactId>
+ <artifactId>org.apache.karaf.obr.command</artifactId>
<packaging>bundle</packaging>
- <name>Apache Karaf :: Shell :: OBR Commands</name>
- <description>This bundle provides Karaf shell commands to manipulate the OBR service.</description>
+ <name>Apache Karaf :: OBR :: Command</name>
+ <description>Shell commands to manipulate the OBR service</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -99,17 +99,9 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Import-Package>
- !${project.artifactId}*,
- org.apache.aries.blueprint,
- org.osgi.service.blueprint.container,
- org.osgi.service.blueprint.reflect,
- org.apache.felix.service.command,
- org.apache.karaf.shell.commands,
- org.apache.karaf.shell.console,
- *
- </Import-Package>
- <Private-Package>!*</Private-Package>
+ <Export-Package>
+ !*
+ </Export-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/AddUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/AddUrlCommand.java?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/AddUrlCommand.java (original)
+++ karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/AddUrlCommand.java Tue Apr 10 16:16:52 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.obr;
+package org.apache.karaf.obr.command;
import java.util.List;
Modified: karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/DeployCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/DeployCommand.java?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/DeployCommand.java (original)
+++ karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/DeployCommand.java Tue Apr 10 16:16:52 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.obr;
+package org.apache.karaf.obr.command;
import java.util.List;
Modified: karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/FindCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/FindCommand.java?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/FindCommand.java (original)
+++ karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/FindCommand.java Tue Apr 10 16:16:52 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.obr;
+package org.apache.karaf.obr.command;
import org.apache.felix.bundlerepository.Capability;
import org.apache.felix.bundlerepository.RepositoryAdmin;
Modified: karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/InfoCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/InfoCommand.java?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/InfoCommand.java (original)
+++ karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/InfoCommand.java Tue Apr 10 16:16:52 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.obr;
+package org.apache.karaf.obr.command;
import java.io.PrintStream;
import java.lang.reflect.Array;
Modified: karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ListCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ListCommand.java?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ListCommand.java (original)
+++ karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ListCommand.java Tue Apr 10 16:16:52 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.obr;
+package org.apache.karaf.obr.command;
import java.util.List;
Modified: karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ListUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ListUrlCommand.java?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ListUrlCommand.java (original)
+++ karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ListUrlCommand.java Tue Apr 10 16:16:52 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.obr;
+package org.apache.karaf.obr.command;
import org.apache.felix.bundlerepository.Repository;
import org.apache.felix.bundlerepository.RepositoryAdmin;
Modified: karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java (original)
+++ karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java Tue Apr 10 16:16:52 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.obr;
+package org.apache.karaf.obr.command;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -43,14 +43,13 @@ public abstract class ObrCommandSupport
protected static final char VERSION_DELIM = ',';
protected Object doExecute() throws Exception {
- // Get repository instance service.
- ServiceReference ref = getBundleContext().getServiceReference(RepositoryAdmin.class.getName());
+ ServiceReference<RepositoryAdmin> ref = getBundleContext().getServiceReference(RepositoryAdmin.class);
if (ref == null) {
System.out.println("RepositoryAdmin service is unavailable.");
return null;
}
try {
- RepositoryAdmin admin = (RepositoryAdmin) getBundleContext().getService(ref);
+ RepositoryAdmin admin = getBundleContext().getService(ref);
if (admin == null) {
System.out.println("RepositoryAdmin service is unavailable.");
return null;
Modified: karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/RefreshUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/RefreshUrlCommand.java?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/RefreshUrlCommand.java (original)
+++ karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/RefreshUrlCommand.java Tue Apr 10 16:16:52 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.obr;
+package org.apache.karaf.obr.command;
import java.util.List;
Modified: karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/RemoveUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/RemoveUrlCommand.java?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/RemoveUrlCommand.java (original)
+++ karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/RemoveUrlCommand.java Tue Apr 10 16:16:52 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.obr;
+package org.apache.karaf.obr.command;
import java.util.List;
Modified: karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ResolveCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ResolveCommand.java?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ResolveCommand.java (original)
+++ karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ResolveCommand.java Tue Apr 10 16:16:52 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.obr;
+package org.apache.karaf.obr.command;
import java.util.ArrayList;
import java.util.Arrays;
Modified: karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/SourceCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/SourceCommand.java?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/SourceCommand.java (original)
+++ karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/SourceCommand.java Tue Apr 10 16:16:52 2012
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.obr;
+package org.apache.karaf.obr.command;
import java.net.URI;
import java.util.List;
import org.apache.felix.bundlerepository.RepositoryAdmin;
import org.apache.felix.bundlerepository.Resource;
-import org.apache.karaf.shell.commands.Option;
+import org.apache.karaf.obr.command.util.FileUtil;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.apache.karaf.shell.obr.util.FileUtil;
+import org.apache.karaf.shell.commands.Option;
@Command(scope = "obr", name = "source", description = "Downloads the sources for an OBR bundle.")
public class SourceCommand extends ObrCommandSupport {
Modified: karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/StartCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/StartCommand.java?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/StartCommand.java (original)
+++ karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/StartCommand.java Tue Apr 10 16:16:52 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.obr;
+package org.apache.karaf.obr.command;
import org.apache.felix.bundlerepository.RepositoryAdmin;
import org.apache.karaf.shell.commands.Command;
Modified: karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/util/FileUtil.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/util/FileUtil.java?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/util/FileUtil.java (original)
+++ karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/util/FileUtil.java Tue Apr 10 16:16:52 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.karaf.shell.obr.util;
+package org.apache.karaf.obr.command.util;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -25,7 +25,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.PrintWriter;
import java.io.PrintStream;
import java.net.URL;
import java.net.URLConnection;
Copied: karaf/trunk/obr/command/src/main/resources/OSGI-INF/blueprint/blueprint.xml (from r1309898, karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/main/resources/OSGI-INF/blueprint/blueprint.xml?p2=karaf/trunk/obr/command/src/main/resources/OSGI-INF/blueprint/blueprint.xml&p1=karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml&r1=1309898&r2=1311828&rev=1311828&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml (original)
+++ karaf/trunk/obr/command/src/main/resources/OSGI-INF/blueprint/blueprint.xml Tue Apr 10 16:16:52 2012
@@ -17,47 +17,47 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- default-activation="lazy">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
+
<reference id="repoAdmin"
interface="org.apache.felix.bundlerepository.RepositoryAdmin"
availability="optional" />
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
- <action class="org.apache.karaf.shell.obr.AddUrlCommand" />
+ <action class="org.apache.karaf.obr.command.AddUrlCommand" />
</command>
<command>
- <action class="org.apache.karaf.shell.obr.DeployCommand" />
+ <action class="org.apache.karaf.obr.command.DeployCommand" />
</command>
<command>
- <action class="org.apache.karaf.shell.obr.FindCommand" />
+ <action class="org.apache.karaf.obr.command.FindCommand" />
</command>
<command>
- <action class="org.apache.karaf.shell.obr.InfoCommand" />
+ <action class="org.apache.karaf.obr.command.InfoCommand" />
</command>
<command>
- <action class="org.apache.karaf.shell.obr.ListCommand">
+ <action class="org.apache.karaf.obr.command.ListCommand">
<property name="repoAdmin" ref="repoAdmin" />
</action>
</command>
<command>
- <action class="org.apache.karaf.shell.obr.ListUrlCommand" />
+ <action class="org.apache.karaf.obr.command.ListUrlCommand" />
</command>
<command>
- <action class="org.apache.karaf.shell.obr.RefreshUrlCommand" />
+ <action class="org.apache.karaf.obr.command.RefreshUrlCommand" />
</command>
<command>
- <action class="org.apache.karaf.shell.obr.RemoveUrlCommand" />
+ <action class="org.apache.karaf.obr.command.RemoveUrlCommand" />
</command>
<command>
- <action class="org.apache.karaf.shell.obr.ResolveCommand" />
+ <action class="org.apache.karaf.obr.command.ResolveCommand" />
</command>
<command>
- <action class="org.apache.karaf.shell.obr.SourceCommand" />
+ <action class="org.apache.karaf.obr.command.SourceCommand" />
</command>
<command>
- <action class="org.apache.karaf.shell.obr.StartCommand" />
+ <action class="org.apache.karaf.obr.command.StartCommand" />
</command>
</command-bundle>
Modified: karaf/trunk/obr/command/src/test/java/org/apache/karaf/obr/command/ListCommandTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/test/java/org/apache/karaf/obr/command/ListCommandTest.java?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/command/src/test/java/org/apache/karaf/obr/command/ListCommandTest.java (original)
+++ karaf/trunk/obr/command/src/test/java/org/apache/karaf/obr/command/ListCommandTest.java Tue Apr 10 16:16:52 2012
@@ -1,4 +1,4 @@
-package org.apache.karaf.shell.obr;
+package org.apache.karaf.obr.command;
import org.apache.felix.bundlerepository.RepositoryAdmin;
import org.apache.felix.bundlerepository.Resource;
import org.apache.felix.bundlerepository.impl.ResourceImpl;
Modified: karaf/trunk/obr/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/core/pom.xml?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/core/pom.xml (original)
+++ karaf/trunk/obr/core/pom.xml Tue Apr 10 16:16:52 2012
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.management.mbeans</groupId>
- <artifactId>mbeans</artifactId>
+ <groupId>org.apache.karaf.obr</groupId>
+ <artifactId>obr</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>org.apache.karaf.management.mbeans.obr</artifactId>
+ <artifactId>org.apache.karaf.obr.core</artifactId>
<packaging>bundle</packaging>
- <name>Apache Karaf :: Management :: MBeans :: OBR</name>
- <description>The OBR MBean bundle provides a JMX MBean which allows you to manipulate the Karaf OBR layer.</description>
+ <name>Apache Karaf :: OBR :: Core</name>
+ <description>OBR core services and MBeans</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../../etc/appended-resources/</appendedResourcesDirectory>
@@ -73,21 +73,10 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.karaf.management.mbeans.obr;version=${project.version}
+ org.apache.karaf.obr.core
</Export-Package>
- <Import-Package>
- !org.apache.karaf.management.mbeans.obr,
- javax.management,
- javax.management.loading,
- org.apache.karaf.management;version=${project.version},
- org.apache.aries.blueprint,
- org.osgi.service.blueprint.container,
- org.osgi.service.blueprint.reflect,
- *
- </Import-Package>
<Private-Package>
- org.apache.karaf.management.mbeans.obr.internal,
- !*
+ org.apache.karaf.obr.core.internal
</Private-Package>
</instructions>
</configuration>
Modified: karaf/trunk/obr/core/src/main/java/org/apache/karaf/obr/core/ObrMBean.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/core/src/main/java/org/apache/karaf/obr/core/ObrMBean.java?rev=1311828&r1=1309898&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/obr/core/src/main/java/org/apache/karaf/obr/core/ObrMBean.java (original)
+++ karaf/trunk/obr/core/src/main/java/org/apache/karaf/obr/core/ObrMBean.java Tue Apr 10 16:16:52 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.management.mbeans.obr;
+package org.apache.karaf.obr.core;
import javax.management.openmbean.TabularData;
import java.util.List;
Copied: karaf/trunk/obr/core/src/main/java/org/apache/karaf/obr/core/internal/Obr.java (from r1309898, karaf/trunk/management/mbeans/obr/src/main/java/org/apache/karaf/management/mbeans/obr/internal/ObrMBeanImpl.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/core/src/main/java/org/apache/karaf/obr/core/internal/Obr.java?p2=karaf/trunk/obr/core/src/main/java/org/apache/karaf/obr/core/internal/Obr.java&p1=karaf/trunk/management/mbeans/obr/src/main/java/org/apache/karaf/management/mbeans/obr/internal/ObrMBeanImpl.java&r1=1309898&r2=1311828&rev=1311828&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/obr/src/main/java/org/apache/karaf/management/mbeans/obr/internal/ObrMBeanImpl.java (original)
+++ karaf/trunk/obr/core/src/main/java/org/apache/karaf/obr/core/internal/Obr.java Tue Apr 10 16:16:52 2012
@@ -14,33 +14,46 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.management.mbeans.obr.internal;
+package org.apache.karaf.obr.core.internal;
-import org.apache.felix.bundlerepository.*;
-import org.apache.karaf.management.mbeans.obr.ObrMBean;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.management.NotCompliantMBeanException;
+import javax.management.StandardMBean;
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.CompositeDataSupport;
+import javax.management.openmbean.CompositeType;
+import javax.management.openmbean.OpenType;
+import javax.management.openmbean.SimpleType;
+import javax.management.openmbean.TabularData;
+import javax.management.openmbean.TabularDataSupport;
+import javax.management.openmbean.TabularType;
+
+import org.apache.felix.bundlerepository.Repository;
+import org.apache.felix.bundlerepository.RepositoryAdmin;
+import org.apache.felix.bundlerepository.Resolver;
+import org.apache.felix.bundlerepository.Resource;
+import org.apache.karaf.obr.core.ObrMBean;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.Version;
-import javax.management.NotCompliantMBeanException;
-import javax.management.StandardMBean;
-import javax.management.openmbean.*;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* Implementation of the OBR MBean.
*/
-public class ObrMBeanImpl extends StandardMBean implements ObrMBean {
+public class Obr extends StandardMBean implements ObrMBean {
private static final char VERSION_DELIM = ',';
private BundleContext bundleContext;
private RepositoryAdmin repositoryAdmin;
- public ObrMBeanImpl() throws NotCompliantMBeanException {
+ public Obr(BundleContext bundleContext, RepositoryAdmin repositoryAdmin) throws NotCompliantMBeanException {
super(ObrMBean.class);
+ this.bundleContext = bundleContext;
+ this.repositoryAdmin = repositoryAdmin;
}
public List<String> getUrls() throws Exception {
@@ -119,7 +132,7 @@ public class ObrMBeanImpl extends Standa
private Resource[] searchRepository(RepositoryAdmin admin, String targetId, String targetVersion) throws InvalidSyntaxException {
// Try to see if the targetId is a bundle ID.
try {
- Bundle bundle = getBundleContext().getBundle(Long.parseLong(targetId));
+ Bundle bundle = bundleContext.getBundle(Long.parseLong(targetId));
targetId = bundle.getSymbolicName();
} catch (NumberFormatException ex) {
// It was not a number, so ignore.
@@ -170,20 +183,4 @@ public class ObrMBeanImpl extends Standa
return target;
}
- public BundleContext getBundleContext() {
- return this.bundleContext;
- }
-
- public void setBundleContext(BundleContext bundleContext) {
- this.bundleContext = bundleContext;
- }
-
- public RepositoryAdmin getRepositoryAdmin() {
- return this.repositoryAdmin;
- }
-
- public void setRepositoryAdmin(RepositoryAdmin repositoryAdmin) {
- this.repositoryAdmin = repositoryAdmin;
- }
-
}
Copied: karaf/trunk/obr/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml (from r1309898, karaf/trunk/management/mbeans/obr/src/main/resources/OSGI-INF/blueprint/obr-management.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?p2=karaf/trunk/obr/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml&p1=karaf/trunk/management/mbeans/obr/src/main/resources/OSGI-INF/blueprint/obr-management.xml&r1=1309898&r2=1311828&rev=1311828&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/obr/src/main/resources/OSGI-INF/blueprint/obr-management.xml (original)
+++ karaf/trunk/obr/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml Tue Apr 10 16:16:52 2012
@@ -12,29 +12,23 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
+ xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
- <!-- Reference to the MBean Server -->
- <reference id="mbeanServer" interface="javax.management.MBeanServer">
- <reference-listener ref="mbeanRegistrer" bind-method="registerMBeanServer" unbind-method="unregisterMBeanServer"/>
- </reference>
+ <ext:property-placeholder />
- <!-- OBR MBean -->
- <bean id="obrMBean" class="org.apache.karaf.management.mbeans.obr.internal.ObrMBeanImpl">
- <property name="bundleContext" ref="blueprintBundleContext"/>
- <property name="repositoryAdmin" ref="repositoryAdmin"/>
- </bean>
+ <reference id="repositoryAdmin" interface="org.apache.felix.bundlerepository.RepositoryAdmin"/>
- <!-- MBean Registrer -->
- <bean id="mbeanRegistrer" class="org.apache.karaf.management.MBeanRegistrer">
- <property name="mbeans">
- <map>
- <entry value="org.apache.karaf:type=obr,name=${karaf.name}" key-ref="obrMBean"/>
- </map>
- </property>
+ <bean id="obrMBean" class="org.apache.karaf.obr.core.internal.Obr">
+ <argument ref="blueprintBundleContext"/>
+ <argument ref="repositoryAdmin"/>
</bean>
- <!-- Reference to the OBR RepositoryAdmin service -->
- <reference id="repositoryAdmin" interface="org.apache.felix.bundlerepository.RepositoryAdmin"/>
+ <service ref="obrMBean" auto-export="interfaces">
+ <service-properties>
+ <entry key="jmx.objectname" value="org.apache.karaf:type=obr,name=${karaf.name}"/>
+ </service-properties>
+ </service>
</blueprint>
\ No newline at end of file
Added: karaf/trunk/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/pom.xml?rev=1311828&view=auto
==============================================================================
--- karaf/trunk/obr/pom.xml (added)
+++ karaf/trunk/obr/pom.xml Tue Apr 10 16:16:52 2012
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.karaf.obr</groupId>
+ <artifactId>obr</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Karaf :: OBR</name>
+
+ <modules>
+ <module>core</module>
+ <module>command</module>
+ </modules>
+
+</project>
\ No newline at end of file
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1311828&r1=1311827&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Apr 10 16:16:52 2012
@@ -466,11 +466,6 @@
<artifactId>org.apache.karaf.management.server</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.karaf.management.mbeans</groupId>
- <artifactId>org.apache.karaf.management.mbeans.log</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.karaf.demos</groupId>
@@ -600,11 +595,6 @@
<artifactId>org.apache.karaf.shell.console</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.obr</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
Modified: karaf/trunk/shell/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/pom.xml?rev=1311828&r1=1311827&r2=1311828&view=diff
==============================================================================
--- karaf/trunk/shell/pom.xml (original)
+++ karaf/trunk/shell/pom.xml Tue Apr 10 16:16:52 2012
@@ -36,7 +36,6 @@
<modules>
<module>commands</module>
<module>console</module>
- <module>obr</module>
<module>ssh</module>
</modules>