git commit: KARAF-2947 Ignore eclipse resources from rat checks
Repository: karaf Updated Branches: refs/heads/master fd2033b21 - dde4a388f KARAF-2947 Ignore eclipse resources from rat checks Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/dde4a388 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/dde4a388 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/dde4a388 Branch: refs/heads/master Commit: dde4a388fa1a229381910674bf9f0b1849818ba5 Parents: fd2033b Author: Christian Schneider ch...@die-schneider.net Authored: Mon Apr 28 10:25:47 2014 +0200 Committer: Christian Schneider ch...@die-schneider.net Committed: Mon Apr 28 10:25:47 2014 +0200 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/karaf/blob/dde4a388/pom.xml -- diff --git a/pom.xml b/pom.xml index 386c5ef..cd6ef8c 100644 --- a/pom.xml +++ b/pom.xml @@ -2236,6 +2236,8 @@ exclude**/.*/exclude exclude**/eclipse-classes/**/*/exclude exclude**/dependency-reduced-pom.xml/exclude +exclude**/.settings/**/exclude +exclude**/bin/**/exclude !-- resources file -- exclude**/bundle.info/exclude exclude**/goal.txt/exclude
git commit: KARAF-2946 Removing duplicate packages and adding an itest for duplicates
Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 8c0b6c7da - 97af4bdb2 KARAF-2946 Removing duplicate packages and adding an itest for duplicates Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/97af4bdb Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/97af4bdb Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/97af4bdb Branch: refs/heads/karaf-3.0.x Commit: 97af4bdb2d8841281b1171e3413cd60632394961 Parents: 8c0b6c7 Author: Christian Schneider ch...@die-schneider.net Authored: Tue Apr 29 09:50:21 2014 +0200 Committer: Christian Schneider ch...@die-schneider.net Committed: Tue Apr 29 09:50:21 2014 +0200 -- assemblies/features/framework/pom.xml | 7 features/command/pom.xml| 2 +- itests/pom.xml | 5 ++- .../org/apache/karaf/itests/PackageTest.java| 34 ++-- package/core/pom.xml| 1 + .../karaf/packages/core/PackageService.java | 2 +- shell/console/pom.xml | 9 -- shell/ssh/pom.xml | 6 8 files changed, 57 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/karaf/blob/97af4bdb/assemblies/features/framework/pom.xml -- diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml index cf9cbf8..1622ac7 100644 --- a/assemblies/features/framework/pom.xml +++ b/assemblies/features/framework/pom.xml @@ -78,6 +78,13 @@ dependency groupIdorg.jledit/groupId artifactIdcore/artifactId +exclusions +exclusion +!-- Excluding jansi as it is included in jline -- +groupIdorg.fusesource.jansi/groupId +artifactIdjansi/artifactId +/exclusion +/exclusions /dependency !-- listed in source feature.xml with explicit startlevel -- http://git-wip-us.apache.org/repos/asf/karaf/blob/97af4bdb/features/command/pom.xml -- diff --git a/features/command/pom.xml b/features/command/pom.xml index 54b87ca..1936d8e 100644 --- a/features/command/pom.xml +++ b/features/command/pom.xml @@ -91,7 +91,7 @@ org.apache.aries.blueprint, org.osgi.service.blueprint.container, org.osgi.service.blueprint.reflect, -org.apache.felix.service.command, + org.apache.felix.service.command;status=provisional, org.apache.karaf.shell.commands, org.apache.karaf.shell.console, * http://git-wip-us.apache.org/repos/asf/karaf/blob/97af4bdb/itests/pom.xml -- diff --git a/itests/pom.xml b/itests/pom.xml index 94daa29..f0ff7e7 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -67,7 +67,10 @@ artifactIdpax-exam-junit4/artifactId scopetest/scope /dependency - +dependency +groupIdorg.apache.karaf.package/groupId +artifactIdorg.apache.karaf.package.core/artifactId +/dependency /dependencies build http://git-wip-us.apache.org/repos/asf/karaf/blob/97af4bdb/itests/src/test/java/org/apache/karaf/itests/PackageTest.java -- diff --git a/itests/src/test/java/org/apache/karaf/itests/PackageTest.java b/itests/src/test/java/org/apache/karaf/itests/PackageTest.java index 198e863..f7a0577 100644 --- a/itests/src/test/java/org/apache/karaf/itests/PackageTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/PackageTest.java @@ -16,11 +16,19 @@ package org.apache.karaf.itests; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import java.util.HashMap; +import java.util.Map; +import java.util.SortedMap; + +import javax.inject.Inject; import javax.management.MBeanServerConnection; import javax.management.ObjectName; import javax.management.openmbean.TabularData; import javax.management.remote.JMXConnector; +import org.apache.karaf.packages.core.PackageService; +import org.apache.karaf.packages.core.PackageVersion; +import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.junit.PaxExam; @@ -30,6 +38,8 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public class PackageTest extends KarafTestSupport
git commit: KARAF-2946 Itest for duplicate package exports
Repository: karaf
Updated Branches:
refs/heads/master 7b00418f7 - b4e2c4394
KARAF-2946 Itest for duplicate package exports
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b4e2c439
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b4e2c439
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b4e2c439
Branch: refs/heads/master
Commit: b4e2c43949928a4cb70844a988477ed208ca94c1
Parents: 7b00418
Author: Christian Schneider ch...@die-schneider.net
Authored: Tue Apr 29 09:50:21 2014 +0200
Committer: Christian Schneider ch...@die-schneider.net
Committed: Tue Apr 29 10:53:38 2014 +0200
--
itests/pom.xml | 4 +++
.../org/apache/karaf/itests/PackageTest.java| 33 ++--
.../karaf/packages/core/PackageService.java | 2 +-
3 files changed, 35 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/karaf/blob/b4e2c439/itests/pom.xml
--
diff --git a/itests/pom.xml b/itests/pom.xml
index 21178d2..fa60a78 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -84,6 +84,10 @@
scopetest/scope
/dependency
+dependency
+groupIdorg.apache.karaf.package/groupId
+artifactIdorg.apache.karaf.package.core/artifactId
+/dependency
/dependencies
build
http://git-wip-us.apache.org/repos/asf/karaf/blob/b4e2c439/itests/src/test/java/org/apache/karaf/itests/PackageTest.java
--
diff --git a/itests/src/test/java/org/apache/karaf/itests/PackageTest.java
b/itests/src/test/java/org/apache/karaf/itests/PackageTest.java
index 198e863..24f1e12 100644
--- a/itests/src/test/java/org/apache/karaf/itests/PackageTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/PackageTest.java
@@ -16,11 +16,19 @@ package org.apache.karaf.itests;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.SortedMap;
+
+import javax.inject.Inject;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.openmbean.TabularData;
import javax.management.remote.JMXConnector;
+import org.apache.karaf.packages.core.PackageService;
+import org.apache.karaf.packages.core.PackageVersion;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@@ -30,6 +38,8 @@ import org.ops4j.pax.exam.spi.reactors.PerClass;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
public class PackageTest extends KarafTestSupport {
+@Inject
+PackageService packageService;
@Test
public void exportsCommand() throws Exception {
@@ -45,7 +55,7 @@ public class PackageTest extends KarafTestSupport {
connector = this.getJMXConnector();
MBeanServerConnection connection =
connector.getMBeanServerConnection();
ObjectName name = new
ObjectName(org.apache.karaf:type=package,name=root);
-TabularData exports = (TabularData) connection.getAttribute(name,
Exports);
+TabularData exports = (TabularData)connection.getAttribute(name,
Exports);
assertTrue(exports.size() 0);
} finally {
close(connector);
@@ -66,10 +76,27 @@ public class PackageTest extends KarafTestSupport {
connector = this.getJMXConnector();
MBeanServerConnection connection =
connector.getMBeanServerConnection();
ObjectName name = new
ObjectName(org.apache.karaf:type=package,name=root);
-TabularData imports = (TabularData) connection.getAttribute(name,
Imports);
+TabularData imports = (TabularData)connection.getAttribute(name,
Imports);
assertTrue(imports.size() 0);
} finally {
- close(connector);
+close(connector);
+}
+}
+
+@Test
+public void duplicatePackageTest() throws Exception {
+// Leaving out version to make test easier to manage
+// We currently expect no duplicate package exports
+MapString, Integer expectedDups = new HashMapString, Integer();
+SortedMapString, PackageVersion packageVersionMap =
packageService.getExports();
+
+for (String packageNameVersion : packageVersionMap.keySet()) {
+PackageVersion pVer = packageVersionMap.get(packageNameVersion);
+if (pVer.getBundles().size() 1) {
+String packageName = packageNameVersion.split(:)[0];
+int expectedNum = expectedDups.containsKey(packageName) ?
expectedDups.get(packageName) : 0;
+
git commit: KARAF-2795 Improved javadoc for @Option
Repository: karaf
Updated Branches:
refs/heads/master 7fb41c05e - f1307836a
KARAF-2795 Improved javadoc for @Option
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f1307836
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f1307836
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f1307836
Branch: refs/heads/master
Commit: f1307836a62d0bc586d3569003c588779da09431
Parents: 7fb41c0
Author: Christian Schneider ch...@die-schneider.net
Authored: Thu May 8 12:53:55 2014 +0200
Committer: Christian Schneider ch...@die-schneider.net
Committed: Thu May 8 12:53:55 2014 +0200
--
.../java/org/apache/karaf/shell/api/action/Option.java | 12
1 file changed, 12 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/karaf/blob/f1307836/shell/core/src/main/java/org/apache/karaf/shell/api/action/Option.java
--
diff --git
a/shell/core/src/main/java/org/apache/karaf/shell/api/action/Option.java
b/shell/core/src/main/java/org/apache/karaf/shell/api/action/Option.java
index 97e7557..e416bca 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/api/action/Option.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/api/action/Option.java
@@ -25,6 +25,18 @@ import java.lang.annotation.Target;
/**
* Used to mark an optional named command line option who's name typically
starts with -- or -.
+ * This annotation can be applied to attributes of a class implementing an
Action.
+ * p
+ * h2Example 1 (boolean option):/h2
+ * code@Option(name=--force) boolean force;/code
+ * p
+ * This will be represented as --force on the command line.
+ * p
+ * h2Example 2 (mandatory String option):/h2
+ * code@Option(name=-name,required=true) String name;/code
+ * p
+ * This will be represented as -name=myname on the command line and the
command will be rejected if the
+ * option is not given.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD})
git commit: KARAF-3074 Provide mbeans for statistics of hibernate session factories
Repository: karaf Updated Branches: refs/heads/master 49bf55d9d - 6f617896e KARAF-3074 Provide mbeans for statistics of hibernate session factories Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6f617896 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6f617896 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6f617896 Branch: refs/heads/master Commit: 6f617896eeaaec65102856bed2f4fa434aed65fa Parents: 49bf55d Author: Christian Schneider ch...@die-schneider.net Authored: Mon Jun 30 10:31:28 2014 +0200 Committer: Christian Schneider ch...@die-schneider.net Committed: Mon Jun 30 11:58:41 2014 +0200 -- jpa/hibernate/pom.xml | 68 ++ jpa/hibernate/readme.txt| 7 + .../karaf/jpa/hibernate/StatisticsMXBean.java | 26 .../karaf/jpa/hibernate/impl/Activator.java | 68 ++ .../jpa/hibernate/impl/StatisticsPublisher.java | 128 +++ jpa/pom.xml | 39 ++ pom.xml | 1 + 7 files changed, 337 insertions(+) -- http://git-wip-us.apache.org/repos/asf/karaf/blob/6f617896/jpa/hibernate/pom.xml -- diff --git a/jpa/hibernate/pom.xml b/jpa/hibernate/pom.xml new file mode 100644 index 000..466341a --- /dev/null +++ b/jpa/hibernate/pom.xml @@ -0,0 +1,68 @@ +?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. +-- + + modelVersion4.0.0/modelVersion + parent +groupIdorg.apache.karaf.jpa/groupId +artifactIdjpa-parent/artifactId +version4.0.0-SNAPSHOT/version + /parent + artifactIdhibernate/artifactId + packagingbundle/packaging + + dependencies +dependency +groupIdorg.osgi/groupId +artifactIdorg.osgi.core/artifactId +/dependency +dependency +groupIdorg.slf4j/groupId +artifactIdslf4j-api/artifactId +/dependency + +dependency +groupIdorg.hibernate/groupId +artifactIdhibernate-core/artifactId +version4.2.8.Final/version +/dependency +dependency +groupIdorg.hibernate/groupId +artifactIdhibernate-entitymanager/artifactId +version4.2.8.Final/version +/dependency + /dependencies + + build +plugins +plugin +groupIdorg.apache.felix/groupId +artifactIdmaven-bundle-plugin/artifactId +extensionstrue/extensions +configuration +instructions +Bundle-Activator +org.apache.karaf.jpa.hibernate.impl.Activator +/Bundle-Activator +/instructions +/configuration +/plugin +/plugins +/build +/project \ No newline at end of file http://git-wip-us.apache.org/repos/asf/karaf/blob/6f617896/jpa/hibernate/readme.txt -- diff --git a/jpa/hibernate/readme.txt b/jpa/hibernate/readme.txt new file mode 100644 index 000..47db20d --- /dev/null +++ b/jpa/hibernate/readme.txt @@ -0,0 +1,7 @@ +To use this module install jpa and hibernate features, then install bundles providing persistence units. + +The hibernate module will provide one StatisticsMXBean for each persitence unit with an oname like this: +org.hibernate.statistics:unitName=name of persistence unit + +Also see +https://docs.jboss.org/hibernate/core/4.2/javadocs/org/hibernate/stat/Statistics.html http://git-wip-us.apache.org/repos/asf/karaf/blob/6f617896/jpa/hibernate/src/main/java/org/apache/karaf/jpa/hibernate/StatisticsMXBean.java
git commit: KARAF-3074 Fixes in readme
Repository: karaf Updated Branches: refs/heads/master 6f617896e - 42bd57ad2 KARAF-3074 Fixes in readme Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/42bd57ad Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/42bd57ad Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/42bd57ad Branch: refs/heads/master Commit: 42bd57ad28323222f49b3894082ce4b93aa803cc Parents: 6f61789 Author: Christian Schneider ch...@die-schneider.net Authored: Tue Jul 1 15:10:34 2014 +0200 Committer: Christian Schneider ch...@die-schneider.net Committed: Tue Jul 1 15:10:34 2014 +0200 -- jpa/hibernate/readme.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/karaf/blob/42bd57ad/jpa/hibernate/readme.txt -- diff --git a/jpa/hibernate/readme.txt b/jpa/hibernate/readme.txt index 47db20d..5a57356 100644 --- a/jpa/hibernate/readme.txt +++ b/jpa/hibernate/readme.txt @@ -1,6 +1,7 @@ To use this module install jpa and hibernate features, then install bundles providing persistence units. -The hibernate module will provide one StatisticsMXBean for each persitence unit with an oname like this: +install -s mvn:org.apache.karaf.jpa/hibernate/4.0.0-SNAPSHOT +The hibernate module will provide one StatisticsMXBean for each persistence unit with an oname like this: org.hibernate.statistics:unitName=name of persistence unit Also see
svn commit: r1132602 - /karaf/trunk/features/command/src/main/resources/OSGI-INF/bundle.info
Author: cschneider
Date: Mon Jun 6 11:57:15 2011
New Revision: 1132602
URL: http://svn.apache.org/viewvc?rev=1132602view=rev
Log:
Change bundle.info to Wiki syntax
Modified:
karaf/trunk/features/command/src/main/resources/OSGI-INF/bundle.info
Modified: karaf/trunk/features/command/src/main/resources/OSGI-INF/bundle.info
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/resources/OSGI-INF/bundle.info?rev=1132602r1=1132601r2=1132602view=diff
==
--- karaf/trunk/features/command/src/main/resources/OSGI-INF/bundle.info
(original)
+++ karaf/trunk/features/command/src/main/resources/OSGI-INF/bundle.info Mon
Jun 6 11:57:15 2011
@@ -1,26 +1,30 @@
-\u001B[1mSYNOPSIS\u001B[0m
-${project.name}
+h1. Synopsis
-${project.description}
+${project.name}
-Maven URL:
-
\u001B[33mmvn:${project.groupId}/${project.artifactId}/${project.version}\u001B[0m
+${project.description}
-\u001B[1mDESCRIPTION\u001B[0m
-This bundle provides the Karaf shell commands to manipulate features.
-
-The following commands are available:
-\u001B[36mfeatures:addUrl\u001B[0m Adds a list of repository URLs to the
features service.
-\u001B[36mfeatures:info\u001B[0m Shows information about selected
information.
-\u001B[36mfeatures:install\u001B[0m Installs a feature with the specified
name and version.
-\u001B[36mfeatures:list\u001B[0m Lists all existing features available
from the defined repositories.
-\u001B[36mfeatures:listVersions\u001B[0m Lists all versions of a feature
available from the currently available repositories.
-\u001B[36mfeatures:listRepositories\u001B[0m Displays a list of all
defined repositories.
-\u001B[36mfeatures:listUrl\u001B[0m Displays a list of all defined
repository URLs.
-\u001B[36mfeatures:refreshUrl\u001B[0m Reloads the list of available
features from the repositories.
-\u001B[36mfeatures:removeRepository\u001B[0m Removes the specified
repository features service.
-\u001B[36mfeatures:removeUrl\u001B[0m Removes the given list of repository
URLs from the features service.
-\u001B[36mfeatures:uninstall\u001B[0m Uninstalls a feature with the
specified name and version.
+Maven URL:
+[mvn:${project.groupId}/${project.artifactId}/${project.version}]
-\u001B[1mSEE ALSO\u001B[0m
-\u001B[36mCommands\u001B[0m and \u001B[36mProvisioning\u001B[0m sections
of the Karaf User Guide.
\ No newline at end of file
+h1. Description
+
+This bundle provides the Karaf shell commands to manipulate features.
+
+The following commands are available:
+
+* features:addUrl - Adds a list of repository URLs to the features service.
+* features:info- Shows information about selected information.
+* features:install- Installs a feature with the specified name and version.
+* features:list - Lists all existing features available from the defined
repositories.
+* features:listVersions- Lists all versions of a feature available from the
currently available repositories.
+* features:listRepositories- Displays a list of all defined repositories.
+* features:listUrl- Displays a list of all defined repository URLs.
+* features:refreshUrl- Reloads the list of available features from the
repositories.
+* features:removeRepository- Removes the specified repository features service.
+* features:removeUrl- Removes the given list of repository URLs from the
features service.
+* features:uninstall- Uninstalls a feature with the specified name and version.
+
+h1. See also
+
+Commands- and Provisioning- sections of the Karaf User Guide.
svn commit: r1132627 - in /karaf/trunk/shell/osgi/src: main/java/org/apache/karaf/shell/osgi/ main/java/org/apache/karaf/shell/osgi/wikidoc/ main/resources/OSGI-INF/ test/ test/java/ test/java/org/ te
Author: cschneider
Date: Mon Jun 6 13:19:19 2011
New Revision: 1132627
URL: http://svn.apache.org/viewvc?rev=1132627view=rev
Log:
KARAF-664 Support Wiki Syntax in bundle.info instead of Ansi characters
Added:
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/wikidoc/
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/wikidoc/AnsiPrintingWikiVisitor.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/wikidoc/WikiParser.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/wikidoc/WikiVisitor.java
karaf/trunk/shell/osgi/src/test/
karaf/trunk/shell/osgi/src/test/java/
karaf/trunk/shell/osgi/src/test/java/org/
karaf/trunk/shell/osgi/src/test/java/org/apache/
karaf/trunk/shell/osgi/src/test/java/org/apache/karaf/
karaf/trunk/shell/osgi/src/test/java/org/apache/karaf/shell/
karaf/trunk/shell/osgi/src/test/java/org/apache/karaf/shell/osgi/
Modified:
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Info.java
karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/bundle.info
Modified:
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Info.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Info.java?rev=1132627r1=1132626r2=1132627view=diff
==
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Info.java
(original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Info.java
Mon Jun 6 13:19:19 2011
@@ -17,11 +17,15 @@
package org.apache.karaf.shell.osgi;
import java.io.BufferedReader;
+import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.List;
import org.apache.felix.gogo.commands.Command;
+import org.apache.karaf.shell.osgi.wikidoc.AnsiPrintingWikiVisitor;
+import org.apache.karaf.shell.osgi.wikidoc.WikiParser;
+import org.apache.karaf.shell.osgi.wikidoc.WikiVisitor;
import org.apache.karaf.util.StringEscapeUtils;
import org.osgi.framework.Bundle;
@@ -54,15 +58,21 @@ public class Info extends BundlesCommand
System.out.println(Util.getUnderlineString(title));
URL bundleInfo = bundle.getEntry(OSGI-INF/bundle.info);
if (bundleInfo != null) {
+ BufferedReader reader = null;
try {
-BufferedReader reader = new BufferedReader(new
InputStreamReader(bundleInfo.openStream()));
-String line;
-while ((line = reader.readLine()) != null) {
-System.out.println(StringEscapeUtils.unescapeJava(line));
-}
-reader.close();
+reader = new BufferedReader(new
InputStreamReader(bundleInfo.openStream()));
+WikiVisitor visitor = new AnsiPrintingWikiVisitor(System.out);
+WikiParser parser = new WikiParser(visitor);
+parser.parse(reader);
} catch (Exception e) {
// ignore
+} finally {
+ if (reader != null) {
+ try {
+ reader.close();
+ } catch (IOException e) {
+ }
+ }
}
}
}
Added:
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/wikidoc/AnsiPrintingWikiVisitor.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/wikidoc/AnsiPrintingWikiVisitor.java?rev=1132627view=auto
==
---
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/wikidoc/AnsiPrintingWikiVisitor.java
(added)
+++
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/wikidoc/AnsiPrintingWikiVisitor.java
Mon Jun 6 13:19:19 2011
@@ -0,0 +1,42 @@
+package org.apache.karaf.shell.osgi.wikidoc;
+
+import java.io.PrintStream;
+
+import org.fusesource.jansi.Ansi;
+import org.fusesource.jansi.Ansi.Attribute;
+import org.fusesource.jansi.Ansi.Color;
+
+/**
+ * Translates the Wiki tags to Ansi escape sequences to display them on the
console
+ */
+public class AnsiPrintingWikiVisitor implements WikiVisitor {
+ private PrintStream out;
+
+ public AnsiPrintingWikiVisitor(PrintStream out) {
+ this.out = out;
+ }
+
+ @Override
+ public void heading(int level, String header) {
+ this.out.print(Ansi.ansi().a(Attribute.INTENSITY_BOLD).a(header)
+ .a(Attribute.INTENSITY_BOLD_OFF).toString());
+ }
+
+ @Override
+ public void link(String target, String title) {
+ this.out.print(Ansi.ansi().fg(Color.YELLOW)
+ .a(target).fg(Color.DEFAULT
svn commit: r1132631 - in /karaf/trunk/shell/osgi/src/test/java/org/apache/karaf/shell/osgi/wikidoc: ./ WikiParserTest.java
Author: cschneider
Date: Mon Jun 6 13:33:28 2011
New Revision: 1132631
URL: http://svn.apache.org/viewvc?rev=1132631view=rev
Log:
KARAF-664 Support Wiki Syntax in bundle.info instead of Ansi characters
Added:
karaf/trunk/shell/osgi/src/test/java/org/apache/karaf/shell/osgi/wikidoc/
karaf/trunk/shell/osgi/src/test/java/org/apache/karaf/shell/osgi/wikidoc/WikiParserTest.java
Added:
karaf/trunk/shell/osgi/src/test/java/org/apache/karaf/shell/osgi/wikidoc/WikiParserTest.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/test/java/org/apache/karaf/shell/osgi/wikidoc/WikiParserTest.java?rev=1132631view=auto
==
---
karaf/trunk/shell/osgi/src/test/java/org/apache/karaf/shell/osgi/wikidoc/WikiParserTest.java
(added)
+++
karaf/trunk/shell/osgi/src/test/java/org/apache/karaf/shell/osgi/wikidoc/WikiParserTest.java
Mon Jun 6 13:33:28 2011
@@ -0,0 +1,78 @@
+package org.apache.karaf.shell.osgi.wikidoc;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import org.easymock.EasyMock;
+import org.junit.Test;
+
+public class WikiParserTest {
+
+ private static final String TESTDOC =
+ h1. myTestdoc\n +
+ \n +
+ Some text\n +
+ * enumeration\n +
+some text [a link] some more text\n +
+ h1 is no heading;
+
+ private static final String HEADINGCASES =
+ h1.\n +
+ hf.;
+
+ @Test
+ public void parseTestDoc() throws IOException {
+ WikiVisitor visitor =
EasyMock.createStrictMock(WikiVisitor.class);
+ visitor.heading(1, myTestdoc);
+ EasyMock.expectLastCall();
+ visitor.text(\n);
+ EasyMock.expectLastCall();
+ visitor.text(\n);
+ EasyMock.expectLastCall();
+ visitor.text(Some text);
+ EasyMock.expectLastCall();
+ visitor.text(\n);
+ EasyMock.expectLastCall();
+ visitor.enumeration(enumeration);
+ EasyMock.expectLastCall();
+ visitor.text(\n);
+ EasyMock.expectLastCall();
+ visitor.text( some text );
+ EasyMock.expectLastCall();
+ visitor.link(a link, );
+ EasyMock.expectLastCall();
+ visitor.text( some more text);
+ EasyMock.expectLastCall();
+ visitor.text(\n);
+ EasyMock.expectLastCall();
+ visitor.text(h1 is no heading);
+ EasyMock.expectLastCall();
+ visitor.text(\n);
+ EasyMock.expectLastCall();
+
+ EasyMock.replay(visitor);
+ WikiParser parser = new WikiParser(visitor);
+ parser.parse(new StringReader(TESTDOC));
+ EasyMock.verify(visitor);
+ }
+
+ @Test
+ public void parseHeadingSpecialCases() throws IOException {
+ WikiVisitor visitor =
EasyMock.createStrictMock(WikiVisitor.class);
+
+ visitor.heading(1, );
+ EasyMock.expectLastCall();
+ visitor.text(\n);
+ EasyMock.expectLastCall();
+
+ visitor.text(hf.);
+ EasyMock.expectLastCall();
+ visitor.text(\n);
+ EasyMock.expectLastCall();
+
+ EasyMock.replay(visitor);
+ WikiParser parser = new WikiParser(visitor);
+ parser.parse(new StringReader(HEADINGCASES));
+ EasyMock.verify(visitor);
+ }
+}
svn commit: r1132633 - /karaf/trunk/shell/http/
Author: cschneider Date: Mon Jun 6 13:35:43 2011 New Revision: 1132633 URL: http://svn.apache.org/viewvc?rev=1132633view=rev Log: Ignoring target and other resources Modified: karaf/trunk/shell/http/ (props changed) Propchange: karaf/trunk/shell/http/ -- --- svn:ignore (added) +++ svn:ignore Mon Jun 6 13:35:43 2011 @@ -0,0 +1,4 @@ +target +.classpath +.project +.settings
svn commit: r1132640 - /karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java
Author: cschneider Date: Mon Jun 6 13:45:15 2011 New Revision: 1132640 URL: http://svn.apache.org/viewvc?rev=1132640view=rev Log: KARAF-573 Print out if the console has to be restarted when the osgi framework is changed Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java?rev=1132640r1=1132639r2=1132640view=diff == --- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java (original) +++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java Mon Jun 6 13:45:15 2011 @@ -69,6 +69,7 @@ public class FrameworkOptions extends Os Properties props = new Properties(new File(System.getProperty(karaf.base), etc/config.properties)); props.put(karaf.framework, framework.toLowerCase()); props.save(); +System.out.println(Changed OSGi framework to + framework.toLowerCase() + . Karaf needs to be restarted to make the change effective); } return null;
svn commit: r1133412 - in /karaf/trunk/features: command/src/main/java/org/apache/karaf/features/command/ core/ core/src/main/java/org/apache/karaf/features/internal/ core/src/main/java/org/apache/kar
Author: cschneider
Date: Wed Jun 8 14:16:50 2011
New Revision: 1133412
URL: http://svn.apache.org/viewvc?rev=1133412view=rev
Log:
KARAF-601 Old feature files are now read correctly. Refactored list command
Modified:
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListFeaturesCommand.java
karaf/trunk/features/core/pom.xml
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/FeatureValidationUtil.java
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/model/JaxbUtil.java
karaf/trunk/features/core/src/test/java/org/apache/karaf/features/FeaturesServiceTest.java
Modified:
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListFeaturesCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListFeaturesCommand.java?rev=1133412r1=1133411r2=1133412view=diff
==
---
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListFeaturesCommand.java
(original)
+++
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListFeaturesCommand.java
Wed Jun 8 14:16:50 2011
@@ -33,7 +33,7 @@ public class ListFeaturesCommand extends
boolean installed;
private static final String STATE = State;
-private static final String INSTALLED = installed ;
+private static final String INSTALLED = installed;
private static final String UNINSTALLED = uninstalled;
private static final String VERSION = Version;
@@ -42,20 +42,29 @@ public class ListFeaturesCommand extends
private static final String DESCRIPTION = Description;
protected void doExecute(FeaturesService admin) throws Exception {
+ListInfoLine lines = new ArrayListListFeaturesCommand.InfoLine();
+boolean needsLegend = false;
// Get the feature data to print.
-ListFeature features = new ArrayListFeature();
-ListRepository repositories = new ArrayListRepository();
for (Repository r : Arrays.asList(admin.listRepositories())) {
for (Feature f : r.getFeatures()) {
if (installed !admin.isInstalled(f)) {
+// Filter out not installed features if we only want to
see the installed ones
continue;
}
-features.add(f);
-repositories.add(r);
+InfoLine line = new InfoLine();
+line.state = admin.isInstalled(f) ? INSTALLED : UNINSTALLED;
+line.version = getSafeString(f.getVersion());
+line.name = getSafeString(f.getName());
+line.repoName = getSafeString(r.getName());
+line.description = getSafeString(f.getDescription());
+if (isInstalledViaDeployDir(line.repoName)) {
+needsLegend = true;
+}
+lines.add(line);
}
}
-if (features.size() == 0) {
+if (lines.size() == 0) {
if (installed) {
System.out.println(No features installed.);
} else {
@@ -64,84 +73,22 @@ public class ListFeaturesCommand extends
return;
}
-// Print column headers.
+// Determine size of columns
int maxVersionSize = VERSION.length();
-for (Feature f : features) {
-maxVersionSize = Math.max(maxVersionSize, f.getVersion().length());
-}
int maxNameSize = NAME.length();
-for (Feature f : features) {
-maxNameSize = Math.max(maxNameSize, f.getName().length());
-}
int maxRepositorySize = REPOSITORY.length();
-for (Repository repository:repositories) {
-maxRepositorySize = Math.max(maxRepositorySize,
repository.getName().length());
-}
-
-StringBuilder sb = new StringBuilder();
-sb.append(STATE).append( ).append(VERSION).append( );
-for (int i = VERSION.length(); i maxVersionSize; i++) {
-sb.append( );
-}
-sb.append(NAME).append( );
-for (int i = NAME.length(); i maxNameSize; i++) {
-sb.append( );
+for (InfoLine line : lines) {
+maxVersionSize = Math.max(maxVersionSize, line.version.length());
+maxNameSize = Math.max(maxNameSize, line.name.length());
+maxRepositorySize = Math.max(maxRepositorySize,
line.repoName.length());
}
-sb.append(REPOSITORY).append( );
-
-for (int i = REPOSITORY.length(); i maxRepositorySize; i++) {
-sb.append( );
-}
-sb.append(DESCRIPTION);
-System.out.println(sb.toString());
-
-// Print
svn commit: r1142911 - in /karaf/branches/karaf-2.2.x/features/obr/src: main/java/org/apache/karaf/features/obr/internal/ObrResolver.java test/java/org/apache/karaf/features/obr/internal/ObrResolverTe
Author: cschneider
Date: Tue Jul 5 07:53:11 2011
New Revision: 1142911
URL: http://svn.apache.org/viewvc?rev=1142911view=rev
Log:
KARAF-667 Fix for IllegalArgumentException
Modified:
karaf/branches/karaf-2.2.x/features/obr/src/main/java/org/apache/karaf/features/obr/internal/ObrResolver.java
karaf/branches/karaf-2.2.x/features/obr/src/test/java/org/apache/karaf/features/obr/internal/ObrResolverTest.java
Modified:
karaf/branches/karaf-2.2.x/features/obr/src/main/java/org/apache/karaf/features/obr/internal/ObrResolver.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/obr/src/main/java/org/apache/karaf/features/obr/internal/ObrResolver.java?rev=1142911r1=1142910r2=1142911view=diff
==
---
karaf/branches/karaf-2.2.x/features/obr/src/main/java/org/apache/karaf/features/obr/internal/ObrResolver.java
(original)
+++
karaf/branches/karaf-2.2.x/features/obr/src/main/java/org/apache/karaf/features/obr/internal/ObrResolver.java
Tue Jul 5 07:53:11 2011
@@ -35,7 +35,6 @@ import org.apache.felix.bundlerepository
import org.apache.karaf.features.BundleInfo;
import org.apache.karaf.features.Feature;
import org.apache.karaf.features.Resolver;
-import org.osgi.framework.InvalidSyntaxException;
public class ObrResolver implements Resolver {
@@ -70,16 +69,19 @@ public class ObrResolver implements Reso
ListResource deploy = new ArrayListResource();
MapObject, BundleInfo infos = new HashMapObject, BundleInfo();
for (BundleInfo bundleInfo : feature.getBundles()) {
+ URL url = null;
try {
-URL url = new URL(bundleInfo.getLocation());
-Resource res = repositoryAdmin.getHelper().createResource(url);
-ress.add(res);
-infos.put(res, bundleInfo);
+url = new URL(bundleInfo.getLocation());
} catch (MalformedURLException e) {
Requirement req = parseRequirement(bundleInfo.getLocation());
reqs.add(req);
infos.put(req, bundleInfo);
}
+if (url != null) {
+ Resource res = repositoryAdmin.getHelper().createResource(url);
+ ress.add(res);
+ infos.put(res, bundleInfo);
+}
}
Repository repository =
repositoryAdmin.getHelper().repository(ress.toArray(new Resource[ress.size()]));
@@ -159,7 +161,7 @@ public class ObrResolver implements Reso
out.println();
}
-protected Requirement parseRequirement(String req) throws
InvalidSyntaxException {
+protected Requirement parseRequirement(String req) {
int p = req.indexOf(':');
String name;
String filter;
Modified:
karaf/branches/karaf-2.2.x/features/obr/src/test/java/org/apache/karaf/features/obr/internal/ObrResolverTest.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/obr/src/test/java/org/apache/karaf/features/obr/internal/ObrResolverTest.java?rev=1142911r1=1142910r2=1142911view=diff
==
---
karaf/branches/karaf-2.2.x/features/obr/src/test/java/org/apache/karaf/features/obr/internal/ObrResolverTest.java
(original)
+++
karaf/branches/karaf-2.2.x/features/obr/src/test/java/org/apache/karaf/features/obr/internal/ObrResolverTest.java
Tue Jul 5 07:53:11 2011
@@ -16,6 +16,16 @@
*/
package org.apache.karaf.features.obr.internal;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.List;
import org.apache.felix.bundlerepository.Reason;
@@ -32,13 +42,6 @@ import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.junit.Test;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
public class ObrResolverTest {
@Test
@@ -65,8 +68,8 @@ public class ObrResolverTest {
expect(resolver.resolve(Resolver.NO_OPTIONAL_RESOURCES)).andReturn(true);
expect(resolver.getAddedResources()).andReturn(new Resource[] { });
expect(resolver.getRequiredResources()).andReturn(new Resource[] {
resource });
-expect(resolver.getReason(resource)).andAnswer(new IAnswer() {
-public Object answer() throws Throwable {
+expect(resolver.getReason(resource)).andAnswer(new IAnswerReason[]()
{
+public Reason[] answer() throws
svn commit: r1142918 - in /karaf/trunk/features/obr/src: main/java/org/apache/karaf/features/obr/internal/ObrResolver.java test/java/org/apache/karaf/features/obr/internal/ObrResolverTest.java
Author: cschneider
Date: Tue Jul 5 08:21:08 2011
New Revision: 1142918
URL: http://svn.apache.org/viewvc?rev=1142918view=rev
Log:
KARAF-667 Fix for IllegalArgumentException
Modified:
karaf/trunk/features/obr/src/main/java/org/apache/karaf/features/obr/internal/ObrResolver.java
karaf/trunk/features/obr/src/test/java/org/apache/karaf/features/obr/internal/ObrResolverTest.java
Modified:
karaf/trunk/features/obr/src/main/java/org/apache/karaf/features/obr/internal/ObrResolver.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/obr/src/main/java/org/apache/karaf/features/obr/internal/ObrResolver.java?rev=1142918r1=1142917r2=1142918view=diff
==
---
karaf/trunk/features/obr/src/main/java/org/apache/karaf/features/obr/internal/ObrResolver.java
(original)
+++
karaf/trunk/features/obr/src/main/java/org/apache/karaf/features/obr/internal/ObrResolver.java
Tue Jul 5 08:21:08 2011
@@ -70,16 +70,19 @@ public class ObrResolver implements Reso
ListResource deploy = new ArrayListResource();
MapObject, BundleInfo infos = new HashMapObject, BundleInfo();
for (BundleInfo bundleInfo : feature.getBundles()) {
+ URL url = null;
try {
-URL url = new URL(bundleInfo.getLocation());
-Resource res = repositoryAdmin.getHelper().createResource(url);
-ress.add(res);
-infos.put(res, bundleInfo);
+url = new URL(bundleInfo.getLocation());
} catch (MalformedURLException e) {
Requirement req = parseRequirement(bundleInfo.getLocation());
reqs.add(req);
infos.put(req, bundleInfo);
}
+if (url != null) {
+ Resource res = repositoryAdmin.getHelper().createResource(url);
+ ress.add(res);
+ infos.put(res, bundleInfo);
+}
}
Repository repository =
repositoryAdmin.getHelper().repository(ress.toArray(new Resource[ress.size()]));
Modified:
karaf/trunk/features/obr/src/test/java/org/apache/karaf/features/obr/internal/ObrResolverTest.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/obr/src/test/java/org/apache/karaf/features/obr/internal/ObrResolverTest.java?rev=1142918r1=1142917r2=1142918view=diff
==
---
karaf/trunk/features/obr/src/test/java/org/apache/karaf/features/obr/internal/ObrResolverTest.java
(original)
+++
karaf/trunk/features/obr/src/test/java/org/apache/karaf/features/obr/internal/ObrResolverTest.java
Tue Jul 5 08:21:08 2011
@@ -16,6 +16,16 @@
*/
package org.apache.karaf.features.obr.internal;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.List;
import org.apache.felix.bundlerepository.Reason;
@@ -32,13 +42,6 @@ import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.junit.Test;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
public class ObrResolverTest {
@Test
@@ -65,8 +68,8 @@ public class ObrResolverTest {
expect(resolver.resolve(Resolver.NO_OPTIONAL_RESOURCES)).andReturn(true);
expect(resolver.getAddedResources()).andReturn(new Resource[] { });
expect(resolver.getRequiredResources()).andReturn(new Resource[] {
resource });
-expect(resolver.getReason(resource)).andAnswer(new IAnswer() {
-public Object answer() throws Throwable {
+expect(resolver.getReason(resource)).andAnswer(new IAnswerReason[]()
{
+public Reason[] answer() throws Throwable {
return new Reason[] { new ReasonImpl( resource,
captureReq.getValue()) };
}
});
@@ -108,13 +111,13 @@ public class ObrResolverTest {
expect(resolver.getAddedResources()).andReturn(new Resource[] { });
expect(resolver.getRequiredResources()).andReturn(new Resource[] {
resource });
expect(resolver.getOptionalResources()).andReturn(new Resource[] {
optionalResource});
-expect(resolver.getReason(resource)).andAnswer(new IAnswer() {
-public Object answer() throws Throwable {
+expect(resolver.getReason(resource)).andAnswer(new IAnswerReason[]()
{
+public Reason[] answer() throws Throwable {
return new Reason[] { new ReasonImpl
svn commit: r1143028 - /karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/KarafFileHistory.java
Author: cschneider
Date: Tue Jul 5 12:42:12 2011
New Revision: 1143028
URL: http://svn.apache.org/viewvc?rev=1143028view=rev
Log: (empty)
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/KarafFileHistory.java
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/KarafFileHistory.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/KarafFileHistory.java?rev=1143028r1=1143027r2=1143028view=diff
==
---
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/KarafFileHistory.java
(original)
+++
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/KarafFileHistory.java
Tue Jul 5 12:42:12 2011
@@ -18,7 +18,6 @@ public final class KarafFileHistory exte
public KarafFileHistory(File file) throws IOException {
super(file);
-file.getParentFile().mkdirs();
}
@Override
svn commit: r1143031 - /karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
Author: cschneider
Date: Tue Jul 5 12:49:35 2011
New Revision: 1143031
URL: http://svn.apache.org/viewvc?rev=1143031view=rev
Log: (empty)
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java?rev=1143031r1=1143030r2=1143031view=diff
==
---
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
(original)
+++
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
Tue Jul 5 12:49:35 2011
@@ -105,6 +105,7 @@ public class Console implements Runnable
final File file = getHistoryFile();
try {
+ file.getParentFile().mkdirs();
reader.setHistory(new KarafFileHistory(file));
} catch (Exception e) {
LOGGER.error(Can not read history from file + file +
. Using in memory history, e);
svn commit: r1143032 - in /karaf/branches/karaf-2.2.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline: Console.java KarafFileHistory.java
Author: cschneider
Date: Tue Jul 5 12:51:53 2011
New Revision: 1143032
URL: http://svn.apache.org/viewvc?rev=1143032view=rev
Log:
KARAF-281 Fixed
Added:
karaf/branches/karaf-2.2.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/KarafFileHistory.java
(with props)
Modified:
karaf/branches/karaf-2.2.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
Modified:
karaf/branches/karaf-2.2.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java?rev=1143032r1=1143031r2=1143032view=diff
==
---
karaf/branches/karaf-2.2.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
(original)
+++
karaf/branches/karaf-2.2.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
Tue Jul 5 12:51:53 2011
@@ -103,39 +103,13 @@ public class Console implements Runnable
this.terminal);
final File file = getHistoryFile();
-file.getParentFile().mkdirs();
-
-// We may not have the perms to read the history file...
-if( file.exists() file.canRead() ) {
-// Override the FileHistory impl to trap failures due to the
-// user does not having write access to the history file.
-reader.setHistory(new FileHistory(file) {
-boolean failed = false;
-@Override
-public void flush() throws IOException {
-if( !failed ) {
-try {
-super.flush();
-} catch (IOException e) {
-failed = true;
-LOGGER.debug(Cold not write history file: +file,
e);
-}
-}
-}
+try {
+file.getParentFile().mkdirs();
+ reader.setHistory(new KarafFileHistory(file));
+ } catch (Exception e) {
+ LOGGER.error(Can not read history from file + file +
. Using in memory history, e);
+ }
-@Override
-public void purge() throws IOException {
-if( !failed ) {
-try {
-super.purge();
-} catch (IOException e) {
-failed = true;
-LOGGER.debug(Cold not delete history file:
+file, e);
-}
-}
-}
-});
-}
session.put(.jline.history, reader.getHistory());
Completer completer = createCompleter();
if (completer != null) {
Added:
karaf/branches/karaf-2.2.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/KarafFileHistory.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/KarafFileHistory.java?rev=1143032view=auto
==
---
karaf/branches/karaf-2.2.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/KarafFileHistory.java
(added)
+++
karaf/branches/karaf-2.2.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/KarafFileHistory.java
Tue Jul 5 12:51:53 2011
@@ -0,0 +1,46 @@
+package org.apache.karaf.shell.console.jline;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jline.console.history.FileHistory;
+
+/**
+ * Override the FileHistory impl to trap failures due to the
+ * user does not having write access to the history file.
+ */
+public final class KarafFileHistory extends FileHistory {
+ static final Logger LOGGER =
LoggerFactory.getLogger(KarafFileHistory.class);
+ boolean failed = false;
+
+ public KarafFileHistory(File file) throws IOException {
+ super(file);
+ }
+
+ @Override
+ public void flush() throws IOException {
+ if( !failed ) {
+ try {
+ super.flush();
+ } catch (IOException e) {
+ failed = true;
+ LOGGER.debug(Could not write history file: + getFile(),
e);
+ }
+ }
+ }
+
+ @Override
+ public void purge() throws IOException {
+ if( !failed ) {
+ try {
+ super.purge();
+ } catch (IOException e) {
+ failed = true;
+ LOGGER.debug(Could not delete history file: + getFile(),
e);
+ }
+ }
+ }
+}
\ No newline at end of file
Propchange
svn commit: r1143292 - /karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java
Author: cschneider
Date: Wed Jul 6 08:47:59 2011
New Revision: 1143292
URL: http://svn.apache.org/viewvc?rev=1143292view=rev
Log:
Some refactoring and improved error handling
Modified:
karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java
Modified:
karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java?rev=1143292r1=1143291r2=1143292view=diff
==
---
karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java
(original)
+++
karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java
Wed Jul 6 08:47:59 2011
@@ -19,6 +19,7 @@ package org.apache.karaf.admin.internal;
import java.io.*;
import java.net.Socket;
import java.net.URL;
+import java.net.UnknownHostException;
import org.apache.felix.utils.properties.InterpolationHelper;
import org.apache.felix.utils.properties.Properties;
@@ -34,17 +35,10 @@ public class InstanceImpl implements Ins
private static final Logger LOG =
LoggerFactory.getLogger(InstanceImpl.class);
private static final String CONFIG_PROPERTIES_FILE_NAME =
config.properties;
-
private static final String KARAF_SHUTDOWN_PORT = karaf.shutdown.port;
-
private static final String KARAF_SHUTDOWN_HOST = karaf.shutdown.host;
-
private static final String KARAF_SHUTDOWN_PORT_FILE =
karaf.shutdown.port.file;
-
private static final String KARAF_SHUTDOWN_COMMAND =
karaf.shutdown.command;
-
-private static final String KARAF_SHUTDOWN_PID_FILE =
karaf.shutdown.pid.file;
-
private static final String DEFAULT_SHUTDOWN_COMMAND = SHUTDOWN;
private AdminServiceImpl service;
@@ -327,38 +321,54 @@ public class InstanceImpl implements Ins
props.put(name,
InterpolationHelper.substVars(props.get(name), name,
null, props, null));
}
-int port = 0;
-if (props.get(KARAF_SHUTDOWN_PORT) != null)
-port = Integer.parseInt(props.get(KARAF_SHUTDOWN_PORT));
+
String host = localhost;
if (props.get(KARAF_SHUTDOWN_HOST) != null)
host = props.get(KARAF_SHUTDOWN_HOST);
-String portFile = props.get(KARAF_SHUTDOWN_PORT_FILE);
+
String shutdown = DEFAULT_SHUTDOWN_COMMAND;
if (props.get(KARAF_SHUTDOWN_COMMAND) != null)
shutdown = props.get(KARAF_SHUTDOWN_COMMAND);
-if (port == 0 portFile != null) {
-BufferedReader r = new BufferedReader(new
InputStreamReader(new FileInputStream(portFile)));
-String portStr = r.readLine();
-port = Integer.parseInt(portStr);
-r.close();
-}
+
+int port = getShutDownPort(props);
+
// We found the port, try to send the command
if (port 0) {
-Socket s = new Socket(host, port);
-s.getOutputStream().write(shutdown.getBytes());
-s.close();
-long t = System.currentTimeMillis() + service.getStopTimeout();
-do {
-Thread.sleep(100);
-checkProcess();
-} while (System.currentTimeMillis() t process != null);
+tryShutDownAndWait(host, shutdown, port,
service.getStopTimeout());
}
} catch (Exception e) {
LOG.debug(Unable to cleanly shutdown instance, e);
}
}
+ private void tryShutDownAndWait(String host, String shutdownCommand,
int port, long stopTimeout)
+ throws UnknownHostException, IOException,
InterruptedException {
+ Socket s = new Socket(host, port);
+ s.getOutputStream().write(shutdownCommand.getBytes());
+ s.close();
+ long t = System.currentTimeMillis() + stopTimeout;
+ do {
+ Thread.sleep(100);
+ checkProcess();
+ } while (System.currentTimeMillis() t process != null);
+ }
+
+ private int getShutDownPort(Properties props) throws
FileNotFoundException,
+ IOException {
+ int port = 0;
+ if (props.get(KARAF_SHUTDOWN_PORT) != null)
+ port = Integer.parseInt(props.get(KARAF_SHUTDOWN_PORT));
+ // Try to get port from port file
+ String portFile = props.get(KARAF_SHUTDOWN_PORT_FILE);
+ if (port == 0 portFile != null) {
+ BufferedReader r = new BufferedReader(new
InputStreamReader(new FileInputStream(portFile)));
+ String portStr = r.readLine();
+ port
svn commit: r1143298 - /karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java
Author: cschneider Date: Wed Jul 6 08:52:38 2011 New Revision: 1143298 URL: http://svn.apache.org/viewvc?rev=1143298view=rev Log: Removing unused import Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java?rev=1143298r1=1143297r2=1143298view=diff == --- karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java (original) +++ karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java Wed Jul 6 08:52:38 2011 @@ -18,8 +18,6 @@ */ package org.apache.felix.gogo.commands; -import org.apache.karaf.shell.console.completer.StringsCompleter; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target;
svn commit: r1143751 [3/3] - in /karaf/trunk: demos/web/src/main/java/org/apache/karaf/web/ main/src/main/java/org/apache/karaf/main/ main/src/main/java/org/apache/karaf/main/lock/ main/src/main/java/
Added:
karaf/trunk/main/src/main/java/org/apache/karaf/main/ShutdownSocketThread.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/ShutdownSocketThread.java?rev=1143751view=auto
==
---
karaf/trunk/main/src/main/java/org/apache/karaf/main/ShutdownSocketThread.java
(added)
+++
karaf/trunk/main/src/main/java/org/apache/karaf/main/ShutdownSocketThread.java
Thu Jul 7 10:26:31 2011
@@ -0,0 +1,102 @@
+package org.apache.karaf.main;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.security.AccessControlException;
+import java.util.Random;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.osgi.framework.launch.Framework;
+
+class ShutdownSocketThread extends Thread {
+ Logger LOG = Logger.getLogger(this.getClass().getName());
+
+/**
+*
+*/
+ private final String shutdown;
+private Random random = null;
+private ServerSocket shutdownSocket;
+ private Framework framework;
+
+public ShutdownSocketThread(String shutdown, ServerSocket shutdownSocket,
Framework framework) {
+ this.shutdown = shutdown;
+ this.shutdownSocket = shutdownSocket;
+ this.framework = framework;
+}
+
+public void run() {
+try {
+while (true) {
+// Wait for the next connection
+Socket socket = null;
+InputStream stream = null;
+try {
+socket = shutdownSocket.accept();
+socket.setSoTimeout(10 * 1000); // Ten seconds
+stream = socket.getInputStream();
+} catch (AccessControlException ace) {
+LOG.log(Level.WARNING, Karaf shutdown socket: security
exception:
+ + ace.getMessage(), ace);
+continue;
+} catch (IOException e) {
+LOG.log(Level.SEVERE, Karaf shutdown socket: accept: ,
e);
+System.exit(1);
+}
+
+// Read a set of characters from the socket
+StringBuilder command = new StringBuilder();
+int expected = 1024; // Cut off to avoid DoS attack
+while (expected shutdown.length()) {
+if (random == null) {
+random = new Random();
+}
+expected += (random.nextInt() % 1024);
+}
+while (expected 0) {
+int ch;
+try {
+ch = stream.read();
+} catch (IOException e) {
+LOG.log(Level.WARNING, Karaf shutdown socket: read:
, e);
+ch = -1;
+}
+if (ch 32) { // Control character or EOF terminates loop
+break;
+}
+command.append((char) ch);
+expected--;
+}
+
+// Close the socket now that we are done with it
+try {
+socket.close();
+} catch (IOException e) {
+// Ignore
+}
+
+// Match against our command string
+boolean match = command.toString().equals(shutdown);
+if (match) {
+LOG.log(Level.INFO, Karaf shutdown socket: received
shutdown command. Stopping framework...);
+framework.stop();
+break;
+} else {
+LOG.log(Level.WARNING, Karaf shutdown socket: Invalid
command ' +
+ command.toString() + ' received);
+}
+}
+} catch (Exception e) {
+e.printStackTrace();
+} finally {
+try {
+shutdownSocket.close();
+} catch (IOException e) {
+// Ignore
+}
+}
+}
+}
\ No newline at end of file
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/Stop.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/Stop.java?rev=1143751r1=1143750r2=1143751view=diff
==
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/Stop.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/Stop.java Thu Jul 7
10:26:31 2011
@@ -18,14 +18,6 @@
*/
package org.apache.karaf.main;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.net.Socket;
-import java.net.URL;
-import
svn commit: r1143811 - in /karaf/trunk/main/src/main/java/org/apache/karaf/main: InstanceInfoManager.java LifecycleManager.java Main.java util/Utils.java
Author: cschneider
Date: Thu Jul 7 13:19:36 2011
New Revision: 1143811
URL: http://svn.apache.org/viewvc?rev=1143811view=rev
Log:
KARAF-713 Moving handling of instance informations to a separate class, moving
some util methods out of Main
Added:
karaf/trunk/main/src/main/java/org/apache/karaf/main/InstanceInfoManager.java
Modified:
karaf/trunk/main/src/main/java/org/apache/karaf/main/LifecycleManager.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/util/Utils.java
Added:
karaf/trunk/main/src/main/java/org/apache/karaf/main/InstanceInfoManager.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/InstanceInfoManager.java?rev=1143811view=auto
==
---
karaf/trunk/main/src/main/java/org/apache/karaf/main/InstanceInfoManager.java
(added)
+++
karaf/trunk/main/src/main/java/org/apache/karaf/main/InstanceInfoManager.java
Thu Jul 7 13:19:36 2011
@@ -0,0 +1,95 @@
+package org.apache.karaf.main;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.lang.management.ManagementFactory;
+import java.util.Properties;
+
+public class InstanceInfoManager {
+
+ static void writePid(String pidFile) {
+ try {
+ if (pidFile != null) {
+ String pid = getMyPid();
+ Writer w = new OutputStreamWriter(new
FileOutputStream(pidFile));
+ w.write(pid);
+ w.close();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ static void updateInstanceInfo(File karafHome, File karafBase) {
+ try {
+ String instanceName = System.getProperty(karaf.name);
+ String pid = getMyPid();
+
+ boolean isRoot = karafHome.equals(karafBase);
+
+ if (instanceName != null) {
+ String storage =
System.getProperty(karaf.instances);
+ if (storage == null) {
+ throw new Exception(
+ System property
'karaf.instances' is not set. \n
+ + This
property needs to be set to the full path of the instance.properties file.);
+ }
+ File storageFile = new File(storage);
+ File propertiesFile = new File(storageFile,
+ instance.properties);
+ Properties props = new Properties();
+ if (propertiesFile.exists()) {
+ FileInputStream fis = new
FileInputStream(propertiesFile);
+ props.load(fis);
+ int count =
Integer.parseInt(props.getProperty(count));
+ for (int i = 0; i count; i++) {
+ String name =
props.getProperty(item. + i + .name);
+ if (name.equals(instanceName)) {
+
props.setProperty(item. + i + .pid, pid);
+
writeProperties(propertiesFile, props);
+ fis.close();
+ return;
+ }
+ }
+ fis.close();
+ if (!isRoot) {
+ throw new Exception(Instance
+ instanceName
+ + not found);
+ }
+ } else if (isRoot) {
+ propertiesFile.getParentFile().mkdirs();
+ props.setProperty(count, 1);
+ props.setProperty(item.0.name,
instanceName);
+ props.setProperty(item.0.loc,
karafHome.getAbsolutePath());
+ props.setProperty(item.0.pid, pid);
+ props.setProperty(item.0.root,
true
svn commit: r1144288 - in /karaf/trunk/shell/obr/src: main/java/org/apache/karaf/shell/obr/ListCommand.java main/resources/OSGI-INF/blueprint/shell-obr.xml test/java/org/apache/karaf/shell/obr/ListCom
Author: cschneider
Date: Fri Jul 8 12:32:36 2011
New Revision: 1144288
URL: http://svn.apache.org/viewvc?rev=1144288view=rev
Log:
Refactored ListCommand to get the RepositoryAdmin service using blueprint
Modified:
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java
karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
karaf/trunk/shell/obr/src/test/java/org/apache/karaf/shell/obr/ListCommandTest.java
Modified:
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java?rev=1144288r1=1144287r2=1144288view=diff
==
---
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java
(original)
+++
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java
Fri Jul 8 12:32:36 2011
@@ -20,16 +20,25 @@ import java.util.List;
import org.apache.felix.bundlerepository.RepositoryAdmin;
import org.apache.felix.bundlerepository.Resource;
+import org.apache.felix.gogo.commands.Action;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.service.command.CommandSession;
@Command(scope = obr, name = list, description = Lists OBR bundles,
optionally providing the given packages.)
-public class ListCommand extends ObrCommandSupport {
+public class ListCommand implements Action {
@Argument(index = 0, name = packages, description = A list of packages
separated by whitespaces., required = false, multiValued = true)
ListString packages;
+
+RepositoryAdmin repoAdmin;
-void doExecute(RepositoryAdmin admin) throws Exception {
+ public void setRepoAdmin(RepositoryAdmin repoAdmin) {
+ this.repoAdmin = repoAdmin;
+ }
+
+ @Override
+ public Object execute(CommandSession session) throws Exception {
StringBuilder substr = new StringBuilder();
if (packages != null) {
@@ -45,7 +54,7 @@ public class ListCommand extends ObrComm
} else {
query = (|(presentationname=* + substr + *)(symbolicname=*
+ substr + *));
}
-Resource[] resources = admin.discoverResources(query);
+Resource[] resources = repoAdmin.discoverResources(query);
int maxPName = 4;
int maxSName = 13;
int maxVersion = 7;
@@ -68,6 +77,7 @@ public class ListCommand extends ObrComm
if (resources == null || resources.length == 0) {
System.out.println(No matching bundles.);
}
+return null;
}
private String emptyIfNull(Object st) {
Modified:
karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml?rev=1144288r1=1144287r2=1144288view=diff
==
--- karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
(original)
+++ karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
Fri Jul 8 12:32:36 2011
@@ -18,6 +18,7 @@
--
blueprint xmlns=http://www.osgi.org/xmlns/blueprint/v1.0.0;
default-activation=lazy
+ reference id=repoAdmin
interface=org.apache.felix.bundlerepository.RepositoryAdmin/
command-bundle xmlns=http://karaf.apache.org/xmlns/shell/v1.0.0;
command name=obr/addUrl
@@ -33,7 +34,9 @@
action class=org.apache.karaf.shell.obr.InfoCommand/
/command
command name=obr/list
-action class=org.apache.karaf.shell.obr.ListCommand/
+action class=org.apache.karaf.shell.obr.ListCommand
+ property name=repoAdmin ref=repoAdmin/
+/action
/command
command name=obr/listUrl
action class=org.apache.karaf.shell.obr.ListUrlCommand/
Modified:
karaf/trunk/shell/obr/src/test/java/org/apache/karaf/shell/obr/ListCommandTest.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/test/java/org/apache/karaf/shell/obr/ListCommandTest.java?rev=1144288r1=1144287r2=1144288view=diff
==
---
karaf/trunk/shell/obr/src/test/java/org/apache/karaf/shell/obr/ListCommandTest.java
(original)
+++
karaf/trunk/shell/obr/src/test/java/org/apache/karaf/shell/obr/ListCommandTest.java
Fri Jul 8 12:32:36 2011
@@ -18,6 +18,7 @@ public class ListCommandTest {
IMocksControl control = EasyMock.createControl();
RepositoryAdmin repoAdmin =
control.createMock(RepositoryAdmin.class);
ListCommand command = new ListCommand();
+ command.setRepoAdmin(repoAdmin);
Resource[] resources
svn commit: r1144312 - in /karaf/trunk/shell/obr/src/main: java/org/apache/karaf/shell/obr/ObrCommandSupport.java resources/OSGI-INF/blueprint/shell-obr.xml
Author: cschneider Date: Fri Jul 8 13:40:18 2011 New Revision: 1144312 URL: http://svn.apache.org/viewvc?rev=1144312view=rev Log: Change service reference to optional so the command remains up even when the service is not there Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java?rev=1144312r1=1144311r2=1144312view=diff == --- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java (original) +++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java Fri Jul 8 13:40:18 2011 @@ -16,9 +16,15 @@ */ package org.apache.karaf.shell.obr; -import java.io.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.PrintStream; import java.util.List; -import java.util.Properties; import org.apache.felix.bundlerepository.Reason; import org.apache.felix.bundlerepository.Repository; Modified: karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml?rev=1144312r1=1144311r2=1144312view=diff == --- karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml (original) +++ karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml Fri Jul 8 13:40:18 2011 @@ -18,7 +18,10 @@ -- blueprint xmlns=http://www.osgi.org/xmlns/blueprint/v1.0.0; default-activation=lazy - reference id=repoAdmin interface=org.apache.felix.bundlerepository.RepositoryAdmin/ + reference id=repoAdmin + interface=org.apache.felix.bundlerepository.RepositoryAdmin + availability=optional + / command-bundle xmlns=http://karaf.apache.org/xmlns/shell/v1.0.0; command name=obr/addUrl
svn commit: r1144323 - in /karaf/trunk/shell/obr/src/main: java/org/apache/karaf/shell/obr/ListCommand.java resources/OSGI-INF/blueprint/shell-obr.xml
Author: cschneider
Date: Fri Jul 8 14:12:39 2011
New Revision: 1144323
URL: http://svn.apache.org/viewvc?rev=1144323view=rev
Log:
KARAF-717 Correct white space
Modified:
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java
karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
Modified:
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java?rev=1144323r1=1144322r2=1144323view=diff
==
---
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java
(original)
+++
karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListCommand.java
Fri Jul 8 14:12:39 2011
@@ -30,49 +30,46 @@ public class ListCommand implements Acti
@Argument(index = 0, name = packages, description = A list of packages
separated by whitespaces., required = false, multiValued = true)
ListString packages;
-
+
RepositoryAdmin repoAdmin;
- public void setRepoAdmin(RepositoryAdmin repoAdmin) {
- this.repoAdmin = repoAdmin;
- }
+public void setRepoAdmin(RepositoryAdmin repoAdmin) {
+this.repoAdmin = repoAdmin;
+}
- @Override
- public Object execute(CommandSession session) throws Exception {
+@Override
+public Object execute(CommandSession session) throws Exception {
StringBuilder substr = new StringBuilder();
if (packages != null) {
for (String packageName : packages) {
- substr.append( );
- substr.append(packageName);
+substr.append( );
+substr.append(packageName);
}
}
-
+
String query;
if ((substr == null) || (substr.length() == 0)) {
query = (|(presentationname=*)(symbolicname=*));
} else {
- query = (|(presentationname=* + substr + *)(symbolicname=*
+ substr + *));
+query = (|(presentationname=* + substr + *)(symbolicname=* +
substr + *));
}
Resource[] resources = repoAdmin.discoverResources(query);
int maxPName = 4;
int maxSName = 13;
int maxVersion = 7;
for (Resource resource : resources) {
- maxPName = Math.max(maxPName,
emptyIfNull(resource.getPresentationName()).length());
- maxSName = Math.max(maxSName,
emptyIfNull(resource.getSymbolicName()).length());
- maxVersion = Math.max(maxVersion,
emptyIfNull(resource.getVersion()).length());
- }
-
- String formatHeader = | %- + maxPName +s | %- + maxSName + s | %-
+ maxVersion + s |;
-String formatLine = | %- + maxPName +s | %- + maxSName + s |
%- + maxVersion + s |;
+maxPName = Math.max(maxPName,
emptyIfNull(resource.getPresentationName()).length());
+maxSName = Math.max(maxSName,
emptyIfNull(resource.getSymbolicName()).length());
+maxVersion = Math.max(maxVersion,
emptyIfNull(resource.getVersion()).length());
+}
+
+String formatHeader = %- + maxPName + s %- + maxSName + s
%- + maxVersion + s;
+String formatLine = [%- + maxPName + s] [%- + maxSName + s] [%-
+ maxVersion + s];
System.out.println(String.format(formatHeader, NAME, SYMBOLIC
NAME, VERSION));
for (Resource resource : resources) {
-System.out.println(String.format(formatLine,
- emptyIfNull(resource.getPresentationName()),
- emptyIfNull(resource.getSymbolicName()),
- emptyIfNull(resource.getVersion(;
- }
+System.out.println(String.format(formatLine,
emptyIfNull(resource.getPresentationName()),
emptyIfNull(resource.getSymbolicName()), emptyIfNull(resource.getVersion(;
+}
if (resources == null || resources.length == 0) {
System.out.println(No matching bundles.);
@@ -80,8 +77,8 @@ public class ListCommand implements Acti
return null;
}
- private String emptyIfNull(Object st) {
- return st == null ? : st.toString();
- }
+private String emptyIfNull(Object st) {
+return st == null ? : st.toString();
+}
}
Modified:
karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml?rev=1144323r1=1144322r2=1144323view=diff
==
--- karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
(original)
+++ karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
Fri Jul 8 14:12:39 2011
@@ -17,47 +17,47
svn commit: r1174859 - /karaf/site/trunk/src/main/webapp/index/community/articles.page
Author: cschneider Date: Fri Sep 23 16:10:34 2011 New Revision: 1174859 URL: http://svn.apache.org/viewvc?rev=1174859view=rev Log: Added Tutorial Modified: karaf/site/trunk/src/main/webapp/index/community/articles.page Modified: karaf/site/trunk/src/main/webapp/index/community/articles.page URL: http://svn.apache.org/viewvc/karaf/site/trunk/src/main/webapp/index/community/articles.page?rev=1174859r1=1174858r2=1174859view=diff == --- karaf/site/trunk/src/main/webapp/index/community/articles.page (original) +++ karaf/site/trunk/src/main/webapp/index/community/articles.page Fri Sep 23 16:10:34 2011 @@ -19,6 +19,7 @@ h2. Presentations h2. Tutorials * [Karaf Tutorial Part 1 - Installation and First application|http://www.liquid-reality.de/x/DIBZ] +* [Karaf Tutorial Part 2 - Using the Configuration Admin Service|http://www.liquid-reality.de/x/G4Be] * [Combining Karaf Features, PAX URL, and Maven to deploy a plain JAR as an OSGi bundle|http://davidvaleri.wordpress.com/2010/08/13/combining-karaf-features-pax-url-and-maven-to-deploy-a-plain-jar-as-an-osgi-bundle/] * Blocking system.exit in OSGi on Karaf [part1|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=67] [part2|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=82] [part3|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=94] [part4|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=101]
svn commit: r1176223 - /karaf/site/trunk/src/main/webapp/index/community/articles.page
Author: cschneider Date: Tue Sep 27 06:13:32 2011 New Revision: 1176223 URL: http://svn.apache.org/viewvc?rev=1176223view=rev Log: Added Part 3 of the Tutorials series Modified: karaf/site/trunk/src/main/webapp/index/community/articles.page Modified: karaf/site/trunk/src/main/webapp/index/community/articles.page URL: http://svn.apache.org/viewvc/karaf/site/trunk/src/main/webapp/index/community/articles.page?rev=1176223r1=1176222r2=1176223view=diff == --- karaf/site/trunk/src/main/webapp/index/community/articles.page (original) +++ karaf/site/trunk/src/main/webapp/index/community/articles.page Tue Sep 27 06:13:32 2011 @@ -20,6 +20,7 @@ h2. Tutorials * [Karaf Tutorial Part 1 - Installation and First application|http://www.liquid-reality.de/x/DIBZ] * [Karaf Tutorial Part 2 - Using the Configuration Admin Service|http://www.liquid-reality.de/x/G4Be] +* [Karaf Tutorial Part 3 - Improving configuration editing using the OSGI Metatype Service|http://www.liquid-reality.de/x/KoBe] * [Combining Karaf Features, PAX URL, and Maven to deploy a plain JAR as an OSGi bundle|http://davidvaleri.wordpress.com/2010/08/13/combining-karaf-features-pax-url-and-maven-to-deploy-a-plain-jar-as-an-osgi-bundle/] * Blocking system.exit in OSGi on Karaf [part1|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=67] [part2|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=82] [part3|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=94] [part4|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=101]
svn commit: r1209043 - /karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/DefaultActionPreparator.java
Author: cschneider Date: Thu Dec 1 11:42:28 2011 New Revision: 1209043 URL: http://svn.apache.org/viewvc?rev=1209043view=rev Log: Add a hint to the --help option when the user calls a command with an unknown option Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/DefaultActionPreparator.java Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/DefaultActionPreparator.java URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/DefaultActionPreparator.java?rev=1209043r1=1209042r2=1209043view=diff == --- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/DefaultActionPreparator.java (original) +++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/DefaultActionPreparator.java Thu Dec 1 11:42:28 2011 @@ -186,6 +186,8 @@ public class DefaultActionPreparator imp .a(param) .a(Ansi.Attribute.INTENSITY_BOLD_OFF) .fg(Ansi.Color.DEFAULT) +.newline() +.a(Try ' + command.scope() + : + command.name() + --help' for more information.) .toString(), Undefined option: + param );
svn commit: r1209193 - in /karaf/trunk: management/mbeans/ management/mbeans/bundles/ management/mbeans/config/ management/mbeans/dev/ management/mbeans/http/ management/mbeans/log/ management/mbeans/
Author: cschneider Date: Thu Dec 1 19:06:13 2011 New Revision: 1209193 URL: http://svn.apache.org/viewvc?rev=1209193view=rev Log: Changed svn properties Modified: karaf/trunk/management/mbeans/ (props changed) karaf/trunk/management/mbeans/bundles/ (props changed) karaf/trunk/management/mbeans/config/ (props changed) karaf/trunk/management/mbeans/dev/ (props changed) karaf/trunk/management/mbeans/http/ (props changed) karaf/trunk/management/mbeans/log/ (props changed) karaf/trunk/management/mbeans/obr/ (props changed) karaf/trunk/management/mbeans/packages/ (props changed) karaf/trunk/management/mbeans/services/ (props changed) karaf/trunk/management/mbeans/web/ (props changed) karaf/trunk/management/server/ (props changed) karaf/trunk/shell/bundles/ (props changed) karaf/trunk/tooling/exam/ (props changed) karaf/trunk/tooling/exam/container/ (props changed) karaf/trunk/tooling/exam/options/ (props changed) karaf/trunk/tooling/exam/regression/ (props changed) karaf/trunk/wrapper/ (props changed) karaf/trunk/wrapper/commands/ (props changed) karaf/trunk/wrapper/core/ (props changed) karaf/trunk/wrapper/management/ (props changed) Propchange: karaf/trunk/management/mbeans/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/management/mbeans/bundles/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/management/mbeans/config/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/management/mbeans/dev/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/management/mbeans/http/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/management/mbeans/log/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/management/mbeans/obr/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/management/mbeans/packages/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/management/mbeans/services/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/management/mbeans/web/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/management/server/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/shell/bundles/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1,7 @@ +target + +.settings + +.project + +.classpath Propchange: karaf/trunk/tooling/exam/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/tooling/exam/container/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/tooling/exam/options/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/tooling/exam/regression/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/wrapper/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 1 19:06:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/wrapper/commands
svn commit: r1209903 - in /karaf/trunk/system: ./ commands/ core/ management/
Author: cschneider Date: Sat Dec 3 12:44:16 2011 New Revision: 1209903 URL: http://svn.apache.org/viewvc?rev=1209903view=rev Log: svn Ignores Modified: karaf/trunk/system/ (props changed) karaf/trunk/system/commands/ (props changed) karaf/trunk/system/core/ (props changed) karaf/trunk/system/management/ (props changed) Propchange: karaf/trunk/system/ -- --- svn:ignore (added) +++ svn:ignore Sat Dec 3 12:44:16 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/system/commands/ -- --- svn:ignore (added) +++ svn:ignore Sat Dec 3 12:44:16 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/system/core/ -- --- svn:ignore (added) +++ svn:ignore Sat Dec 3 12:44:16 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/system/management/ -- --- svn:ignore (added) +++ svn:ignore Sat Dec 3 12:44:16 2011 @@ -0,0 +1 @@ +target
svn commit: r1210856 - in /karaf/trunk/shell: bundles/ bundles/src/main/java/org/apache/karaf/shell/bundles/ bundles/src/main/resources/OSGI-INF/blueprint/ bundles/src/test/java/org/apache/karaf/shell
Author: cschneider
Date: Tue Dec 6 10:58:30 2011
New Revision: 1210856
URL: http://svn.apache.org/viewvc?rev=1210856view=rev
Log:
KARAF-1077 Moving old service:list to bundle:services. Adding new service:list
and completer for objectClass
Added:
karaf/trunk/shell/bundles/src/main/java/org/apache/karaf/shell/bundles/ListBundleServices.java
(contents, props changed)
- copied, changed from r1210508,
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ListServices.java
karaf/trunk/shell/bundles/src/test/java/org/apache/karaf/shell/bundles/ListServicesTest.java
(contents, props changed)
- copied, changed from r1210413,
karaf/trunk/shell/services/src/test/java/org/apache/karaf/shell/services/ListServicesTest.java
karaf/trunk/shell/bundles/src/test/java/org/apache/karaf/shell/bundles/TestBundleFactory.java
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ObjectClassCompleter.java
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ObjectClassMatcher.java
karaf/trunk/shell/services/src/test/java/org/apache/karaf/shell/services/ListServiceNamesTest.java
karaf/trunk/shell/services/src/test/java/org/apache/karaf/shell/services/ObjectClassMatcherTest.java
karaf/trunk/shell/services/src/test/java/org/apache/karaf/shell/services/TestBundleFactory.java
Modified:
karaf/trunk/shell/bundles/pom.xml
karaf/trunk/shell/bundles/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ListServices.java
karaf/trunk/shell/services/src/main/resources/OSGI-INF/blueprint/shell-services.xml
karaf/trunk/shell/services/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/shell/services/src/test/java/org/apache/karaf/shell/services/ListServicesTest.java
Modified: karaf/trunk/shell/bundles/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/bundles/pom.xml?rev=1210856r1=1210855r2=1210856view=diff
==
--- karaf/trunk/shell/bundles/pom.xml (original)
+++ karaf/trunk/shell/bundles/pom.xml Tue Dec 6 10:58:30 2011
@@ -65,6 +65,11 @@
scopeprovided/scope
/dependency
dependency
+groupIdorg.slf4j/groupId
+artifactIdslf4j-jdk14/artifactId
+scopetest/scope
+/dependency
+dependency
groupIdorg.apache.felix/groupId
artifactIdorg.apache.felix.utils/artifactId
scopeprovided/scope
Copied:
karaf/trunk/shell/bundles/src/main/java/org/apache/karaf/shell/bundles/ListBundleServices.java
(from r1210508,
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ListServices.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/bundles/src/main/java/org/apache/karaf/shell/bundles/ListBundleServices.java?p2=karaf/trunk/shell/bundles/src/main/java/org/apache/karaf/shell/bundles/ListBundleServices.javap1=karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ListServices.javar1=1210508r2=1210856rev=1210856view=diff
==
---
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ListServices.java
(original)
+++
karaf/trunk/shell/bundles/src/main/java/org/apache/karaf/shell/bundles/ListBundleServices.java
Tue Dec 6 10:58:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.services;
+package org.apache.karaf.shell.bundles;
import java.util.List;
@@ -23,15 +23,14 @@ import org.apache.karaf.shell.commands.C
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.service.command.Function;
-import org.apache.karaf.shell.bundles.BundleSelector;
import org.apache.karaf.util.ShellUtil;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
-@Command(scope = service, name = list, description = Lists OSGi
services.)
-public class ListServices extends OsgiCommandSupport {
+@Command(scope = bundle, name = services, description = Lists OSGi
services per Bundle)
+public class ListBundleServices extends OsgiCommandSupport {
@Argument(index = 0, name = ids, description = The list of bundle
(identified by IDs or name or name/version) separated by whitespaces, required
= false, multiValued = true)
ListString ids;
Propchange:
karaf/trunk/shell/bundles/src/main/java/org/apache/karaf/shell/bundles/ListBundleServices.java
--
svn:eol-style = native
Modified:
karaf/trunk/shell/bundles/src/main/resources/OSGI-INF/blueprint
svn commit: r1210858 - in /karaf/trunk: archetypes/assembly/ archetypes/kar/ assemblies/features/spring/ demos/branding/src/main/resources/resources/shell/ region/ region/commands/ region/persist/ web
Author: cschneider Date: Tue Dec 6 11:00:13 2011 New Revision: 1210858 URL: http://svn.apache.org/viewvc?rev=1210858view=rev Log: Some more svn ignores Modified: karaf/trunk/archetypes/assembly/ (props changed) karaf/trunk/archetypes/kar/ (props changed) karaf/trunk/assemblies/features/spring/ (props changed) karaf/trunk/demos/branding/src/main/resources/resources/shell/ (props changed) karaf/trunk/region/ (props changed) karaf/trunk/region/commands/ (props changed) karaf/trunk/region/persist/ (props changed) karaf/trunk/web/ (props changed) karaf/trunk/web/commands/ (props changed) karaf/trunk/web/core/ (props changed) karaf/trunk/web/management/ (props changed) Propchange: karaf/trunk/archetypes/assembly/ -- --- svn:ignore (added) +++ svn:ignore Tue Dec 6 11:00:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/archetypes/kar/ -- --- svn:ignore (added) +++ svn:ignore Tue Dec 6 11:00:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/assemblies/features/spring/ -- --- svn:ignore (added) +++ svn:ignore Tue Dec 6 11:00:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/demos/branding/src/main/resources/resources/shell/ -- --- svn:ignore (added) +++ svn:ignore Tue Dec 6 11:00:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/region/ -- --- svn:ignore (added) +++ svn:ignore Tue Dec 6 11:00:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/region/commands/ -- --- svn:ignore (added) +++ svn:ignore Tue Dec 6 11:00:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/region/persist/ -- --- svn:ignore (added) +++ svn:ignore Tue Dec 6 11:00:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/web/ -- --- svn:ignore (added) +++ svn:ignore Tue Dec 6 11:00:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/web/commands/ -- --- svn:ignore (added) +++ svn:ignore Tue Dec 6 11:00:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/web/core/ -- --- svn:ignore (added) +++ svn:ignore Tue Dec 6 11:00:13 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/web/management/ -- --- svn:ignore (added) +++ svn:ignore Tue Dec 6 11:00:13 2011 @@ -0,0 +1 @@ +target
svn commit: r1210866 - /karaf/trunk/pom.xml
Author: cschneider Date: Tue Dec 6 11:26:06 2011 New Revision: 1210866 URL: http://svn.apache.org/viewvc?rev=1210866view=rev Log: KARAF-1091 Upgrade version of maven bundle plugin Modified: karaf/trunk/pom.xml Modified: karaf/trunk/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1210866r1=1210865r2=1210866view=diff == --- karaf/trunk/pom.xml (original) +++ karaf/trunk/pom.xml Tue Dec 6 11:26:06 2011 @@ -138,7 +138,7 @@ felix.fileinstall.version3.1.10/felix.fileinstall.version felix.framework.version4.0.2/felix.framework.version felix.gogo.version0.10.0/felix.gogo.version -felix.plugin.version2.3.5/felix.plugin.version +felix.plugin.version2.3.6/felix.plugin.version felix.utils.version1.1.0/felix.utils.version felix.webconsole.version3.1.8/felix.webconsole.version felix.metatype.version1.0.4/felix.metatype.version
svn commit: r1211855 - /karaf/trunk/pom.xml
Author: cschneider Date: Thu Dec 8 12:27:11 2011 New Revision: 1211855 URL: http://svn.apache.org/viewvc?rev=1211855view=rev Log: Switching back to jasypt 1.7_3 to enable the central build again Modified: karaf/trunk/pom.xml Modified: karaf/trunk/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1211855r1=1211854r2=1211855view=diff == --- karaf/trunk/pom.xml (original) +++ karaf/trunk/pom.xml Thu Dec 8 12:27:11 2011 @@ -119,7 +119,7 @@ commons-io.version1.3.2/commons-io.version commons-jexl.version2.0/commons-jexl.version commons-lang.bundle.version2.4_5/commons-lang.bundle.version -jasypt.bundle.version1.8_1-SNAPSHOT/jasypt.bundle.version +jasypt.bundle.version1.7_3/jasypt.bundle.version jetty.version7.5.4.v20111024/jetty.version junit.bundle.version4.7_3/junit.bundle.version junit.version4.7/junit.version
svn commit: r1211978 - /karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
Author: cschneider
Date: Thu Dec 8 16:59:25 2011
New Revision: 1211978
URL: http://svn.apache.org/viewvc?rev=1211978view=rev
Log:
KARAF-1071 wrap inputstream early into e.g. the windows variant for jline
cursor keys to work in windows
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java?rev=1211978r1=1211977r2=1211978view=diff
==
---
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
(original)
+++
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
Thu Dec 8 16:59:25 2011
@@ -79,7 +79,8 @@ public class ConsoleFactory {
}
protected void doStart(String user) throws Exception {
-InputStream in = unwrap(System.in);
+final Terminal terminal = terminalFactory.getTerminal();
+InputStream in = unwrap(terminal.wrapInIfNeeded(System.in));
PrintStream out = unwrap(System.out);
PrintStream err = unwrap(System.err);
Runnable callback = new Runnable() {
@@ -91,7 +92,6 @@ public class ConsoleFactory {
}
}
};
-final Terminal terminal = terminalFactory.getTerminal();
this.console = new Console(commandProcessor,
in,
wrap(out),
svn commit: r1212477 - /karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
Author: cschneider
Date: Fri Dec 9 15:25:46 2011
New Revision: 1212477
URL: http://svn.apache.org/viewvc?rev=1212477view=rev
Log:
KARAF-1071 unwrap BufferedInputStream so the terminal recognizes the stream as
system.in
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java?rev=1212477r1=1212476r2=1212477view=diff
==
---
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
(original)
+++
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
Fri Dec 9 15:25:46 2011
@@ -77,10 +77,32 @@ public class ConsoleFactory {
});
}
}
+
+public static Object invokePrivateMethod(Object o, String methodName,
Object[] params) throws Exception {
+final Method methods[] = o.getClass().getDeclaredMethods();
+for (int i = 0; i methods.length; ++i) {
+if (methodName.equals(methods[i].getName())) {
+methods[i].setAccessible(true);
+return methods[i].invoke(o, params);
+}
+}
+return null;
+}
+
+private static T T unwrapBIS(T stream) {
+try {
+return (T) invokePrivateMethod(stream, getInIfOpen, null);
+} catch (Throwable t) {
+return stream;
+}
+}
protected void doStart(String user) throws Exception {
final Terminal terminal = terminalFactory.getTerminal();
-InputStream in = unwrap(terminal.wrapInIfNeeded(System.in));
+// unwrap stream so it can be recognized by the terminal and wrapped
to get
+// special keys in windows
+InputStream unwrappedIn = unwrapBIS(unwrap(System.in));
+InputStream in = terminal.wrapInIfNeeded(unwrappedIn);
PrintStream out = unwrap(System.out);
PrintStream err = unwrap(System.err);
Runnable callback = new Runnable() {
svn commit: r1220968 - in /karaf/branches/karaf-2.2.x/assemblies: apache-karaf/src/main/filtered-resources/etc/ features/framework/ features/framework/src/ features/framework/src/main/ features/framew
Author: cschneider Date: Mon Dec 19 21:58:56 2011 New Revision: 1220968 URL: http://svn.apache.org/viewvc?rev=1220968view=rev Log: KARAF-1115 Add jre.properties.cxf Added: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties.cxf karaf/branches/karaf-2.2.x/assemblies/features/framework/ karaf/branches/karaf-2.2.x/assemblies/features/framework/src/ karaf/branches/karaf-2.2.x/assemblies/features/framework/src/main/ karaf/branches/karaf-2.2.x/assemblies/features/framework/src/main/filtered-resources/ karaf/branches/karaf-2.2.x/assemblies/features/framework/src/main/filtered-resources/resources/ karaf/branches/karaf-2.2.x/assemblies/features/framework/src/main/filtered-resources/resources/etc/ karaf/branches/karaf-2.2.x/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties.cxf Added: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties.cxf URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties.cxf?rev=1220968view=auto == --- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties.cxf (added) +++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties.cxf Mon Dec 19 21:58:56 2011 @@ -0,0 +1,472 @@ + +# +#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. +# + + +# +# Java platform package export properties. +# + +# Standard package set. Note that: +# - javax.transaction* is exported with a mandatory attribute +jre-1.5= \ + javax.accessibility, \ + javax.activity, \ + javax.crypto, \ + javax.crypto.interfaces, \ + javax.crypto.spec, \ + javax.imageio, \ + javax.imageio.event, \ + javax.imageio.metadata, \ + javax.imageio.plugins.bmp, \ + javax.imageio.plugins.jpeg, \ + javax.imageio.spi, \ + javax.imageio.stream, \ + javax.management, \ + javax.management.loading, \ + javax.management.modelmbean, \ + javax.management.monitor, \ + javax.management.openmbean, \ + javax.management.relation, \ + javax.management.remote, \ + javax.management.remote.rmi, \ + javax.management.timer, \ + javax.naming, \ + javax.naming.directory, \ + javax.naming.event, \ + javax.naming.ldap, \ + javax.naming.spi, \ + javax.net, \ + javax.net.ssl, \ + javax.print, \ + javax.print.attribute, \ + javax.print.attribute.standard, \ + javax.print.event, \ + javax.rmi, \ + javax.rmi.CORBA, \ + javax.rmi.ssl, \ + javax.security.auth, \ + javax.security.auth.callback, \ + javax.security.auth.kerberos, \ + javax.security.auth.login, \ + javax.security.auth.spi, \ + javax.security.auth.x500, \ + javax.security.cert, \ + javax.security.sasl, \ + javax.sound.midi, \ + javax.sound.midi.spi, \ + javax.sound.sampled, \ + javax.sound.sampled.spi, \ + javax.sql, \ + javax.sql.rowset, \ + javax.sql.rowset.serial, \ + javax.sql.rowset.spi, \ + javax.swing, \ + javax.swing.border, \ + javax.swing.colorchooser, \ + javax.swing.event, \ + javax.swing.filechooser, \ + javax.swing.plaf, \ + javax.swing.plaf.basic, \ + javax.swing.plaf.metal, \ + javax.swing.plaf.multi, \ + javax.swing.plaf.synth, \ + javax.swing.table, \ + javax.swing.text, \ + javax.swing.text.html, \ + javax.swing.text.html.parser, \ + javax.swing.text.rtf, \ + javax.swing.tree, \ + javax.swing.undo, \ + javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ + javax.xml, \ + javax.xml.datatype, \ + javax.xml.namespace, \ + javax.xml.parsers, \ + javax.xml.transform, \ + javax.xml.transform.dom, \ + javax.xml.transform.sax, \ + javax.xml.transform.stream, \ + javax.xml.validation, \ + javax.xml.xpath, \ + org.ietf.jgss, \ + org.omg.CORBA, \ + org.omg.CORBA_2_3, \ + org.omg.CORBA_2_3.portable, \ + org.omg.CORBA.DynAnyPackage, \ + org.omg.CORBA.ORBPackage, \ + org.omg.CORBA.portable, \ + org.omg.CORBA.TypeCodePackage, \ + org.omg.CosNaming
svn commit: r1220969 - in /karaf/trunk/assemblies: apache-karaf/src/main/filtered-resources/etc/jre.properties.cxf features/framework/src/main/filtered-resources/resources/etc/jre.properties.cxf
Author: cschneider Date: Mon Dec 19 21:59:44 2011 New Revision: 1220969 URL: http://svn.apache.org/viewvc?rev=1220969view=rev Log: KARAF-1115 Add jre.properties.cxf Added: karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties.cxf karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties.cxf Added: karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties.cxf URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties.cxf?rev=1220969view=auto == --- karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties.cxf (added) +++ karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties.cxf Mon Dec 19 21:59:44 2011 @@ -0,0 +1,472 @@ + +# +#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. +# + + +# +# Java platform package export properties. +# + +# Standard package set. Note that: +# - javax.transaction* is exported with a mandatory attribute +jre-1.5= \ + javax.accessibility, \ + javax.activity, \ + javax.crypto, \ + javax.crypto.interfaces, \ + javax.crypto.spec, \ + javax.imageio, \ + javax.imageio.event, \ + javax.imageio.metadata, \ + javax.imageio.plugins.bmp, \ + javax.imageio.plugins.jpeg, \ + javax.imageio.spi, \ + javax.imageio.stream, \ + javax.management, \ + javax.management.loading, \ + javax.management.modelmbean, \ + javax.management.monitor, \ + javax.management.openmbean, \ + javax.management.relation, \ + javax.management.remote, \ + javax.management.remote.rmi, \ + javax.management.timer, \ + javax.naming, \ + javax.naming.directory, \ + javax.naming.event, \ + javax.naming.ldap, \ + javax.naming.spi, \ + javax.net, \ + javax.net.ssl, \ + javax.print, \ + javax.print.attribute, \ + javax.print.attribute.standard, \ + javax.print.event, \ + javax.rmi, \ + javax.rmi.CORBA, \ + javax.rmi.ssl, \ + javax.security.auth, \ + javax.security.auth.callback, \ + javax.security.auth.kerberos, \ + javax.security.auth.login, \ + javax.security.auth.spi, \ + javax.security.auth.x500, \ + javax.security.cert, \ + javax.security.sasl, \ + javax.sound.midi, \ + javax.sound.midi.spi, \ + javax.sound.sampled, \ + javax.sound.sampled.spi, \ + javax.sql, \ + javax.sql.rowset, \ + javax.sql.rowset.serial, \ + javax.sql.rowset.spi, \ + javax.swing, \ + javax.swing.border, \ + javax.swing.colorchooser, \ + javax.swing.event, \ + javax.swing.filechooser, \ + javax.swing.plaf, \ + javax.swing.plaf.basic, \ + javax.swing.plaf.metal, \ + javax.swing.plaf.multi, \ + javax.swing.plaf.synth, \ + javax.swing.table, \ + javax.swing.text, \ + javax.swing.text.html, \ + javax.swing.text.html.parser, \ + javax.swing.text.rtf, \ + javax.swing.tree, \ + javax.swing.undo, \ + javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ + javax.xml, \ + javax.xml.datatype, \ + javax.xml.namespace, \ + javax.xml.parsers, \ + javax.xml.transform, \ + javax.xml.transform.dom, \ + javax.xml.transform.sax, \ + javax.xml.transform.stream, \ + javax.xml.validation, \ + javax.xml.xpath, \ + org.ietf.jgss, \ + org.omg.CORBA, \ + org.omg.CORBA_2_3, \ + org.omg.CORBA_2_3.portable, \ + org.omg.CORBA.DynAnyPackage, \ + org.omg.CORBA.ORBPackage, \ + org.omg.CORBA.portable, \ + org.omg.CORBA.TypeCodePackage, \ + org.omg.CosNaming, \ + org.omg.CosNaming.NamingContextExtPackage, \ + org.omg.CosNaming.NamingContextPackage, \ + org.omg.Dynamic, \ + org.omg.DynamicAny, \ + org.omg.DynamicAny.DynAnyFactoryPackage, \ + org.omg.DynamicAny.DynAnyPackage, \ + org.omg.IOP, \ + org.omg.IOP.CodecFactoryPackage, \ + org.omg.IOP.CodecPackage, \ + org.omg.Messaging, \ + org.omg.PortableInterceptor, \ + org.omg.PortableInterceptor.ORBInitInfoPackage, \ + org.omg.PortableServer, \ + org.omg.PortableServer.CurrentPackage, \ + org.omg.PortableServer.POAManagerPackage, \ + org.omg.PortableServer.POAPackage, \ + org.omg.PortableServer.portable
svn commit: r1220975 - in /karaf/branches/karaf-2.2.x: archetypes/assembly/ archetypes/blueprint/ archetypes/bundle/ archetypes/feature/ archetypes/kar/ demos/command/ demos/deployer/ demos/deployer/k
Author: cschneider Date: Mon Dec 19 22:17:26 2011 New Revision: 1220975 URL: http://svn.apache.org/viewvc?rev=1220975view=rev Log: Ignoring target dirs Modified: karaf/branches/karaf-2.2.x/archetypes/assembly/ (props changed) karaf/branches/karaf-2.2.x/archetypes/blueprint/ (props changed) karaf/branches/karaf-2.2.x/archetypes/bundle/ (props changed) karaf/branches/karaf-2.2.x/archetypes/feature/ (props changed) karaf/branches/karaf-2.2.x/archetypes/kar/ (props changed) karaf/branches/karaf-2.2.x/demos/command/ (props changed) karaf/branches/karaf-2.2.x/demos/deployer/ (props changed) karaf/branches/karaf-2.2.x/demos/deployer/kar/ (props changed) karaf/branches/karaf-2.2.x/management/mbeans/ (props changed) karaf/branches/karaf-2.2.x/management/mbeans/bundles/ (props changed) karaf/branches/karaf-2.2.x/management/mbeans/config/ (props changed) karaf/branches/karaf-2.2.x/management/mbeans/dev/ (props changed) karaf/branches/karaf-2.2.x/management/mbeans/log/ (props changed) karaf/branches/karaf-2.2.x/management/mbeans/obr/ (props changed) karaf/branches/karaf-2.2.x/management/mbeans/packages/ (props changed) karaf/branches/karaf-2.2.x/management/mbeans/services/ (props changed) karaf/branches/karaf-2.2.x/management/mbeans/system/ (props changed) karaf/branches/karaf-2.2.x/management/mbeans/web/ (props changed) karaf/branches/karaf-2.2.x/management/server/ (props changed) Propchange: karaf/branches/karaf-2.2.x/archetypes/assembly/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 19 22:17:26 2011 @@ -0,0 +1 @@ +target Propchange: karaf/branches/karaf-2.2.x/archetypes/blueprint/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 19 22:17:26 2011 @@ -0,0 +1 @@ +target Propchange: karaf/branches/karaf-2.2.x/archetypes/bundle/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 19 22:17:26 2011 @@ -0,0 +1 @@ +target Propchange: karaf/branches/karaf-2.2.x/archetypes/feature/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 19 22:17:26 2011 @@ -0,0 +1 @@ +target Propchange: karaf/branches/karaf-2.2.x/archetypes/kar/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 19 22:17:26 2011 @@ -0,0 +1 @@ +target Propchange: karaf/branches/karaf-2.2.x/demos/command/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 19 22:17:26 2011 @@ -0,0 +1 @@ +target Propchange: karaf/branches/karaf-2.2.x/demos/deployer/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 19 22:17:26 2011 @@ -0,0 +1 @@ +target Propchange: karaf/branches/karaf-2.2.x/demos/deployer/kar/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 19 22:17:26 2011 @@ -0,0 +1 @@ +target Propchange: karaf/branches/karaf-2.2.x/management/mbeans/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 19 22:17:26 2011 @@ -0,0 +1 @@ +target Propchange: karaf/branches/karaf-2.2.x/management/mbeans/bundles/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 19 22:17:26 2011 @@ -0,0 +1 @@ +target Propchange: karaf/branches/karaf-2.2.x/management/mbeans/config/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 19 22:17:26 2011 @@ -0,0 +1 @@ +target Propchange: karaf/branches/karaf-2.2.x/management/mbeans/dev/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 19 22:17:26 2011 @@ -0,0 +1 @@ +target Propchange: karaf/branches/karaf-2.2.x/management/mbeans/log/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 19 22:17:26 2011 @@ -0,0 +1 @@ +target Propchange: karaf/branches/karaf-2.2.x/management/mbeans/obr/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 19 22:17:26 2011 @@ -0,0 +1 @@ +target Propchange: karaf/branches/karaf-2.2.x/management/mbeans/packages/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 19 22:17:26 2011 @@ -0,0 +1 @@ +target Propchange: karaf/branches/karaf-2.2.x/management/mbeans/services
svn commit: r1222328 - /karaf/site/trunk/src/main/webapp/index/community/articles.page
Author: cschneider Date: Thu Dec 22 16:25:00 2011 New Revision: 1222328 URL: http://svn.apache.org/viewvc?rev=1222328view=rev Log: Adding Karaf Tutorial Part 4 Modified: karaf/site/trunk/src/main/webapp/index/community/articles.page Modified: karaf/site/trunk/src/main/webapp/index/community/articles.page URL: http://svn.apache.org/viewvc/karaf/site/trunk/src/main/webapp/index/community/articles.page?rev=1222328r1=1222327r2=1222328view=diff == --- karaf/site/trunk/src/main/webapp/index/community/articles.page (original) +++ karaf/site/trunk/src/main/webapp/index/community/articles.page Thu Dec 22 16:25:00 2011 @@ -22,6 +22,7 @@ h2. Tutorials * [Karaf Tutorial Part 1 - Installation and First application|http://www.liquid-reality.de/x/DIBZ] * [Karaf Tutorial Part 2 - Using the Configuration Admin Service|http://www.liquid-reality.de/x/G4Be] * [Karaf Tutorial Part 3 - Improving configuration editing using the OSGI Metatype Service|http://www.liquid-reality.de/x/KoBe] +* [Karaf Tutorial Part 4 - CXF Services in OSGi|http://www.liquid-reality.de/x/EoBk] * [Combining Karaf Features, PAX URL, and Maven to deploy a plain JAR as an OSGi bundle|http://davidvaleri.wordpress.com/2010/08/13/combining-karaf-features-pax-url-and-maven-to-deploy-a-plain-jar-as-an-osgi-bundle/] * Blocking system.exit in OSGi on Karaf [part1|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=67] [part2|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=82] [part3|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=94] [part4|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=101] * [Running aspects under OSGi 4.2 with Karaf.|http://dywicki.pl/2011/11/running-aspects-under-osgi-4-2-with-karaf/]
svn commit: r1225485 - in /karaf/trunk/kar: ./ command/ core/ management/
Author: cschneider Date: Thu Dec 29 09:29:43 2011 New Revision: 1225485 URL: http://svn.apache.org/viewvc?rev=1225485view=rev Log: add ignores Modified: karaf/trunk/kar/ (props changed) karaf/trunk/kar/command/ (props changed) karaf/trunk/kar/core/ (props changed) karaf/trunk/kar/management/ (props changed) Propchange: karaf/trunk/kar/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 29 09:29:43 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/kar/command/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 29 09:29:43 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/kar/core/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 29 09:29:43 2011 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/kar/management/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 29 09:29:43 2011 @@ -0,0 +1 @@ +target
svn commit: r1225498 - in /karaf/branches/karaf-2.2.x: ./ assemblies/apache-karaf/src/main/filtered-resources/etc/ features/command/ features/command/src/main/java/org/apache/karaf/features/command/ f
Author: cschneider
Date: Thu Dec 29 11:30:21 2011
New Revision: 1225498
URL: http://svn.apache.org/viewvc?rev=1225498view=rev
Log:
KARAF-1132 Adding a feature:chooseurl command to make it easy to install well
known feature files
Added:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg
karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/ChooseUrlCommand.java
karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/FeatureFinder.java
karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/completers/FeatureRepoNameCompleter.java
Modified:
karaf/branches/karaf-2.2.x/features/command/pom.xml
karaf/branches/karaf-2.2.x/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml
karaf/branches/karaf-2.2.x/pom.xml
Added:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg?rev=1225498view=auto
==
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg
(added)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg
Thu Dec 29 11:30:21 2011
@@ -0,0 +1,4 @@
+camel=org.apache.camel.karaf:apache-camel:xml:features:(0,]
+cxf=org.apache.cxf.karaf:apache-cxf:xml:features:(0,]
+activemq=org.apache.activemq:activemq-karaf:xml:features:(0,]
+jclouds=org.jclouds.karaf:feature:xml:features:(0,]
Modified: karaf/branches/karaf-2.2.x/features/command/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/command/pom.xml?rev=1225498r1=1225497r2=1225498view=diff
==
--- karaf/branches/karaf-2.2.x/features/command/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/features/command/pom.xml Thu Dec 29 11:30:21 2011
@@ -90,6 +90,18 @@
artifactIdslf4j-jdk14/artifactId
scopetest/scope
/dependency
+ dependency
+groupIdorg.sonatype.aether/groupId
+artifactIdaether-api/artifactId
+version${aether.version}/version
+scopeprovided/scope
+/dependency
+dependency
+groupIdorg.sonatype.aether/groupId
+artifactIdaether-util/artifactId
+version${aether.version}/version
+scopeprovided/scope
+/dependency
/dependencies
build
@@ -123,7 +135,10 @@
org.apache.karaf.shell.console,
*
/Import-Package
-Private-Package!*/Private-Package
+Private-Package
+org.sonatype.*,
+!*
+ /Private-Package
/instructions
/configuration
/plugin
Added:
karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/ChooseUrlCommand.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/ChooseUrlCommand.java?rev=1225498view=auto
==
---
karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/ChooseUrlCommand.java
(added)
+++
karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/ChooseUrlCommand.java
Thu Dec 29 11:30:21 2011
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.features.command;
+
+import java.net.URI;
+
+import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+import
svn commit: r1226724 - /karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg
Author: cschneider Date: Tue Jan 3 10:03:21 2012 New Revision: 1226724 URL: http://svn.apache.org/viewvc?rev=1226724view=rev Log: adding openejb feature url Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg?rev=1226724r1=1226723r2=1226724view=diff == --- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg (original) +++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg Tue Jan 3 10:03:21 2012 @@ -2,3 +2,4 @@ camel=org.apache.camel.karaf:apache-came cxf=org.apache.cxf.karaf:apache-cxf:xml:features:(0,] activemq=org.apache.activemq:activemq-karaf:xml:features:(0,] jclouds=org.jclouds.karaf:feature:xml:features:(0,] +openejb=org.apache.openejb:openejb-feature:xml:features:(0,]
svn commit: r1226732 - /karaf/site/trunk/src/main/webapp/index/community/articles.page
Author: cschneider Date: Tue Jan 3 10:42:00 2012 New Revision: 1226732 URL: http://svn.apache.org/viewvc?rev=1226732view=rev Log: Adding Karaf Tutorial Part 5 Modified: karaf/site/trunk/src/main/webapp/index/community/articles.page Modified: karaf/site/trunk/src/main/webapp/index/community/articles.page URL: http://svn.apache.org/viewvc/karaf/site/trunk/src/main/webapp/index/community/articles.page?rev=1226732r1=1226731r2=1226732view=diff == --- karaf/site/trunk/src/main/webapp/index/community/articles.page (original) +++ karaf/site/trunk/src/main/webapp/index/community/articles.page Tue Jan 3 10:42:00 2012 @@ -28,6 +28,7 @@ h2. Tutorials * [Karaf Tutorial Part 2 - Using the Configuration Admin Service|http://www.liquid-reality.de/x/G4Be] * [Karaf Tutorial Part 3 - Improving configuration editing using the OSGI Metatype Service|http://www.liquid-reality.de/x/KoBe] * [Karaf Tutorial Part 4 - CXF Services in OSGi|http://www.liquid-reality.de/x/EoBk] +* [Karaf Tutorial Part 5 - Running Apache Camel integrations in OSGi|http://www.liquid-reality.de/x/G4Bk] * [Combining Karaf Features, PAX URL, and Maven to deploy a plain JAR as an OSGi bundle|http://davidvaleri.wordpress.com/2010/08/13/combining-karaf-features-pax-url-and-maven-to-deploy-a-plain-jar-as-an-osgi-bundle/] * Blocking system.exit in OSGi on Karaf [part1|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=67] [part2|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=82] [part3|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=94] [part4|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=101] * [Running aspects under OSGi 4.2 with Karaf.|http://dywicki.pl/2011/11/running-aspects-under-osgi-4-2-with-karaf/]
svn commit: r1226798 - in /karaf/branches/karaf-2.2.x/features/command: pom.xml src/main/java/org/apache/karaf/features/command/Artifact.java src/main/java/org/apache/karaf/features/command/FeatureFin
Author: cschneider
Date: Tue Jan 3 15:02:23 2012
New Revision: 1226798
URL: http://svn.apache.org/viewvc?rev=1226798view=rev
Log:
KARAF-1132 Removing aether dependency
Added:
karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/Artifact.java
(with props)
Modified:
karaf/branches/karaf-2.2.x/features/command/pom.xml
karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/FeatureFinder.java
Modified: karaf/branches/karaf-2.2.x/features/command/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/command/pom.xml?rev=1226798r1=1226797r2=1226798view=diff
==
--- karaf/branches/karaf-2.2.x/features/command/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/features/command/pom.xml Tue Jan 3 15:02:23 2012
@@ -90,18 +90,6 @@
artifactIdslf4j-jdk14/artifactId
scopetest/scope
/dependency
- dependency
-groupIdorg.sonatype.aether/groupId
-artifactIdaether-api/artifactId
-version${aether.version}/version
-scopeprovided/scope
-/dependency
-dependency
-groupIdorg.sonatype.aether/groupId
-artifactIdaether-util/artifactId
-version${aether.version}/version
-scopeprovided/scope
-/dependency
/dependencies
build
@@ -136,7 +124,6 @@
*
/Import-Package
Private-Package
-org.sonatype.*,
!*
/Private-Package
/instructions
Added:
karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/Artifact.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/Artifact.java?rev=1226798view=auto
==
---
karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/Artifact.java
(added)
+++
karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/Artifact.java
Tue Jan 3 15:02:23 2012
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.features.command;
+
+import java.net.URI;
+
+/**
+ * Simple abstraction of a maven artifact to avoid external deps
+ */
+public class Artifact {
+String groupId;
+String artifactId;
+String version;
+String extension;
+String classifier;
+
+public Artifact(String coords) {
+String[] coordsAr = coords.split(:);
+this.groupId = coordsAr[0];
+this.artifactId = coordsAr[1];
+this.version = coordsAr[4];
+this.extension = coordsAr[2];
+this.classifier = coordsAr[3];
+}
+
+public Artifact(String coords, String version) {
+this(coords);
+this.version = version;
+}
+
+public URI getPaxUrlForArtifact(String version) {
+String uriSt = mvn: + this.groupId + / + this.artifactId + / +
version + / + this.extension + / + this.classifier;
+try {
+return new URI(uriSt);
+} catch (Exception e) {
+return null;
+}
+}
+}
Propchange:
karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/Artifact.java
--
svn:mime-type = text/plain
Modified:
karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/FeatureFinder.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/FeatureFinder.java?rev=1226798r1=1226797r2=1226798view=diff
==
---
karaf/branches/karaf-2.2.x/features/command/src/main/java/org/apache/karaf/features/command/FeatureFinder.java
svn commit: r1226799 - /karaf/branches/karaf-2.2.x/pom.xml
Author: cschneider Date: Tue Jan 3 15:03:52 2012 New Revision: 1226799 URL: http://svn.apache.org/viewvc?rev=1226799view=rev Log: KARAF-1132 Remove aether dependency Modified: karaf/branches/karaf-2.2.x/pom.xml Modified: karaf/branches/karaf-2.2.x/pom.xml URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1226799r1=1226798r2=1226799view=diff == --- karaf/branches/karaf-2.2.x/pom.xml (original) +++ karaf/branches/karaf-2.2.x/pom.xml Tue Jan 3 15:03:52 2012 @@ -146,7 +146,6 @@ maven.version2.0.9/maven.version mina.version2.0.1/mina.version osgi.version4.2.0/osgi.version - aether.version1.12/aether.version pax.exam.version1.2.4/pax.exam.version pax.logging.version1.6.3/pax.logging.version pax.runner.version1.6.2/pax.runner.version
svn commit: r1227132 - in /karaf/trunk: assemblies/apache-karaf/src/main/filtered-resources/etc/ features/command/ features/command/src/main/java/org/apache/karaf/features/command/ features/command/sr
Author: cschneider
Date: Wed Jan 4 12:22:38 2012
New Revision: 1227132
URL: http://svn.apache.org/viewvc?rev=1227132view=rev
Log:
KARAF-1132 Adding feature:chooseurl command for karaf 3
Added:
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/Artifact.java
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ChooseUrlCommand.java
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/FeatureFinder.java
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/completers/FeatureRepoNameCompleter.java
Modified:
karaf/trunk/features/command/pom.xml
karaf/trunk/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml
Added:
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg?rev=1227132view=auto
==
---
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg
(added)
+++
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg
Wed Jan 4 12:22:38 2012
@@ -0,0 +1,5 @@
+camel=org.apache.camel.karaf:apache-camel:xml:features:(0,]
+cxf=org.apache.cxf.karaf:apache-cxf:xml:features:(0,]
+activemq=org.apache.activemq:activemq-karaf:xml:features:(0,]
+jclouds=org.jclouds.karaf:feature:xml:features:(0,]
+openejb=org.apache.openejb:openejb-feature:xml:features:(0,]
Modified: karaf/trunk/features/command/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/command/pom.xml?rev=1227132r1=1227131r2=1227132view=diff
==
--- karaf/trunk/features/command/pom.xml (original)
+++ karaf/trunk/features/command/pom.xml Wed Jan 4 12:22:38 2012
@@ -44,6 +44,11 @@
scopeprovided/scope
/dependency
dependency
+groupIdorg.osgi/groupId
+artifactIdorg.osgi.compendium/artifactId
+scopeprovided/scope
+/dependency
+dependency
groupIdorg.apache.karaf.features/groupId
artifactIdorg.apache.karaf.features.core/artifactId
/dependency
Added:
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/Artifact.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/Artifact.java?rev=1227132view=auto
==
---
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/Artifact.java
(added)
+++
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/Artifact.java
Wed Jan 4 12:22:38 2012
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.features.command;
+
+import java.net.URI;
+
+/**
+ * Simple abstraction of a maven artifact to avoid external deps
+ */
+public class Artifact {
+String groupId;
+String artifactId;
+String version;
+String extension;
+String classifier;
+
+public Artifact(String coords) {
+String[] coordsAr = coords.split(:);
+this.groupId = coordsAr[0];
+this.artifactId = coordsAr[1];
+this.version = coordsAr[4];
+this.extension = coordsAr[2];
+this.classifier = coordsAr[3];
+}
+
+public Artifact(String coords, String version) {
+this(coords);
+this.version = version;
+}
+
+public URI getPaxUrlForArtifact(String version) {
+String uriSt = mvn: + this.groupId + / + this.artifactId + / +
version + / + this.extension + / + this.classifier;
+try {
+return new URI(uriSt);
+} catch (Exception e) {
+return null;
+}
+}
+}
Added:
karaf/trunk/features/command/src/main/java/org
svn commit: r1227153 - /karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties
Author: cschneider Date: Wed Jan 4 13:39:12 2012 New Revision: 1227153 URL: http://svn.apache.org/viewvc?rev=1227153view=rev Log: KARAF-1117 Workaround like described in issue Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties?rev=1227153r1=1227152r2=1227153view=diff == --- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties (original) +++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties Wed Jan 4 13:39:12 2012 @@ -73,3 +73,6 @@ xml.catalog.files= # for example # jline.nobell=true + +# Workaround for KARAF-1117: Jetty will use a JUL logger. +org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog
svn commit: r1227157 - /karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties
Author: cschneider Date: Wed Jan 4 13:43:41 2012 New Revision: 1227157 URL: http://svn.apache.org/viewvc?rev=1227157view=rev Log: KARAF-1117 Workaround like described in issue Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties?rev=1227157r1=1227156r2=1227157view=diff == --- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties (original) +++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties Wed Jan 4 13:43:41 2012 @@ -73,3 +73,7 @@ xml.catalog.files= # for example # jline.nobell=true + +# Workaround for KARAF-1117: Jetty will use a JUL logger. +org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog +
svn commit: r1229204 - /karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg
Author: cschneider Date: Mon Jan 9 15:28:35 2012 New Revision: 1229204 URL: http://svn.apache.org/viewvc?rev=1229204view=rev Log: Adding wicket feature repo Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg?rev=1229204r1=1229203r2=1229204view=diff == --- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg (original) +++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg Mon Jan 9 15:28:35 2012 @@ -3,3 +3,4 @@ cxf=org.apache.cxf.karaf:apache-cxf:xml: activemq=org.apache.activemq:activemq-karaf:xml:features:(0,] jclouds=org.jclouds.karaf:feature:xml:features:(0,] openejb=org.apache.openejb:openejb-feature:xml:features:(0,] +wicket=org.ops4j.pax.wicket:pax-wicket-features:xml:features:(0,]
svn commit: r1229209 - /karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg
Author: cschneider Date: Mon Jan 9 15:32:58 2012 New Revision: 1229209 URL: http://svn.apache.org/viewvc?rev=1229209view=rev Log: Adding wicket feature repo Modified: karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg Modified: karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg?rev=1229209r1=1229208r2=1229209view=diff == --- karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg (original) +++ karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg Mon Jan 9 15:32:58 2012 @@ -3,3 +3,4 @@ cxf=org.apache.cxf.karaf:apache-cxf:xml: activemq=org.apache.activemq:activemq-karaf:xml:features:(0,] jclouds=org.jclouds.karaf:feature:xml:features:(0,] openejb=org.apache.openejb:openejb-feature:xml:features:(0,] +wicket=org.ops4j.pax.wicket:pax-wicket-features:xml:features:(0,]
svn commit: r1231146 - /karaf/site/trunk/src/main/webapp/index/community/articles.page
Author: cschneider Date: Fri Jan 13 16:06:55 2012 New Revision: 1231146 URL: http://svn.apache.org/viewvc?rev=1231146view=rev Log: Tutorial Part 6 Modified: karaf/site/trunk/src/main/webapp/index/community/articles.page Modified: karaf/site/trunk/src/main/webapp/index/community/articles.page URL: http://svn.apache.org/viewvc/karaf/site/trunk/src/main/webapp/index/community/articles.page?rev=1231146r1=1231145r2=1231146view=diff == --- karaf/site/trunk/src/main/webapp/index/community/articles.page (original) +++ karaf/site/trunk/src/main/webapp/index/community/articles.page Fri Jan 13 16:06:55 2012 @@ -31,6 +31,7 @@ h2. Tutorials * [Karaf Tutorial Part 3 - Improving configuration editing using the OSGI Metatype Service|http://www.liquid-reality.de/x/KoBe] * [Karaf Tutorial Part 4 - CXF Services in OSGi|http://www.liquid-reality.de/x/EoBk] * [Karaf Tutorial Part 5 - Running Apache Camel integrations in OSGi|http://www.liquid-reality.de/x/G4Bk] +* [Karaf Tutorial Part 6 - Database Access|http://www.liquid-reality.de/x/LYBk] * [Combining Karaf Features, PAX URL, and Maven to deploy a plain JAR as an OSGi bundle|http://davidvaleri.wordpress.com/2010/08/13/combining-karaf-features-pax-url-and-maven-to-deploy-a-plain-jar-as-an-osgi-bundle/] * Blocking system.exit in OSGi on Karaf [part1|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=67] [part2|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=82] [part3|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=94] [part4|http://nierbeck.de/cgi-bin/weblog_basic/index.php?p=101] * [Running aspects under OSGi 4.2 with Karaf.|http://dywicki.pl/2011/11/running-aspects-under-osgi-4-2-with-karaf/]
svn commit: r1240915 - in /karaf/trunk: archetypes/blueprint/ archetypes/bundle/ demos/branding/src/main/resources/resources/demos/branding/shell/ demos/command/src/main/resources/resources/demos/comm
Author: cschneider Date: Mon Feb 6 08:22:14 2012 New Revision: 1240915 URL: http://svn.apache.org/viewvc?rev=1240915view=rev Log: Ignore target dir Modified: karaf/trunk/archetypes/blueprint/ (props changed) karaf/trunk/archetypes/bundle/ (props changed) karaf/trunk/demos/branding/src/main/resources/resources/demos/branding/shell/ (props changed) karaf/trunk/demos/command/src/main/resources/resources/demos/command/ (props changed) Propchange: karaf/trunk/archetypes/blueprint/ -- --- svn:ignore (added) +++ svn:ignore Mon Feb 6 08:22:14 2012 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/archetypes/bundle/ -- --- svn:ignore (added) +++ svn:ignore Mon Feb 6 08:22:14 2012 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/demos/branding/src/main/resources/resources/demos/branding/shell/ -- --- svn:ignore (added) +++ svn:ignore Mon Feb 6 08:22:14 2012 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/demos/command/src/main/resources/resources/demos/command/ -- --- svn:ignore (added) +++ svn:ignore Mon Feb 6 08:22:14 2012 @@ -0,0 +1 @@ +target
svn commit: r1240920 - in /karaf/trunk: pom.xml region/core/
Author: cschneider Date: Mon Feb 6 08:39:05 2012 New Revision: 1240920 URL: http://svn.apache.org/viewvc?rev=1240920view=rev Log: KARAF-903 Upgrading to pax web 1.1.2 as it is released now Modified: karaf/trunk/pom.xml karaf/trunk/region/core/ (props changed) Modified: karaf/trunk/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1240920r1=1240919r2=1240920view=diff == --- karaf/trunk/pom.xml (original) +++ karaf/trunk/pom.xml Mon Feb 6 08:39:05 2012 @@ -183,7 +183,7 @@ pax.runner.version1.7.5/pax.runner.version pax.base.version1.3.0-SNAPSHOT/pax.base.version pax.url.version1.4-SNAPSHOT/pax.url.version -pax.web.version1.1.2-SNAPSHOT/pax.web.version +pax.web.version1.1.2/pax.web.version pax.swissbox.version1.5.0-SNAPSHOT/pax.swissbox.version pax.tinybundle.version1.0.0/pax.tinybundle.version servlet.api.version2.5/servlet.api.version Propchange: karaf/trunk/region/core/ -- --- svn:ignore (added) +++ svn:ignore Mon Feb 6 08:39:05 2012 @@ -0,0 +1 @@ +target
svn commit: r1241938 - /karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
Author: cschneider
Date: Wed Feb 8 15:33:33 2012
New Revision: 1241938
URL: http://svn.apache.org/viewvc?rev=1241938view=rev
Log:
KARAF-1174 Adding a http-whiteboard feature to karaf 2.2.x. CXF will then
depend only on this smaller feature instead of the war feature
Modified:
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
Modified:
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml?rev=1241938r1=1241937r2=1241938view=diff
==
---
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
Wed Feb 8 15:33:33 2012
@@ -204,6 +204,11 @@
bundle
start-level=30mvn:org.ops4j.pax.web/pax-web-jetty/${pax.web.version}/bundle
/feature
+feature name=http-whiteboard description=Provide HTTP Whiteboard
pattern support version=${project.version} resolver=(obr)
+featurehttp/feature
+bundle
start-level=30mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}/bundle
+/feature
+
feature name=war version=${project.version} resolver=(obr)
config name=org.ops4j.pax.url.war
org.ops4j.pax.url.war.importPaxLoggingPackages=true
svn commit: r1241950 - /karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
Author: cschneider
Date: Wed Feb 8 15:55:06 2012
New Revision: 1241950
URL: http://svn.apache.org/viewvc?rev=1241950view=rev
Log:
CXF-4090 Let the war feature also depend on http-whiteboard to avoid
duplicating the whiteboard extender bundle
Modified:
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
Modified:
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml?rev=1241950r1=1241949r2=1241950view=diff
==
---
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
Wed Feb 8 15:55:06 2012
@@ -213,12 +213,11 @@
config name=org.ops4j.pax.url.war
org.ops4j.pax.url.war.importPaxLoggingPackages=true
/config
-featurehttp/feature
+featurehttp-whiteboard/feature
bundle
start-level='30'mvn:org.apache.karaf.shell/org.apache.karaf.shell.web/${project.version}/bundle
bundle
start-level='30'mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.web/${project.version}/bundle
bundle
start-level=30mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}/bundle
bundle
start-level=30mvn:org.ops4j.pax.web/pax-web-extender-war/${pax.web.version}/bundle
-bundle
start-level=30mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}/bundle
bundle
start-level=30mvn:org.ops4j.pax.web/pax-web-deployer/${pax.web.version}/bundle
bundle
start-level=30mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}/bundle
/feature
svn commit: r1245900 - in /karaf/trunk: demos/command/ demos/deployer/ demos/deployer/src/main/resources/resources/demos/deployer/kar/ demos/dump/src/main/resources/resources/demos/dump/ demos/web/src
Author: cschneider Date: Sat Feb 18 10:26:19 2012 New Revision: 1245900 URL: http://svn.apache.org/viewvc?rev=1245900view=rev Log: Ignore target Modified: karaf/trunk/demos/command/ (props changed) karaf/trunk/demos/deployer/ (props changed) karaf/trunk/demos/deployer/src/main/resources/resources/demos/deployer/kar/ (props changed) karaf/trunk/demos/dump/src/main/resources/resources/demos/dump/ (props changed) karaf/trunk/demos/web/src/main/resources/resources/demos/web/ (props changed) karaf/trunk/scr/ (props changed) karaf/trunk/scr/command/ (props changed) karaf/trunk/scr/examples/ (props changed) karaf/trunk/scr/feature/ (props changed) karaf/trunk/scr/management/ (props changed) Propchange: karaf/trunk/demos/command/ -- --- svn:ignore (added) +++ svn:ignore Sat Feb 18 10:26:19 2012 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/demos/deployer/ -- --- svn:ignore (added) +++ svn:ignore Sat Feb 18 10:26:19 2012 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/demos/deployer/src/main/resources/resources/demos/deployer/kar/ -- --- svn:ignore (added) +++ svn:ignore Sat Feb 18 10:26:19 2012 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/demos/dump/src/main/resources/resources/demos/dump/ -- --- svn:ignore (added) +++ svn:ignore Sat Feb 18 10:26:19 2012 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/demos/web/src/main/resources/resources/demos/web/ -- --- svn:ignore (added) +++ svn:ignore Sat Feb 18 10:26:19 2012 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/scr/ -- --- svn:ignore (added) +++ svn:ignore Sat Feb 18 10:26:19 2012 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/scr/command/ -- --- svn:ignore (added) +++ svn:ignore Sat Feb 18 10:26:19 2012 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/scr/examples/ -- --- svn:ignore (added) +++ svn:ignore Sat Feb 18 10:26:19 2012 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/scr/feature/ -- --- svn:ignore (added) +++ svn:ignore Sat Feb 18 10:26:19 2012 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/scr/management/ -- --- svn:ignore (added) +++ svn:ignore Sat Feb 18 10:26:19 2012 @@ -0,0 +1 @@ +target
svn commit: r1245901 - /karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
Author: cschneider
Date: Sat Feb 18 10:30:14 2012
New Revision: 1245901
URL: http://svn.apache.org/viewvc?rev=1245901view=rev
Log:
Adding ungetTarget to free the service
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java?rev=1245901r1=1245900r2=1245901view=diff
==
---
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
(original)
+++
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
Sat Feb 18 10:30:14 2012
@@ -96,17 +96,20 @@ public class CommandsCompleter implement
}
protected Function unProxy(Function function) {
- if (function instanceof CommandProxy) {
- CommandProxy proxy = (CommandProxy) function;
- Object target = proxy.getTarget();
- if (target instanceof Function) {
- return (Function) target;
- } else {
- return function;
- }
- } else {
- return function;
- }
+if (function instanceof CommandProxy) {
+CommandProxy proxy = (CommandProxy) function;
+Object target = proxy.getTarget();
+Function result;
+if (target instanceof Function) {
+result = (Function) target;
+} else {
+result = function;
+}
+proxy.ungetTarget();
+return result;
+} else {
+return function;
+}
}
}
svn commit: r1296149 - in /karaf/trunk: instance/ instance/core/ instance/management/ management/mbeans/config/ webconsole/instance/
Author: cschneider Date: Fri Mar 2 11:28:54 2012 New Revision: 1296149 URL: http://svn.apache.org/viewvc?rev=1296149view=rev Log: Adding ignores Modified: karaf/trunk/instance/ (props changed) karaf/trunk/instance/core/ (props changed) karaf/trunk/instance/management/ (props changed) karaf/trunk/management/mbeans/config/ (props changed) karaf/trunk/webconsole/instance/ (props changed) Propchange: karaf/trunk/instance/ -- --- svn:ignore (added) +++ svn:ignore Fri Mar 2 11:28:54 2012 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/instance/core/ -- --- svn:ignore (added) +++ svn:ignore Fri Mar 2 11:28:54 2012 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/instance/management/ -- --- svn:ignore (added) +++ svn:ignore Fri Mar 2 11:28:54 2012 @@ -0,0 +1 @@ +target Propchange: karaf/trunk/management/mbeans/config/ -- --- svn:ignore (original) +++ svn:ignore Fri Mar 2 11:28:54 2012 @@ -1 +1,4 @@ target +.classpath +.project +.settings Propchange: karaf/trunk/webconsole/instance/ -- --- svn:ignore (added) +++ svn:ignore Fri Mar 2 11:28:54 2012 @@ -0,0 +1 @@ +target
svn commit: r1296200 - /karaf/trunk/instance/command/
Author: cschneider Date: Fri Mar 2 13:37:00 2012 New Revision: 1296200 URL: http://svn.apache.org/viewvc?rev=1296200view=rev Log: Adding ignores Modified: karaf/trunk/instance/command/ (props changed) Propchange: karaf/trunk/instance/command/ -- --- svn:ignore (added) +++ svn:ignore Fri Mar 2 13:37:00 2012 @@ -0,0 +1 @@ +target
svn commit: r1297896 - /karaf/org.apache.karaf.management.mbeans.config/
Author: cschneider Date: Wed Mar 7 09:07:05 2012 New Revision: 1297896 URL: http://svn.apache.org/viewvc?rev=1297896view=rev Log: (empty) Added: karaf/org.apache.karaf.management.mbeans.config/
svn commit: r1299652 - in /karaf/branches/karaf-2.2.x: management/mbeans/config/ management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ management/mbeans/config/src
Author: cschneider
Date: Mon Mar 12 12:46:53 2012
New Revision: 1299652
URL: http://svn.apache.org/viewvc?rev=1299652view=rev
Log:
KARAF-1243 Fix for 2.2.x
Modified:
karaf/branches/karaf-2.2.x/management/mbeans/config/pom.xml
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml
karaf/branches/karaf-2.2.x/shell/config/pom.xml
karaf/branches/karaf-2.2.x/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java
karaf/branches/karaf-2.2.x/shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java
karaf/branches/karaf-2.2.x/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
Modified: karaf/branches/karaf-2.2.x/management/mbeans/config/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/mbeans/config/pom.xml?rev=1299652r1=1299651r2=1299652view=diff
==
--- karaf/branches/karaf-2.2.x/management/mbeans/config/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/management/mbeans/config/pom.xml Mon Mar 12
12:46:53 2012
@@ -50,6 +50,15 @@
groupIdorg.apache.felix/groupId
artifactIdorg.apache.felix.utils/artifactId
/dependency
+dependency
+groupIdorg.apache.felix/groupId
+artifactIdorg.apache.felix.fileinstall/artifactId
+/dependency
+dependency
+groupIdorg.slf4j/groupId
+artifactIdslf4j-api/artifactId
+/dependency
+
/dependencies
build
Modified:
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java?rev=1299652r1=1299651r2=1299652view=diff
==
---
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java
(original)
+++
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java
Mon Mar 12 12:46:53 2012
@@ -13,11 +13,14 @@
*/
package org.apache.karaf.management.mbeans.config.internal;
+import org.apache.felix.fileinstall.ArtifactInstaller;
import org.apache.felix.utils.properties.Properties;
import org.apache.karaf.management.mbeans.config.ConfigMBean;
import org.osgi.framework.Constants;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
@@ -28,10 +31,12 @@ import java.util.*;
* Implementation of the ConfigMBean.
*/
public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean {
-
+private static final Logger LOG =
LoggerFactory.getLogger(ConfigMBeanImpl.class);
+
private final String FELIX_FILEINSTALL_FILENAME =
felix.fileinstall.filename;
private ConfigurationAdmin configurationAdmin;
+private ListArtifactInstaller artifactInstallers;
private File storage;
public ConfigurationAdmin getConfigurationAdmin() {
@@ -50,6 +55,10 @@ public class ConfigMBeanImpl extends Sta
this.storage = storage;
}
+public void setArtifactInstallers(ListArtifactInstaller
artifactInstallers) {
+this.artifactInstallers = artifactInstallers;
+}
+
public ConfigMBeanImpl() throws NotCompliantMBeanException {
super(ConfigMBean.class);
}
@@ -197,6 +206,7 @@ public class ConfigMBeanImpl extends Sta
// save the cfg file
storage.mkdirs();
p.save();
+updateFileInstall(storageFile);
} else {
Configuration cfg = configurationAdmin.getConfiguration(pid, null);
if (cfg.getProperties() == null) {
@@ -211,6 +221,26 @@ public class ConfigMBeanImpl extends Sta
cfg.update(properties);
}
}
+
+/**
+ * Trigger felix fileinstall to update the config so there is no delay
till it polls the file
+ *
+ * @param storageFile
+ * @throws Exception
+ */
+private void updateFileInstall(File storageFile) {
+if (artifactInstallers != null) {
+for (ArtifactInstaller installer : artifactInstallers) {
+if (installer.canHandle(storageFile)) {
+try {
+installer.update(storageFile);
+} catch (Exception e
svn commit: r1299688 - in /karaf/trunk: management/mbeans/config/ management/mbeans/config/src/main/resources/OSGI-INF/blueprint/ shell/config/ shell/config/src/main/java/org/apache/karaf/shell/config
Author: cschneider
Date: Mon Mar 12 14:32:54 2012
New Revision: 1299688
URL: http://svn.apache.org/viewvc?rev=1299688view=rev
Log:
KARAF-1243 Fix for trunk
Modified:
karaf/trunk/management/mbeans/config/pom.xml
karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml
karaf/trunk/shell/config/pom.xml
karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigRepository.java
karaf/trunk/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
karaf/trunk/shell/config/src/test/java/org/apache/karaf/shell/config/EditCommandTest.java
karaf/trunk/shell/config/src/test/java/org/apache/karaf/shell/config/UpdateCommandTest.java
Modified: karaf/trunk/management/mbeans/config/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/config/pom.xml?rev=1299688r1=1299687r2=1299688view=diff
==
--- karaf/trunk/management/mbeans/config/pom.xml (original)
+++ karaf/trunk/management/mbeans/config/pom.xml Mon Mar 12 14:32:54 2012
@@ -52,6 +52,10 @@
groupIdorg.apache.felix/groupId
artifactIdorg.apache.felix.utils/artifactId
/dependency
+dependency
+groupIdorg.slf4j/groupId
+artifactIdslf4j-api/artifactId
+/dependency
!--
Temporally depend on shell.config to reuse the ConfigRepository.
Modified:
karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml?rev=1299688r1=1299687r2=1299688view=diff
==
---
karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml
(original)
+++
karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml
Mon Mar 12 14:32:54 2012
@@ -24,7 +24,10 @@
bean id=configRepo
class=org.apache.karaf.shell.config.ConfigRepository
argument value=${storage}/
argument ref=configAdmin/
+argument ref=artifactInstallers/
/bean
+
+reference-list id=artifactInstallers
interface=org.apache.felix.fileinstall.ArtifactInstaller
availability=optional /
reference id=configAdmin
interface=org.osgi.service.cm.ConfigurationAdmin /
Modified: karaf/trunk/shell/config/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/config/pom.xml?rev=1299688r1=1299687r2=1299688view=diff
==
--- karaf/trunk/shell/config/pom.xml (original)
+++ karaf/trunk/shell/config/pom.xml Mon Mar 12 14:32:54 2012
@@ -54,6 +54,11 @@
artifactIdorg.apache.felix.utils/artifactId
scopeprovided/scope
/dependency
+
+dependency
+groupIdorg.apache.felix/groupId
+artifactIdorg.apache.felix.fileinstall/artifactId
+/dependency
dependency
groupIdorg.apache.karaf/groupId
@@ -69,6 +74,11 @@
dependency
groupIdorg.slf4j/groupId
+artifactIdslf4j-api/artifactId
+/dependency
+
+dependency
+groupIdorg.slf4j/groupId
artifactIdslf4j-jdk14/artifactId
scopetest/scope
/dependency
Modified:
karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigRepository.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigRepository.java?rev=1299688r1=1299687r2=1299688view=diff
==
---
karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigRepository.java
(original)
+++
karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigRepository.java
Mon Mar 12 14:32:54 2012
@@ -21,14 +21,19 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Dictionary;
import java.util.Enumeration;
+import java.util.List;
+import org.apache.felix.fileinstall.ArtifactInstaller;
import org.apache.felix.utils.properties.Properties;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ConfigRepository {
+private static final Logger LOG =
LoggerFactory.getLogger(ConfigRepository.class);
private static final String
FILEINSTALL_FILE_NAME=felix.fileinstall.filename;
private static final String PID_FILTER=(service.pid=%s*);
@@ -37,11 +42,14 @@ public class ConfigRepository {
private static final String
svn commit: r1299806 - /karaf/trunk/config/
Author: cschneider Date: Mon Mar 12 19:37:04 2012 New Revision: 1299806 URL: http://svn.apache.org/viewvc?rev=1299806view=rev Log: KARAF-963 restructuring of config Added: karaf/trunk/config/
svn commit: r1300159 - /karaf/trunk/config/pom.xml
Author: cschneider Date: Tue Mar 13 14:44:46 2012 New Revision: 1300159 URL: http://svn.apache.org/viewvc?rev=1300159view=rev Log: KARAF-963 restructuring of config to new module layout Added: karaf/trunk/config/pom.xml Added: karaf/trunk/config/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/config/pom.xml?rev=1300159view=auto == --- karaf/trunk/config/pom.xml (added) +++ karaf/trunk/config/pom.xml Tue Mar 13 14:44:46 2012 @@ -0,0 +1,42 @@ +?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. +-- + +modelVersion4.0.0/modelVersion + +parent +groupIdorg.apache.karaf/groupId +artifactIdkaraf/artifactId +version3.0.0-SNAPSHOT/version +relativePath../pom.xml/relativePath +/parent + +groupIdorg.apache.karaf.config/groupId +artifactIdconfig/artifactId +packagingpom/packaging +nameApache Karaf :: ConfigAdmin/name + +modules +modulecore/module +modulecommand/module +modulemanagement/module +/modules + +/project
svn commit: r1300172 - /karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
Author: cschneider
Date: Tue Mar 13 15:05:19 2012
New Revision: 1300172
URL: http://svn.apache.org/viewvc?rev=1300172view=rev
Log:
KARAF-963 restructuring of config to new module layout
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.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=1300172r1=1300171r2=1300172view=diff
==
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
(original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Tue
Mar 13 15:05:19 2012
@@ -50,7 +50,6 @@
feature name=config description=Provide OSGi ConfigAdmin support
version=${project.version}
bundle start-level=30
start=truemvn:org.apache.karaf.config/org.apache.karaf.config.core/${project.version}/bundle
bundle start-level=30
start=truemvn:org.apache.karaf.config/org.apache.karaf.config.command/${project.version}/bundle
-bundle
start-level=30mvn:org.apache.karaf.config/org.apache.karaf.config.management/${project.version}/bundle
/feature
feature name=region description=Provide Region Support
version=${project.version}
@@ -155,6 +154,7 @@
bundle
start-level=30mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.packages/${project.version}/bundle
bundle
start-level=30mvn:org.apache.aries.jmx/org.apache.aries.jmx/${aries.jmx.version}/bundle
bundle
start-level=30mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/bundle
+bundle
start-level=30mvn:org.apache.karaf.config/org.apache.karaf.config.management/${project.version}/bundle
/feature
feature name=scheduler description=Provide a scheduler service in
Karaf to fire events version=${project.version} resolver=(obr)
svn commit: r1300176 - in /karaf/trunk/config/core/src/main/java/org/apache/karaf/config: ./ core/ core/ConfigRepository.java core/impl/ core/impl/ConfigRepositoryImpl.java
Author: cschneider
Date: Tue Mar 13 15:09:20 2012
New Revision: 1300176
URL: http://svn.apache.org/viewvc?rev=1300176view=rev
Log:
KARAF-963 restructuring of config to new module layout
Added:
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/ConfigRepository.java
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/impl/
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
Added:
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/ConfigRepository.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/ConfigRepository.java?rev=1300176view=auto
==
---
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/ConfigRepository.java
(added)
+++
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/ConfigRepository.java
Tue Mar 13 15:09:20 2012
@@ -0,0 +1,37 @@
+package org.apache.karaf.config.core;
+
+import java.io.IOException;
+import java.util.Dictionary;
+
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.service.cm.ConfigurationAdmin;
+
+public interface ConfigRepository {
+
+/**
+ * Saves config to storage or ConfigurationAdmin.
+ * @param pid
+ * @param props
+ * @param bypassStorage
+ * @throws IOException
+ */
+@SuppressWarnings(rawtypes)
+void update(String pid, Dictionary props, boolean bypassStorage) throws
IOException;
+
+/**
+ * Saves config to storage or ConfigurationAdmin.
+ * @param pid
+ * @param props
+ * @param bypassStorage
+ * @throws IOException
+ */
+@SuppressWarnings(rawtypes)
+void update(String pid, Dictionary props) throws IOException;
+
+void delete(String pid) throws Exception;
+
+@SuppressWarnings(rawtypes)
+Dictionary getConfigProperties(String pid) throws IOException,
InvalidSyntaxException;
+
+ConfigurationAdmin getConfigAdmin();
+}
Added:
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java?rev=1300176view=auto
==
---
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
(added)
+++
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
Tue Mar 13 15:09:20 2012
@@ -0,0 +1,252 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.config.core.impl;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.List;
+
+import org.apache.felix.fileinstall.ArtifactInstaller;
+import org.apache.felix.utils.properties.Properties;
+import org.apache.karaf.config.core.ConfigRepository;
+import org.osgi.framework.Constants;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ConfigRepositoryImpl implements ConfigRepository {
+private static final Logger LOG =
LoggerFactory.getLogger(ConfigRepositoryImpl.class);
+private static final String
FILEINSTALL_FILE_NAME=felix.fileinstall.filename;
+
+private static final String PID_FILTER=(service.pid=%s*);
+private static final String FILE_PREFIX=file:;
+private static final String CONFIG_SUFFIX=.cfg;
+private static final String FACTORY_SEPARATOR = -;
+
+private ConfigurationAdmin configAdmin;
+
+private File storage;
+private ListArtifactInstaller artifactInstallers;
+
+public ConfigRepositoryImpl(File storage, ConfigurationAdmin configAdmin,
ListArtifactInstaller artifactInstallers
svn commit: r1300211 - in /karaf/trunk/config: command/src/main/resources/org/apache/karaf/config/ command/src/main/resources/org/apache/karaf/config/command/ command/src/test/java/org/apache/karaf/co
Author: cschneider Date: Tue Mar 13 16:05:10 2012 New Revision: 1300211 URL: http://svn.apache.org/viewvc?rev=1300211view=rev Log: KARAF-963 restructuring of config to new module layout Added: karaf/trunk/config/command/src/main/resources/org/apache/karaf/config/ karaf/trunk/config/command/src/main/resources/org/apache/karaf/config/command/ karaf/trunk/config/command/src/main/resources/org/apache/karaf/config/command/edit.txt karaf/trunk/config/command/src/test/java/org/apache/karaf/config/ karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/ karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/EditCommandTest.java karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/MockCommandSession.java karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/UpdateCommandTest.java karaf/trunk/config/management/src/main/java/org/apache/karaf/config/ karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/ karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/ConfigMBean.java karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/internal/ karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/internal/ConfigMBeanImpl.java Modified: karaf/trunk/config/management/pom.xml Added: karaf/trunk/config/command/src/main/resources/org/apache/karaf/config/command/edit.txt URL: http://svn.apache.org/viewvc/karaf/trunk/config/command/src/main/resources/org/apache/karaf/config/command/edit.txt?rev=1300211view=auto == --- karaf/trunk/config/command/src/main/resources/org/apache/karaf/config/command/edit.txt (added) +++ karaf/trunk/config/command/src/main/resources/org/apache/karaf/config/command/edit.txt Tue Mar 13 16:05:10 2012 @@ -0,0 +1,13 @@ +The edit command can be used to create or edit a configuration by passing its pid as argument. + config:edit org.apache.karaf.sample.pid +The command above will create a file etc/org.apache.karaf.sample.pid which corresponds to a configuration object with pid org.apache.karaf.sample.pid + +In case of Managed Service Factories the user can create or edit the configuration of a specific instance of a managed service. + config:edit org.apache.karaf.sample.service.factory.pid-instanceid +The command above will create a file etc/org.apache.karaf.sample.service.factory.pid-instanceid but in this case the pid is generated, according to the specification. + +This makes further editing to the configuration difficult because the generated pid is not known to the user. To make things simple config:edit provides a special flag -f or --use-file which allows editing a configuration using the filename instead of the pid. +So the user can simply edit again the configuration by typing: + config:edit org.apache.karaf.sample.service.factory.pid-instanceid. + +The --factory option can be used to create a new configuration for a given factory pid. The parameter will be used as the factory pid and the configuration pid will be generated. Note that this option \ No newline at end of file Added: karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/EditCommandTest.java URL: http://svn.apache.org/viewvc/karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/EditCommandTest.java?rev=1300211view=auto == --- karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/EditCommandTest.java (added) +++ karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/EditCommandTest.java Tue Mar 13 16:05:10 2012 @@ -0,0 +1,107 @@ +/* + * 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. + */ +package org.apache.karaf.config.command; + +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; + +import java.util.Dictionary; +import java.util.Properties; + +import junit.framework.TestCase; + +import
svn commit: r1300219 - /karaf/trunk/config/core/pom.xml
Author: cschneider Date: Tue Mar 13 16:23:40 2012 New Revision: 1300219 URL: http://svn.apache.org/viewvc?rev=1300219view=rev Log: KARAF-963 correct Manifest Modified: karaf/trunk/config/core/pom.xml Modified: karaf/trunk/config/core/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/config/core/pom.xml?rev=1300219r1=1300218r2=1300219view=diff == --- karaf/trunk/config/core/pom.xml (original) +++ karaf/trunk/config/core/pom.xml Tue Mar 13 16:23:40 2012 @@ -95,8 +95,10 @@ artifactIdmaven-bundle-plugin/artifactId configuration instructions + Export-Packageorg.apache.karaf.config.core/Export-Package Private-Package -org.apache.felix.utils.properties +org.apache.felix.utils.properties, +org.apache.karaf.config.core.impl /Private-Package /instructions /configuration
svn commit: r1302394 - /karaf/trunk/util/src/main/java/org/apache/karaf/util/ShellUtil.java
Author: cschneider
Date: Mon Mar 19 12:17:12 2012
New Revision: 1302394
URL: http://svn.apache.org/viewvc?rev=1302394view=rev
Log:
Fix problem if obj is null
Modified:
karaf/trunk/util/src/main/java/org/apache/karaf/util/ShellUtil.java
Modified: karaf/trunk/util/src/main/java/org/apache/karaf/util/ShellUtil.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/util/src/main/java/org/apache/karaf/util/ShellUtil.java?rev=1302394r1=1302393r2=1302394view=diff
==
--- karaf/trunk/util/src/main/java/org/apache/karaf/util/ShellUtil.java
(original)
+++ karaf/trunk/util/src/main/java/org/apache/karaf/util/ShellUtil.java Mon Mar
19 12:17:12 2012
@@ -59,7 +59,10 @@ public class ShellUtil {
public static String getValueString(Object obj)
{
-if (obj.getClass().isArray())
+if (obj == null) {
+return null;
+}
+else if (obj.getClass().isArray())
{
Object[] array = (Object[]) obj;
StringBuilder sb = new StringBuilder();
@@ -116,10 +119,6 @@ public class ShellUtil {
return obj.toString();
}
}
-else if (obj == null)
-{
-return null;
-}
else
{
return obj.toString();
svn commit: r1302707 - in /karaf/trunk: bundle/command/ bundle/command/src/main/java/org/apache/karaf/bundle/command/ bundle/core/ bundle/core/src/main/java/org/apache/karaf/bundle/core/ bundle/core/s
Author: cschneider Date: Mon Mar 19 23:08:58 2012 New Revision: 1302707 URL: http://svn.apache.org/viewvc?rev=1302707view=rev Log: KARAF-1275 Use services in bundle.management, add getDiag, move ShellUtil to console module Removed: karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesSelector.java karaf/trunk/bundle/springstate/src/main/java/org/apache/karaf/bundle/springstate/SpringStateListenerFactory.java karaf/trunk/util/src/main/java/org/apache/karaf/util/ShellUtil.java Modified: karaf/trunk/bundle/command/pom.xml karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/BundleCommand.java karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/BundlesCommand.java karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/Capabilities.java karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/Headers.java karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/Info.java karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ListBundleServices.java karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ListBundles.java karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/Requirements.java karaf/trunk/bundle/core/pom.xml karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/BundleSelector.java karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/BundleStateService.java karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BlueprintListener.java karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleSelectorImpl.java karaf/trunk/bundle/management/pom.xml karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/BundlesMBean.java karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesMBeanImpl.java karaf/trunk/bundle/management/src/main/resources/OSGI-INF/blueprint/bundles-management.xml karaf/trunk/bundle/springstate/src/main/java/org/apache/karaf/bundle/springstate/SpringApplicationListener.java karaf/trunk/shell/console/pom.xml karaf/trunk/shell/services/pom.xml karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ListServices.java Modified: karaf/trunk/bundle/command/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/command/pom.xml?rev=1302707r1=1302706r2=1302707view=diff == --- karaf/trunk/bundle/command/pom.xml (original) +++ karaf/trunk/bundle/command/pom.xml Mon Mar 19 23:08:58 2012 @@ -39,11 +39,6 @@ dependencies dependency -groupIdorg.apache.karaf/groupId -artifactIdorg.apache.karaf.util/artifactId -scopeprovided/scope -/dependency -dependency groupIdorg.apache.karaf.shell/groupId artifactIdorg.apache.karaf.shell.console/artifactId /dependency @@ -101,7 +96,6 @@ /DynamicImport-Package Private-Package org.apache.karaf.bundle.command*, -org.apache.karaf.util, org.apache.felix.utils.version, org.apache.felix.utils.manifest, !* Modified: karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/BundleCommand.java URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/BundleCommand.java?rev=1302707r1=1302706r2=1302707view=diff == --- karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/BundleCommand.java (original) +++ karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/BundleCommand.java Mon Mar 19 23:08:58 2012 @@ -18,7 +18,7 @@ package org.apache.karaf.bundle.command; import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.console.OsgiCommandSupport; -import org.apache.karaf.util.ShellUtil; +import org.apache.karaf.shell.util.ShellUtil; import org.osgi.framework.Bundle; /** Modified: karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/BundlesCommand.java URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/BundlesCommand.java?rev=1302707r1=1302706r2=1302707view=diff == --- karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/BundlesCommand.java (original) +++ karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/BundlesCommand.java Mon Mar 19 23:08:58 2012
svn commit: r1303149 - /karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/startup.properties
Author: cschneider Date: Tue Mar 20 21:01:39 2012 New Revision: 1303149 URL: http://svn.apache.org/viewvc?rev=1303149view=rev Log: Try to fix itests Modified: karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/startup.properties Modified: karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/startup.properties URL: http://svn.apache.org/viewvc/karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/startup.properties?rev=1303149r1=1303148r2=1303149view=diff == --- karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/startup.properties (original) +++ karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/startup.properties Tue Mar 20 21:01:39 2012 @@ -1,10 +1,14 @@ # Testing startup.properties +#Bundles to be started on startup, with startlevel + +# feature: framework version: 3.0.0-SNAPSHOT mvn\:org.ops4j.base/ops4j-base-lang/1.3.0 = 5 mvn\:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/3.8.2_4 = 5 mvn\:biz.aQute/bndlib/1.50.0 = 5 mvn\:org.ops4j.pax.swissbox/pax-swissbox-bnd/1.5.0 = 5 -mvn\:org.ops4j.pax.url/pax-url-aether/1.4.0.RC1 = 5 -mvn\:org.ops4j.pax.url/pax-url-wrap/1.4.0.RC1 = 5 +mvn\:org.ops4j.pax.url/pax-url-maven-commons/1.4-SNAPSHOT = 5 +mvn\:org.ops4j.pax.url/pax-url-aether/1.4-SNAPSHOT = 5 +mvn\:org.ops4j.pax.url/pax-url-wrap/1.4-SNAPSHOT = 5 mvn\:org.ops4j.pax.logging/pax-logging-api/1.6.5 = 8 mvn\:org.ops4j.pax.logging/pax-logging-service/1.6.5 = 8 mvn\:org.apache.felix/org.apache.felix.configadmin/1.2.8 = 10 @@ -17,20 +21,25 @@ mvn\:org.apache.aries.blueprint/org.apac mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/0.3.3-SNAPSHOT = 20 mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/0.4.1-SNAPSHOT = 20 mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core/0.4.1-SNAPSHOT = 20 +mvn\:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/3.0.0-SNAPSHOT = 24 +mvn\:org.apache.karaf.deployer/org.apache.karaf.deployer.blueprint/3.0.0-SNAPSHOT = 24 mvn\:org.apache.karaf.region/org.apache.karaf.region.core/3.0.0-SNAPSHOT = 25 mvn\:org.apache.karaf.features/org.apache.karaf.features.core/3.0.0-SNAPSHOT = 25 -mvn\:org.ops4j.pax.url/pax-url-commons/1.4.0.RC1 = 30 -mvn\:org.ops4j.pax.swissbox/pax-swissbox-property/1.5.0 = 30 mvn\:org.ops4j.base/ops4j-base-util-property/1.3.0 = 30 +mvn\:org.ops4j.base/ops4j-base-util-xml/1.3.0 = 30 +mvn\:org.ops4j.base/ops4j-base-util-collections/1.3.0 = 30 +mvn\:org.ops4j.pax.url/pax-url-commons/1.4-SNAPSHOT = 30 +mvn\:org.ops4j.pax.swissbox/pax-swissbox-property/1.5.0 = 30 mvn\:org.ops4j.base/ops4j-base-net/1.3.0 = 30 mvn\:org.ops4j.base/ops4j-base-monitors/1.3.0 = 30 mvn\:org.apache.karaf.features/org.apache.karaf.features.command/3.0.0-SNAPSHOT = 30 mvn\:org.apache.karaf.shell/org.apache.karaf.shell.console/3.0.0-SNAPSHOT = 30 mvn\:org.apache.karaf.jaas/org.apache.karaf.jaas.modules/3.0.0-SNAPSHOT = 30 mvn\:org.apache.karaf.jaas/org.apache.karaf.jaas.config/3.0.0-SNAPSHOT = 30 -mvn\:org.apache.karaf.shell/org.apache.karaf.shell.bundles/3.0.0-SNAPSHOT = 30 +mvn\:org.apache.karaf.bundle/org.apache.karaf.bundle.command/3.0.0-SNAPSHOT = 30 +mvn\:org.apache.karaf.bundle/org.apache.karaf.bundle.core/3.0.0-SNAPSHOT = 30 mvn\:org.apache.karaf.shell/org.apache.karaf.shell.services/3.0.0-SNAPSHOT = 30 mvn\:org.apache.karaf.system/org.apache.karaf.system.core/3.0.0-SNAPSHOT = 30 mvn\:org.apache.karaf.system/org.apache.karaf.system.commands/3.0.0-SNAPSHOT = 30 mvn\:org.apache.karaf.shell/org.apache.karaf.shell.commands/3.0.0-SNAPSHOT = 30 -mvn\:org.apache.aries.quiesce/org.apache.aries.quiesce.api/0.3 = 30 \ No newline at end of file +mvn\:org.apache.aries.quiesce/org.apache.aries.quiesce.api/0.3 = 30
svn commit: r1303468 - /karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/Refresh.java
Author: cschneider
Date: Wed Mar 21 17:19:23 2012
New Revision: 1303468
URL: http://svn.apache.org/viewvc?rev=1303468view=rev
Log:
KARAF-1275 Bugfix: Refresh should not refresh all bundles by default
Modified:
karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/Refresh.java
Modified:
karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/Refresh.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/Refresh.java?rev=1303468r1=1303467r2=1303468view=diff
==
---
karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/Refresh.java
(original)
+++
karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/Refresh.java
Wed Mar 21 17:19:23 2012
@@ -24,6 +24,10 @@ import org.osgi.framework.wiring.Framewo
@Command(scope = bundle, name = refresh, description = Refresh bundles.)
public class Refresh extends BundlesCommandWithConfirmation {
+
+public Refresh() {
+this.defaultAllBundles = false;
+}
protected void doExecute(ListBundle bundles) throws Exception {
FrameworkWiring wiring =
getBundleContext().getBundle(0).adapt(FrameworkWiring.class);
svn commit: r1304314 - in /karaf/trunk/shell/console/src: main/java/org/apache/karaf/shell/console/table/ main/java/org/apache/karaf/shell/console/table2/ test/java/org/apache/karaf/shell/console/tabl
Author: cschneider
Date: Fri Mar 23 12:31:07 2012
New Revision: 1304314
URL: http://svn.apache.org/viewvc?rev=1304314view=rev
Log:
KARAF-1281 Add a new ShellTable impl
Added:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Column.java
- copied unchanged from r1303469,
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/Column.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Cell.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Col.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Row.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/ShellTable.java
karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/tabletest/
karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/tabletest/ShellTableTest.java
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/StringUtil.java
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/StringUtil.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/StringUtil.java?rev=1304314r1=1304313r2=1304314view=diff
==
---
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/StringUtil.java
(original)
+++
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table/StringUtil.java
Fri Mar 23 12:31:07 2012
@@ -15,7 +15,7 @@
*/
package org.apache.karaf.shell.console.table;
-public class StringUtil {
+class StringUtil {
/**
* Returns length of the string.
Added:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Cell.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Cell.java?rev=1304314view=auto
==
---
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Cell.java
(added)
+++
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Cell.java
Fri Mar 23 12:31:07 2012
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.shell.console.table2;
+
+import java.io.PrintStream;
+
+
+public class Cell {
+private Object content;
+private boolean isHeader;
+private Col col;
+
+public Cell(Object content, boolean isHeader, Col col) {
+this.isHeader = isHeader;
+this.content = content;
+this.col = col;
+}
+
+public boolean isHeader() {
+return isHeader;
+}
+
+public Object getContent() {
+return content;
+}
+
+public void print(PrintStream out, int size) {
+out.print();
+}
+}
Added:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Col.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Col.java?rev=1304314view=auto
==
---
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Col.java
(added)
+++
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/table2/Col.java
Fri Mar 23 12:31:07 2012
@@ -0,0 +1,115 @@
+/*
+ * 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
svn commit: r1304607 - in /karaf/trunk/bundle: command/pom.xml core/pom.xml management/pom.xml springstate/pom.xml
Author: cschneider Date: Fri Mar 23 21:22:04 2012 New Revision: 1304607 URL: http://svn.apache.org/viewvc?rev=1304607view=rev Log: Using karaf.main instead of osgi core bundle to avoid build problems on jdk 7 Modified: karaf/trunk/bundle/command/pom.xml karaf/trunk/bundle/core/pom.xml karaf/trunk/bundle/management/pom.xml karaf/trunk/bundle/springstate/pom.xml Modified: karaf/trunk/bundle/command/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/command/pom.xml?rev=1304607r1=1304606r2=1304607view=diff == --- karaf/trunk/bundle/command/pom.xml (original) +++ karaf/trunk/bundle/command/pom.xml Fri Mar 23 21:22:04 2012 @@ -47,9 +47,9 @@ artifactIdorg.apache.karaf.bundle.core/artifactId /dependency -dependency -groupIdorg.osgi/groupId -artifactIdorg.osgi.core/artifactId + dependency +groupIdorg.apache.karaf/groupId +artifactIdorg.apache.karaf.main/artifactId scopeprovided/scope /dependency dependency Modified: karaf/trunk/bundle/core/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/core/pom.xml?rev=1304607r1=1304606r2=1304607view=diff == --- karaf/trunk/bundle/core/pom.xml (original) +++ karaf/trunk/bundle/core/pom.xml Fri Mar 23 21:22:04 2012 @@ -44,12 +44,19 @@ artifactIdorg.apache.aries.blueprint.api/artifactId scopeprovided/scope /dependency - + + dependency +groupIdorg.apache.karaf/groupId +artifactIdorg.apache.karaf.main/artifactId +scopeprovided/scope +/dependency +!-- dependency groupIdorg.osgi/groupId artifactIdorg.osgi.core/artifactId scopeprovided/scope /dependency + -- dependency groupIdorg.slf4j/groupId artifactIdslf4j-api/artifactId Modified: karaf/trunk/bundle/management/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/management/pom.xml?rev=1304607r1=1304606r2=1304607view=diff == --- karaf/trunk/bundle/management/pom.xml (original) +++ karaf/trunk/bundle/management/pom.xml Fri Mar 23 21:22:04 2012 @@ -43,9 +43,9 @@ artifactIdorg.apache.karaf.bundle.core/artifactId scopeprovided/scope /dependency -dependency -groupIdorg.osgi/groupId -artifactIdorg.osgi.core/artifactId + dependency +groupIdorg.apache.karaf/groupId +artifactIdorg.apache.karaf.main/artifactId scopeprovided/scope /dependency dependency Modified: karaf/trunk/bundle/springstate/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/springstate/pom.xml?rev=1304607r1=1304606r2=1304607view=diff == --- karaf/trunk/bundle/springstate/pom.xml (original) +++ karaf/trunk/bundle/springstate/pom.xml Fri Mar 23 21:22:04 2012 @@ -46,9 +46,9 @@ scopeprovided/scope /dependency -dependency -groupIdorg.osgi/groupId -artifactIdorg.osgi.core/artifactId + dependency +groupIdorg.apache.karaf/groupId +artifactIdorg.apache.karaf.main/artifactId scopeprovided/scope /dependency dependency
svn commit: r1305344 - in /karaf/trunk/assemblies/features: spring/ standard/pom.xml standard/src/main/feature/feature.xml
Author: cschneider
Date: Mon Mar 26 13:22:32 2012
New Revision: 1305344
URL: http://svn.apache.org/viewvc?rev=1305344view=rev
Log:
KARAF-1289 Have standard feature in xml instead of generating it
Modified:
karaf/trunk/assemblies/features/spring/ (props changed)
karaf/trunk/assemblies/features/standard/pom.xml
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
Propchange: karaf/trunk/assemblies/features/spring/
--
--- svn:ignore (original)
+++ svn:ignore Mon Mar 26 13:22:32 2012
@@ -1,3 +1,5 @@
target
*.iml
+.project
+.settings
Modified: karaf/trunk/assemblies/features/standard/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/pom.xml?rev=1305344r1=1305343r2=1305344view=diff
==
--- karaf/trunk/assemblies/features/standard/pom.xml (original)
+++ karaf/trunk/assemblies/features/standard/pom.xml Mon Mar 26 13:22:32 2012
@@ -38,169 +38,6 @@
appendedResourcesDirectory${basedir}/../../../../etc/appended-resources/appendedResourcesDirectory
/properties
-dependencies
-dependency
-groupIdorg.apache.karaf.features/groupId
-artifactIdorg.apache.karaf.features.command/artifactId
-exclusions
-exclusion
-groupIdorg.apache.karaf.features/groupId
-artifactIdorg.apache.karaf.features.core/artifactId
-/exclusion
-exclusion
-groupIdorg.apache.karaf.shell/groupId
-artifactIdorg.apache.karaf.shell.console/artifactId
-/exclusion
-/exclusions
-/dependency
-dependency
-groupIdorg.apache.karaf.features/groupId
-artifactIdorg.apache.karaf.features.management/artifactId
-exclusions
-exclusion
-groupIdorg.apache.karaf.features/groupId
-artifactIdorg.apache.karaf.features.core/artifactId
-/exclusion
-/exclusions
-/dependency
-dependency
-groupIdorg.apache.karaf.instance/groupId
-artifactIdorg.apache.karaf.instance.core/artifactId
-/dependency
-dependency
-groupIdorg.apache.karaf.instance/groupId
-artifactIdorg.apache.karaf.instance.command/artifactId
-/dependency
-dependency
-groupIdorg.apache.karaf.instance/groupId
-artifactIdorg.apache.karaf.instance.management/artifactId
-/dependency
-dependency
-groupIdorg.apache.karaf.diagnostic/groupId
-artifactIdorg.apache.karaf.diagnostic.core/artifactId
-/dependency
-dependency
-groupIdorg.apache.karaf.diagnostic/groupId
-artifactIdorg.apache.karaf.diagnostic.common/artifactId
-exclusions
-exclusion
-groupIdorg.apache.karaf.features/groupId
-artifactIdorg.apache.karaf.features.core/artifactId
-/exclusion
-/exclusions
-/dependency
-dependency
-groupIdorg.apache.karaf.diagnostic/groupId
-artifactIdorg.apache.karaf.diagnostic.command/artifactId
-exclusions
-exclusion
-groupIdorg.apache.karaf.shell/groupId
-artifactIdorg.apache.karaf.shell.console/artifactId
-/exclusion
-/exclusions
-/dependency
-dependency
-groupIdorg.apache.karaf.diagnostic/groupId
-artifactIdorg.apache.karaf.diagnostic.management/artifactId
-/dependency
-!--dependency--
-!--groupIdorg.apache.karaf.shell/groupId--
-!--artifactIdorg.apache.karaf.shell.console/artifactId--
-!--/dependency--
-!--dependency--
-!--groupIdorg.apache.karaf.shell/groupId--
-!--artifactIdorg.apache.karaf.shell.bundlesles/artifactId--
-!--/dependency--
-dependency
-groupIdorg.apache.karaf.shell/groupId
-artifactIdorg.apache.karaf.shell.log/artifactId
-exclusions
-exclusion
-groupIdorg.apache.karaf.shell/groupId
-artifactIdorg.apache.karaf.shell.console/artifactId
-/exclusion
-exclusion
-groupIdorg.ops4j.pax.logging/groupId
-artifactIdpax-logging-api/artifactId
-/exclusion
-exclusion
-groupIdorg.ops4j.pax.logging/groupId
-artifactIdpax-logging-service/artifactId
-/exclusion
-/exclusions
-/dependency
-dependency
svn commit: r1305358 - /karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
Author: cschneider
Date: Mon Mar 26 13:56:25 2012
New Revision: 1305358
URL: http://svn.apache.org/viewvc?rev=1305358view=rev
Log:
KARAF-713 Moving ShutdownThread to a separate class
Modified:
karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java?rev=1305358r1=1305357r2=1305358view=diff
==
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java Mon Mar 26
13:56:25 2012
@@ -33,10 +33,8 @@ import java.lang.management.RuntimeMXBea
import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.ServerSocket;
-import java.net.Socket;
import java.net.URL;
import java.net.URLClassLoader;
-import java.security.AccessControlException;
import java.security.Provider;
import java.security.Security;
import java.util.ArrayList;
@@ -45,7 +43,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.Random;
import java.util.StringTokenizer;
import java.util.TreeMap;
import java.util.jar.Manifest;
@@ -1388,10 +1385,6 @@ public class Main {
framework.adapt(FrameworkStartLevel.class).setStartLevel(level);
}
-
-private Random random = null;
-private ServerSocket shutdownSocket;
-
protected void setupShutdown(Properties props) {
writePid(props);
try {
@@ -1400,7 +1393,7 @@ public class Main {
String portFile = props.getProperty(KARAF_SHUTDOWN_PORT_FILE);
final String shutdown = props.getProperty(KARAF_SHUTDOWN_COMMAND,
DEFAULT_SHUTDOWN_COMMAND);
if (port = 0) {
-shutdownSocket = new ServerSocket(port, 1,
InetAddress.getByName(host));
+ServerSocket shutdownSocket = new ServerSocket(port, 1,
InetAddress.getByName(host));
if (port == 0) {
port = shutdownSocket.getLocalPort();
}
@@ -1409,7 +1402,7 @@ public class Main {
w.write(Integer.toString(port));
w.close();
}
-Thread thread = new ShutdownSocketThread(shutdown);
+Thread thread = new ShutdownSocketThread(shutdown,
shutdownSocket, framework);
thread.setDaemon(true);
thread.start();
}
@@ -1438,84 +1431,5 @@ public class Main {
}
}
-private class ShutdownSocketThread extends Thread {
-
-private final String shutdown;
-
-public ShutdownSocketThread(String shutdown) {
-this.shutdown = shutdown;
-}
-
-public void run() {
-try {
-while (true) {
-// Wait for the next connection
-Socket socket = null;
-InputStream stream = null;
-try {
-socket = shutdownSocket.accept();
-socket.setSoTimeout(10 * 1000); // Ten seconds
-stream = socket.getInputStream();
-} catch (AccessControlException ace) {
-LOG.log(Level.WARNING, Karaf shutdown socket:
security exception:
- + ace.getMessage(), ace);
-continue;
-} catch (IOException e) {
-LOG.log(Level.SEVERE, Karaf shutdown socket: accept:
, e);
-System.exit(1);
-}
-
-// Read a set of characters from the socket
-StringBuilder command = new StringBuilder();
-int expected = 1024; // Cut off to avoid DoS attack
-while (expected shutdown.length()) {
-if (random == null) {
-random = new Random();
-}
-expected += (random.nextInt() % 1024);
-}
-while (expected 0) {
-int ch;
-try {
-ch = stream.read();
-} catch (IOException e) {
-LOG.log(Level.WARNING, Karaf shutdown socket:
read: , e);
-ch = -1;
-}
-if (ch 32) { // Control character or EOF terminates
loop
-break;
-}
-command.append((char) ch);
-expected--;
-}
-
-// Close the socket now that we are done with it
-try
svn commit: r1305423 - in /karaf/trunk/main/src/main/java/org/apache/karaf/main: Main.java Stop.java util/BootstrapLogManager.java util/SubstHelper.java
Author: cschneider
Date: Mon Mar 26 16:12:39 2012
New Revision: 1305423
URL: http://svn.apache.org/viewvc?rev=1305423view=rev
Log:
KARAF-713 Extracting variable substitution and FrameworkFactory
Added:
karaf/trunk/main/src/main/java/org/apache/karaf/main/util/SubstHelper.java
Modified:
karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/Stop.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java?rev=1305423r1=1305422r2=1305423view=diff
==
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java Mon Mar 26
16:12:39 2012
@@ -57,6 +57,7 @@ import org.apache.karaf.main.lock.Simple
import org.apache.karaf.main.util.BootstrapLogManager;
import org.apache.karaf.main.util.ServerInfoImpl;
import org.apache.karaf.main.util.StringMap;
+import org.apache.karaf.main.util.SubstHelper;
import org.apache.karaf.main.util.Utils;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
@@ -274,16 +275,9 @@ public class Main {
lockDelay =
Integer.parseInt(configProps.getProperty(PROPERTY_LOCK_DELAY,
Integer.toString(lockDelay)));
configProps.setProperty(Constants.FRAMEWORK_BEGINNING_STARTLEVEL,
Integer.toString(lockStartLevel));
shutdownTimeout =
Integer.parseInt(configProps.getProperty(KARAF_SHUTDOWN_TIMEOUT,
Integer.toString(shutdownTimeout)));
-// Start up the OSGI framework
-String factoryClass = configProps.getProperty(KARAF_FRAMEWORK_FACTORY);
-if (factoryClass == null) {
-InputStream is =
classLoader.getResourceAsStream(META-INF/services/ +
FrameworkFactory.class.getName());
-BufferedReader br = new BufferedReader(new InputStreamReader(is,
UTF-8));
-factoryClass = br.readLine();
-br.close();
-}
-FrameworkFactory factory = (FrameworkFactory)
classLoader.loadClass(factoryClass).newInstance();
+// Start up the OSGI framework
+FrameworkFactory factory = loadFrameworkFactory(classLoader);
framework = factory.newFramework(new StringMap(configProps, false));
framework.init();
// Process properties
@@ -304,6 +298,18 @@ public class Main {
}.start();
}
+private FrameworkFactory loadFrameworkFactory(ClassLoader classLoader)
throws Exception {
+String factoryClass = configProps.getProperty(KARAF_FRAMEWORK_FACTORY);
+if (factoryClass == null) {
+InputStream is =
classLoader.getResourceAsStream(META-INF/services/ +
FrameworkFactory.class.getName());
+BufferedReader br = new BufferedReader(new InputStreamReader(is,
UTF-8));
+factoryClass = br.readLine();
+br.close();
+}
+FrameworkFactory factory = (FrameworkFactory)
classLoader.loadClass(factoryClass).newInstance();
+return factory;
+}
+
private void startKarafActivators(ClassLoader classLoader) throws
IOException {
EnumerationURL urls =
classLoader.getResources(META-INF/MANIFEST.MF);
while (urls != null urls.hasMoreElements()) {
@@ -811,7 +817,7 @@ public class Main {
for (Enumeration e = props.propertyNames(); e.hasMoreElements();) {
String name = (String) e.nextElement();
String value = System.getProperty(name, props.getProperty(name));
-System.setProperty(name, substVars(value, name, null, props));
+System.setProperty(name, SubstHelper.substVars(value, name, null,
props));
}
}
@@ -857,7 +863,7 @@ public class Main {
for (Enumeration e = configProps.propertyNames();
e.hasMoreElements();) {
String name = (String) e.nextElement();
configProps.setProperty(name,
-substVars(configProps.getProperty(name), name, null,
configProps));
+SubstHelper.substVars(configProps.getProperty(name), name,
null, configProps));
}
return configProps;
@@ -1197,121 +1203,6 @@ public class Main {
}
}
-private static final String DELIM_START = ${;
-private static final String DELIM_STOP = };
-
-/**
- * p
- * This method performs property variable substitution on the
- * specified value. If the specified value contains the syntax
- * tt${lt;prop-namegt;}/tt, where ttlt;prop-namegt;/tt
- * refers to either a configuration property or a system property,
- * then the corresponding property value is substituted for the variable
- * placeholder. Multiple variable placeholders may exist in the
- * specified
svn commit: r1305466 - in /karaf/trunk/main/src/main/java/org/apache/karaf/main: Main.java util/SimpleMavenResolver.java util/Utils.java
Author: cschneider
Date: Mon Mar 26 17:35:25 2012
New Revision: 1305466
URL: http://svn.apache.org/viewvc?rev=1305466view=rev
Log:
KARAF-713 Moving maven artifact resolution to a separate class, removing stale
code from Utils
Added:
karaf/trunk/main/src/main/java/org/apache/karaf/main/util/SimpleMavenResolver.java
Modified:
karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/util/Utils.java
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java?rev=1305466r1=1305465r2=1305466view=diff
==
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java Mon Mar 26
17:35:25 2012
@@ -56,6 +56,7 @@ import org.apache.karaf.main.lock.Lock;
import org.apache.karaf.main.lock.SimpleFileLock;
import org.apache.karaf.main.util.BootstrapLogManager;
import org.apache.karaf.main.util.ServerInfoImpl;
+import org.apache.karaf.main.util.SimpleMavenResolver;
import org.apache.karaf.main.util.StringMap;
import org.apache.karaf.main.util.SubstHelper;
import org.apache.karaf.main.util.Utils;
@@ -1084,11 +1085,12 @@ public class Main {
} else if
(STARTUP_PROPERTIES_FILE_NAME.equals(configProps.getProperty(PROPERTY_AUTO_START,
).trim())) {
configProps.remove(PROPERTY_AUTO_START);
+SimpleMavenResolver resolver = new SimpleMavenResolver(bundleDirs);
// We should start the bundles in the startup.properties file.
HashMapInteger, StringBuffer levels = new HashMapInteger,
StringBuffer();
for (Object o : startupProps.keySet()) {
String name = (String) o;
-File file = findFile(bundleDirs, name);
+File file = resolver.resolve(name);
if (file != null) {
Integer level;
@@ -1123,73 +1125,6 @@ public class Main {
}
}
-private static File findFile(ListFile bundleDirs, String name) {
-for (File bundleDir : bundleDirs) {
-File file = findFile(bundleDir, name);
-if (file != null) {
-return file;
-}
-}
-return null;
-}
-
-private static File findFile(File dir, String name) {
-name = fromMaven(name);
-File theFile = new File(dir, name);
-
-if (theFile.exists() !theFile.isDirectory()) {
-return theFile;
-}
-return null;
-}
-
-private static final Pattern mvnPattern = Pattern.compile(mvn:([^/
]+)/([^/ ]+)/([^/ ]*)(/([^/ ]+)(/([^/ ]+))?)?);
-
-/**
- * Returns a path for an srtifact.
- * Input: path (no ':') returns path
- * Input: mvn:groupId/artifactId/version/type/classifier
converts to default repo location path
- * type and classifier are optional.
- *
- *
- * @param name input artifact info
- * @return path as supplied or a default maven repo path
- */
-static String fromMaven(String name) {
-Matcher m = mvnPattern.matcher(name);
-if (!m.matches()) {
-return name;
-}
-StringBuilder b = new StringBuilder();
-b.append(m.group(1));
-for (int i = 0; i b.length(); i++) {
-if (b.charAt(i) == '.') {
-b.setCharAt(i, '/');
-}
-}
-b.append(/);//groupId
-String artifactId = m.group(2);
-String version = m.group(3);
-String extension = m.group(5);
-String classifier = m.group(7);
-b.append(artifactId).append(/);//artifactId
-b.append(version).append(/);//version
-b.append(artifactId).append(-).append(version);
-if (present(classifier)) {
-b.append(-).append(classifier);
-} else {
-if (present(extension)) {
-b.append(.).append(extension);
-} else {
-b.append(.jar);
-}
-}
-return b.toString();
-}
-
-private static boolean present(String part) {
-return part != null !part.isEmpty();
-}
private static void findJars(File dir, ArrayListFile jars) {
for (File file : dir.listFiles()) {
Added:
karaf/trunk/main/src/main/java/org/apache/karaf/main/util/SimpleMavenResolver.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/util/SimpleMavenResolver.java?rev=1305466view=auto
==
---
karaf/trunk/main/src/main/java/org/apache/karaf/main/util/SimpleMavenResolver.java
(added)
+++
karaf/trunk/main/src/main/java/org/apache/karaf/main/util/SimpleMavenResolver.java
Mon Mar 26 17:35:25 2012
@@ -0,0 +1,118
svn commit: r1307435 - in /karaf/trunk/main/src/main/java/org/apache/karaf/main: KarafActivatorManager.java Main.java PropertiesLoader.java Stop.java util/Utils.java
Author: cschneider
Date: Fri Mar 30 14:14:43 2012
New Revision: 1307435
URL: http://svn.apache.org/viewvc?rev=1307435view=rev
Log:
KARAF-713 Factor out property loading and custom Activator handling
Added:
karaf/trunk/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/PropertiesLoader.java
Modified:
karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/Stop.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/util/Utils.java
Added:
karaf/trunk/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java?rev=1307435view=auto
==
---
karaf/trunk/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java
(added)
+++
karaf/trunk/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java
Fri Mar 30 14:14:43 2012
@@ -0,0 +1,70 @@
+package org.apache.karaf.main;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.jar.Manifest;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.karaf.main.util.BootstrapLogManager;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.launch.Framework;
+
+public class KarafActivatorManager {
+public static final String KARAF_ACTIVATOR = Karaf-Activator;
+Logger LOG = Logger.getLogger(this.getClass().getName());
+
+private ListBundleActivator karafActivators = new
ArrayListBundleActivator();
+private final ClassLoader classLoader;
+private final Framework framework;
+
+public KarafActivatorManager(ClassLoader classLoader, Framework framework)
{
+this.classLoader = classLoader;
+this.framework = framework;
+LOG.addHandler(BootstrapLogManager.getDefaultHandler());
+}
+
+void startKarafActivators() throws IOException {
+EnumerationURL urls =
classLoader.getResources(META-INF/MANIFEST.MF);
+while (urls != null urls.hasMoreElements()) {
+URL url = urls.nextElement();
+String className = null;
+InputStream is = url.openStream();
+try {
+Manifest mf = new Manifest(is);
+className = mf.getMainAttributes().getValue(KARAF_ACTIVATOR);
+if (className != null) {
+BundleActivator activator = (BundleActivator)
classLoader.loadClass(className).newInstance();
+activator.start(framework.getBundleContext());
+karafActivators.add(activator);
+}
+} catch (Throwable e) {
+if (className != null) {
+System.err.println(Error starting karaf activator +
className + : + e.getMessage());
+LOG.log(Level.WARNING, Error starting karaf activator +
className + from url + url, e);
+}
+} finally {
+if (is != null) {
+try {
+is.close();
+} catch (IOException e) {
+}
+}
+}
+}
+}
+
+void stopKarafActivators() {
+for (BundleActivator activator : karafActivators) {
+try {
+activator.stop(framework.getBundleContext());
+} catch (Throwable e) {
+LOG.log(Level.WARNING, Error stopping karaf activator +
activator.getClass().getName(), e);
+}
+}
+}
+}
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java?rev=1307435r1=1307434r2=1307435view=diff
==
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java Fri Mar 30
14:14:43 2012
@@ -23,7 +23,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
@@ -38,15 +37,12 @@ import java.net.URLClassLoader;
import java.security.Provider;
import java.security.Security;
import java.util.ArrayList;
-import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
import java.util.TreeMap;
-import java.util.jar.Manifest;
-import java.util.logging.Level;
import
svn commit: r1308290 - /karaf/trunk/bundle/management/src/main/resources/OSGI-INF/blueprint/bundles-management.xml
Author: cschneider Date: Mon Apr 2 10:24:38 2012 New Revision: 1308290 URL: http://svn.apache.org/viewvc?rev=1308290view=rev Log: Added ext namespace Modified: karaf/trunk/bundle/management/src/main/resources/OSGI-INF/blueprint/bundles-management.xml Modified: karaf/trunk/bundle/management/src/main/resources/OSGI-INF/blueprint/bundles-management.xml URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/management/src/main/resources/OSGI-INF/blueprint/bundles-management.xml?rev=1308290r1=1308289r2=1308290view=diff == --- karaf/trunk/bundle/management/src/main/resources/OSGI-INF/blueprint/bundles-management.xml (original) +++ karaf/trunk/bundle/management/src/main/resources/OSGI-INF/blueprint/bundles-management.xml Mon Apr 2 10:24:38 2012 @@ -12,7 +12,10 @@ 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:ext=http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0; + +ext:property-placeholder placeholder-prefix=$( placeholder-suffix=)/ !-- Reference to the MBean Server -- reference id=mbeanServer interface=javax.management.MBeanServer
svn commit: r1308312 - in /karaf/trunk: ./ assemblies/features/standard/src/main/feature/ package/ package/core/src/main/java/org/apache/karaf/packages/core/ package/core/src/main/java/org/apache/kara
Author: cschneider
Date: Mon Apr 2 11:54:26 2012
New Revision: 1308312
URL: http://svn.apache.org/viewvc?rev=1308312view=rev
Log:
KARAF-1302 Showing the new whiteboard concept for jmx on the package mbean
Added:
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackagesMBean.java
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/Packages.java
karaf/trunk/package/core/src/test/java/org/apache/karaf/packages/core/InstallMBeantest.java
Removed:
karaf/trunk/package/management/
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/package/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/trunk/package/pom.xml
karaf/trunk/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=1308312r1=1308311r2=1308312view=diff
==
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
(original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Mon
Apr 2 11:54:26 2012
@@ -94,7 +94,6 @@
feature name=package version=${project.version} resolver=(obr)
description=Package commands and mbeans
bundle
start-level=30mvn:org.apache.karaf.package/org.apache.karaf.package.core/${project.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.package/org.apache.karaf.package.command/${project.version}/bundle
-bundle
start-level=30mvn:org.apache.karaf.package/org.apache.karaf.package.management/${project.version}/bundle
/feature
feature name=http version=${project.version} resolver=(obr)
description=Implementation of the OSGI HTTP Service
@@ -183,6 +182,7 @@
bundle
start-level=30mvn:org.apache.aries.jmx/org.apache.aries.jmx.api/${aries.jmx.version}/bundle
bundle
start-level=30mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/${aries.jmx.version}/bundle
bundle
start-level=30mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/bundle
+bundle
start-level=30mvn:org.apache.aries.jmx/org.apache.aries.jmx.whiteboard/${aries.jmx.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.config/org.apache.karaf.config.management/${project.version}/bundle
/feature
Added:
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackagesMBean.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackagesMBean.java?rev=1308312view=auto
==
---
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackagesMBean.java
(added)
+++
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackagesMBean.java
Mon Apr 2 11:54:26 2012
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.packages.core;
+
+import javax.management.openmbean.TabularData;
+
+/**
+ * Package MBean.
+ */
+public interface PackagesMBean {
+
+TabularData getExports();
+TabularData getImports();
+
+}
Added:
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/Packages.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/Packages.java?rev=1308312view=auto
==
---
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/Packages.java
(added)
+++
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/Packages.java
Mon Apr 2 11:54:26 2012
@@ -0,0 +1,129 @@
+/*
+ * 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
svn commit: r1308788 - in /karaf/trunk/management/mbeans: packages/ pom.xml
Author: cschneider Date: Tue Apr 3 09:43:05 2012 New Revision: 1308788 URL: http://svn.apache.org/viewvc?rev=1308788view=rev Log: KARAF-1262 package commands. Remove old package management module Removed: karaf/trunk/management/mbeans/packages/ Modified: karaf/trunk/management/mbeans/pom.xml Modified: karaf/trunk/management/mbeans/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/pom.xml?rev=1308788r1=1308787r2=1308788view=diff == --- karaf/trunk/management/mbeans/pom.xml (original) +++ karaf/trunk/management/mbeans/pom.xml Tue Apr 3 09:43:05 2012 @@ -35,7 +35,6 @@ modules moduleservices/module -modulepackages/module moduledev/module modulehttp/module modulelog/module
svn commit: r1308973 - in /karaf/trunk: ./ assemblies/features/standard/src/main/feature/ http/ http/command/ http/command/src/main/java/org/apache/karaf/http/ http/command/src/main/java/org/apache/ka
Author: cschneider
Date: Tue Apr 3 15:11:05 2012
New Revision: 1308973
URL: http://svn.apache.org/viewvc?rev=1308973view=rev
Log:
KARAF-1307 Refactor http commands and mbeans
Added:
karaf/trunk/http/ (with props)
karaf/trunk/http/command/
- copied from r1308788, karaf/trunk/shell/http/
karaf/trunk/http/command/src/main/java/org/apache/karaf/http/
karaf/trunk/http/command/src/main/java/org/apache/karaf/http/command/
- copied from r1308788,
karaf/trunk/shell/http/src/main/java/org/apache/karaf/shell/http/
karaf/trunk/http/command/src/main/resources/OSGI-INF/blueprint/blueprint.xml
- copied, changed from r1308788,
karaf/trunk/shell/http/src/main/resources/OSGI-INF/blueprint/shell-http.xml
karaf/trunk/http/core/
- copied from r1308788, karaf/trunk/management/mbeans/http/
karaf/trunk/http/core/src/main/java/org/apache/karaf/http/
karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/
- copied from r1308788,
karaf/trunk/management/mbeans/http/src/main/java/org/apache/karaf/management/mbeans/http/
karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/ServletInfo.java
karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/ServletService.java
karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/Http.java
- copied, changed from r1308788,
karaf/trunk/management/mbeans/http/src/main/java/org/apache/karaf/management/mbeans/http/internal/HttpMBeanImpl.java
karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java
karaf/trunk/http/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
- copied, changed from r1308788,
karaf/trunk/management/mbeans/http/src/main/resources/OSGI-INF/blueprint/http-management.xml
karaf/trunk/http/core/src/test/
karaf/trunk/http/core/src/test/java/
karaf/trunk/http/core/src/test/java/org/
karaf/trunk/http/core/src/test/java/org/apache/
karaf/trunk/http/core/src/test/java/org/apache/karaf/
karaf/trunk/http/core/src/test/java/org/apache/karaf/http/
karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/
karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/
karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/HttpTest.java
karaf/trunk/http/pom.xml
Removed:
karaf/trunk/http/command/src/main/java/org/apache/karaf/http/command/ServletEventHandler.java
karaf/trunk/http/command/src/main/java/org/apache/karaf/shell/
karaf/trunk/http/command/src/main/resources/OSGI-INF/blueprint/shell-http.xml
karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/HttpMBeanImpl.java
karaf/trunk/http/core/src/main/java/org/apache/karaf/management/
karaf/trunk/http/core/src/main/resources/OSGI-INF/blueprint/http-management.xml
karaf/trunk/management/mbeans/http/
karaf/trunk/shell/http/
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/http/command/pom.xml
karaf/trunk/http/command/src/main/java/org/apache/karaf/http/command/ServletListCommand.java
karaf/trunk/http/core/pom.xml
karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/HttpMBean.java
karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/ServletEventHandler.java
karaf/trunk/management/mbeans/pom.xml
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=1308973r1=1308972r2=1308973view=diff
==
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
(original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Tue
Apr 3 15:11:05 2012
@@ -109,8 +109,8 @@
bundle
start-level=30mvn:org.ops4j.pax.web/pax-web-spi/${pax.web.version}/bundle
bundle
start-level=30mvn:org.ops4j.pax.web/pax-web-runtime/${pax.web.version}/bundle
bundle
start-level=30mvn:org.ops4j.pax.web/pax-web-jetty/${pax.web.version}/bundle
-bundle
start-level=30mvn:org.apache.karaf.shell/org.apache.karaf.shell.http/${project.version}/bundle
-bundle
start-level=30mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.http/${project.version}/bundle
+bundle
start-level=30mvn:org.apache.karaf.http/org.apache.karaf.http.core/${project.version}/bundle
+bundle
start-level=30mvn:org.apache.karaf.http/org.apache.karaf.http.command/${project.version}/bundle
/feature
feature name=http-whiteboard description=Provide HTTP Whiteboard
pattern support version=${project.version} resolver=(obr)
Propchange: karaf/trunk/http
svn commit: r1308974 - in /karaf/trunk/http/core/src: main/java/org/apache/karaf/http/core/ServletInfo.java main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java test/java/org/apache/k
Author: cschneider Date: Tue Apr 3 15:12:44 2012 New Revision: 1308974 URL: http://svn.apache.org/viewvc?rev=1308974view=rev Log: KARAF-1307 Refactor http commands and mbeans Modified: karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/ServletInfo.java karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/HttpTest.java Modified: karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/ServletInfo.java URL: http://svn.apache.org/viewvc/karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/ServletInfo.java?rev=1308974r1=1308973r2=1308974view=diff == --- karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/ServletInfo.java (original) +++ karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/ServletInfo.java Tue Apr 3 15:12:44 2012 @@ -1,3 +1,19 @@ +/* + * 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. + */ package org.apache.karaf.http.core; import org.ops4j.pax.web.service.spi.WebEvent; Modified: karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java URL: http://svn.apache.org/viewvc/karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java?rev=1308974r1=1308973r2=1308974view=diff == --- karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java (original) +++ karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/ServletServiceImpl.java Tue Apr 3 15:12:44 2012 @@ -1,3 +1,19 @@ +/* + * 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. + */ package org.apache.karaf.http.core.internal; import java.util.ArrayList; Modified: karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/HttpTest.java URL: http://svn.apache.org/viewvc/karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/HttpTest.java?rev=1308974r1=1308973r2=1308974view=diff == --- karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/HttpTest.java (original) +++ karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/HttpTest.java Tue Apr 3 15:12:44 2012 @@ -1,3 +1,19 @@ +/* + * 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. + */ package org.apache.karaf.http.core.internal; import java.lang.management.ManagementFactory;
svn commit: r1308983 - in /karaf/trunk: ./ assemblies/features/standard/src/main/feature/ bundle/core/src/main/java/org/apache/karaf/bundle/core/ bundle/core/src/main/java/org/apache/karaf/bundle/core
Author: cschneider
Date: Tue Apr 3 15:34:50 2012
New Revision: 1308983
URL: http://svn.apache.org/viewvc?rev=1308983view=rev
Log:
KARAF-1302 Use JMX Whiteboard for bundle mbean
Added:
karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/BundlesMBean.java
- copied, changed from r1308973,
karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/BundlesMBean.java
karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/Bundles.java
- copied, changed from r1308973,
karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesMBeanImpl.java
karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
- copied, changed from r1308973,
karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml
Removed:
karaf/trunk/bundle/core/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml
karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/BundlesMBean.java
karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesMBeanImpl.java
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/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=1308983r1=1308982r2=1308983view=diff
==
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
(original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Tue
Apr 3 15:34:50 2012
@@ -177,7 +177,6 @@
feature name=management description=Provide a JMX MBeanServer and a
set of MBeans in Karaf version=${project.version}
bundle
start-level=30mvn:org.apache.karaf.management/org.apache.karaf.management.server/${project.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.system/org.apache.karaf.system.management/${project.version}/bundle
-bundle
start-level=30mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.management/${project.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.services/${project.version}/bundle
bundle
start-level=30mvn:org.apache.aries.jmx/org.apache.aries.jmx.api/${aries.jmx.version}/bundle
bundle
start-level=30mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/${aries.jmx.version}/bundle
Copied:
karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/BundlesMBean.java
(from r1308973,
karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/BundlesMBean.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/BundlesMBean.java?p2=karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/BundlesMBean.javap1=karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/BundlesMBean.javar1=1308973r2=1308983rev=1308983view=diff
==
---
karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/BundlesMBean.java
(original)
+++
karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/BundlesMBean.java
Tue Apr 3 15:34:50 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.bundle.management;
+package org.apache.karaf.bundle.core;
import javax.management.openmbean.TabularData;
Copied:
karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/Bundles.java
(from r1308973,
karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesMBeanImpl.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/Bundles.java?p2=karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/Bundles.javap1=karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesMBeanImpl.javar1=1308973r2=1308983rev=1308983view=diff
==
---
karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesMBeanImpl.java
(original)
+++
karaf/trunk/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/Bundles.java
Tue Apr 3 15:34:50 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.bundle.management.internal;
+package org.apache.karaf.bundle.core.internal;
import java.io.InputStream;
import java.net.URL;
@@ -34,7 +34,7
svn commit: r1309140 - in /karaf/trunk: ./ assemblies/features/framework/ assemblies/features/standard/src/main/feature/ management/mbeans/ management/mbeans/services/ service/ service/command/ servic
Author: cschneider Date: Tue Apr 3 20:46:57 2012 New Revision: 1309140 URL: http://svn.apache.org/viewvc?rev=1309140view=rev Log: KARAF-963 Services modules refactored Added: karaf/trunk/service/ (with props) karaf/trunk/service/command/ - copied from r1308983, karaf/trunk/shell/services/ karaf/trunk/service/command/src/main/java/org/apache/karaf/service/ - copied from r1308983, karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ListServices.java - copied, changed from r1308983, karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ListServices.java karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ObjectClassCompleter.java - copied, changed from r1308983, karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ObjectClassCompleter.java karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ObjectClassMatcher.java - copied, changed from r1308983, karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ObjectClassMatcher.java karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/Wait.java - copied, changed from r1308983, karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/Wait.java karaf/trunk/service/command/src/test/java/org/apache/karaf/service/ karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ - copied from r1308983, karaf/trunk/shell/services/src/test/java/org/apache/karaf/shell/services/ karaf/trunk/service/core/ - copied from r1308983, karaf/trunk/management/mbeans/services/ karaf/trunk/service/core/src/main/java/org/apache/karaf/service/ - copied from r1308983, karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/ karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/ karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/ServicesMBean.java - copied, changed from r1308983, karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/ServicesMBean.java karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/internal/ - copied from r1308983, karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/ karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/internal/Services.java - copied, changed from r1308983, karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/ServicesMBeanImpl.java karaf/trunk/service/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml - copied, changed from r1308983, karaf/trunk/management/mbeans/services/src/main/resources/OSGI-INF/blueprint/services-management.xml karaf/trunk/service/pom.xml Removed: karaf/trunk/management/mbeans/services/ karaf/trunk/service/command/src/main/java/org/apache/karaf/service/ListServices.java karaf/trunk/service/command/src/main/java/org/apache/karaf/service/ObjectClassCompleter.java karaf/trunk/service/command/src/main/java/org/apache/karaf/service/ObjectClassMatcher.java karaf/trunk/service/command/src/main/java/org/apache/karaf/service/Wait.java karaf/trunk/service/command/src/main/java/org/apache/karaf/shell/ karaf/trunk/service/command/src/test/java/org/apache/karaf/shell/ karaf/trunk/service/core/src/main/java/org/apache/karaf/management/ karaf/trunk/service/core/src/main/java/org/apache/karaf/service/ServicesMBean.java karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/internal/ServicesMBeanImpl.java karaf/trunk/service/core/src/main/java/org/apache/karaf/service/internal/ karaf/trunk/service/core/src/main/resources/OSGI-INF/blueprint/services-management.xml karaf/trunk/shell/services/ Modified: karaf/trunk/assemblies/features/framework/pom.xml karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml karaf/trunk/management/mbeans/pom.xml karaf/trunk/pom.xml karaf/trunk/service/command/pom.xml karaf/trunk/service/command/src/main/resources/OSGI-INF/blueprint/shell-services.xml karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ListServiceNamesTest.java karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ListServicesTest.java karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ObjectClassMatcherTest.java karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/TestBundleFactory.java karaf/trunk/service/core/pom.xml karaf/trunk/shell/pom.xml Modified: karaf/trunk/assemblies
svn commit: r1309363 [2/2] - in /karaf/trunk: ./ assemblies/features/standard/src/main/feature/ log/ log/command/ log/command/src/main/java/org/apache/karaf/log/ log/command/src/main/java/org/apache/k
Copied:
karaf/trunk/log/core/src/test/java/org/apache/karaf/log/core/internal/SetLogLevelTest.java
(from r1309258,
karaf/trunk/shell/log/src/test/java/org/apache/karaf/shell/log/SetLogLevelTest.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/log/core/src/test/java/org/apache/karaf/log/core/internal/SetLogLevelTest.java?p2=karaf/trunk/log/core/src/test/java/org/apache/karaf/log/core/internal/SetLogLevelTest.javap1=karaf/trunk/shell/log/src/test/java/org/apache/karaf/shell/log/SetLogLevelTest.javar1=1309258r2=1309363rev=1309363view=diff
==
---
karaf/trunk/shell/log/src/test/java/org/apache/karaf/shell/log/SetLogLevelTest.java
(original)
+++
karaf/trunk/log/core/src/test/java/org/apache/karaf/log/core/internal/SetLogLevelTest.java
Wed Apr 4 13:06:29 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.log;
+package org.apache.karaf.log.core.internal;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -23,8 +23,13 @@ import java.util.Hashtable;
import junit.framework.TestCase;
+import org.apache.karaf.log.core.Level;
+import org.apache.karaf.log.core.LogMBean;
+import org.apache.karaf.log.core.LogService;
import org.easymock.EasyMock;
+import org.junit.experimental.categories.Categories.ExcludeCategory;
import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
/**
* Test cases for {@link SetLogLevel}
@@ -34,106 +39,90 @@ public class SetLogLevelTest extends Tes
private static final String ROOT_LOGGER = log4j.rootLogger;
private static final String PACKAGE_LOGGER =
log4j.logger.org.apache.karaf.test;
-private static final PrintStream ORIGINAL_STDERR = System.err;
-private SetLogLevel command;
+private LogService logService;
+private LogMBean logMBean;
+@SuppressWarnings(rawtypes)
private Hashtable properties;
-private ByteArrayOutputStream stderr;
@Override
protected void setUp() throws Exception {
super.setUp();
-properties = new Hashtable();
-stderr = new ByteArrayOutputStream();
-System.setErr(new PrintStream(stderr));
+properties = new HashtableString, String();
final Configuration configuration =
EasyMock.createMock(Configuration.class);
EasyMock.expect(configuration.getProperties()).andReturn(properties);
-configuration.update(properties);
+configuration.update(properties);
+ConfigurationAdmin configAdmin =
EasyMock.createMock(ConfigurationAdmin.class);
+
EasyMock.expect(configAdmin.getConfiguration(LogServiceImpl.CONFIGURATION_PID,
null)).andReturn(configuration);
+logService = new LogServiceImpl(configAdmin, new LruList(100));
+logMBean = new Log(logService);
+EasyMock.replay(configAdmin);
EasyMock.replay(configuration);
-
-command = new SetLogLevel() {
-@Override
-protected Configuration getConfiguration() throws IOException {
-return configuration;
-}
-};
}
@Override
protected void tearDown() throws Exception {
super.tearDown();
-System.setErr(ORIGINAL_STDERR);
}
public void testInvalidLogLevel() throws Exception {
-runCommand(log:set INVALID);
-assertTrue(Expected an error message on System.err,
- stderr.toString().contains(level must be set to));
+try {
+logMBean.setLevel(INVALID);
+fail(Exception expected);
+} catch(IllegalArgumentException e) {
+// Expected
+}
}
public void testSetLogLevel() throws Exception {
-runCommand(log:set INFO org.apache.karaf.test);
-
+logMBean.setLevel(org.apache.karaf.test, INFO);
assertEquals(INFO, properties.get(PACKAGE_LOGGER));
}
public void testSetRootLogLevel() throws Exception {
-runCommand(log:set INFO);
-
+logMBean.setLevel(INFO);
assertEquals(INFO, properties.get(ROOT_LOGGER));
}
public void testSetLogLevelLowerCase() throws Exception {
-runCommand(log:set info org.apache.karaf.test);
-
+logMBean.setLevel(org.apache.karaf.test, info);
assertEquals(INFO, properties.get(PACKAGE_LOGGER));
}
public void testSetRootLogLevelLowerCase() throws Exception {
-runCommand(log:set info);
-
+logMBean.setLevel(info);
assertEquals(INFO, properties.get(ROOT_LOGGER));
}
public void testChangeLogLevel() throws Exception {
properties.put(PACKAGE_LOGGER, DEBUG);
-
-runCommand(log:set INFO org.apache.karaf.test);
-
+
svn commit: r1309755 - /karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
Author: cschneider
Date: Thu Apr 5 11:15:39 2012
New Revision: 1309755
URL: http://svn.apache.org/viewvc?rev=1309755view=rev
Log:
KARAF-1318 Setting bundle startlevel to 80
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties?rev=1309755r1=1309754r2=1309755view=diff
==
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
Thu Apr 5 11:15:39 2012
@@ -83,7 +83,7 @@ org.osgi.framework.bundle.parent=framewo
karaf.auto.start=startup.properties
org.osgi.framework.startlevel.beginning=100
-karaf.startlevel.bundle=60
+karaf.startlevel.bundle=80
karaf.shutdown.port.file=${karaf.data}/port
svn commit: r1311838 - in /karaf/trunk/bundle: management/ pom.xml
Author: cschneider Date: Tue Apr 10 16:26:50 2012 New Revision: 1311838 URL: http://svn.apache.org/viewvc?rev=1311838view=rev Log: KARAF-963 Removing bundle management module as it is not needed anymore Removed: karaf/trunk/bundle/management/ Modified: karaf/trunk/bundle/pom.xml Modified: karaf/trunk/bundle/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/pom.xml?rev=1311838r1=1311837r2=1311838view=diff == --- karaf/trunk/bundle/pom.xml (original) +++ karaf/trunk/bundle/pom.xml Tue Apr 10 16:26:50 2012 @@ -36,7 +36,6 @@ modules modulecore/module modulecommand/module -modulemanagement/module modulespringstate/module /modules
svn commit: r1311858 - in /karaf/trunk: ./ assemblies/features/standard/src/main/feature/ config/ config/core/src/main/java/org/apache/karaf/config/core/ config/core/src/main/java/org/apache/karaf/con
Author: cschneider
Date: Tue Apr 10 16:47:34 2012
New Revision: 1311858
URL: http://svn.apache.org/viewvc?rev=1311858view=rev
Log:
KARAF-1302 Use aries jmx with config module
Added:
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/ConfigMBean.java
- copied, changed from r1311828,
karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/ConfigMBean.java
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/impl/Config.java
- copied, changed from r1311828,
karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/internal/ConfigMBeanImpl.java
Removed:
karaf/trunk/config/management/
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/config/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/trunk/config/pom.xml
karaf/trunk/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=1311858r1=1311857r2=1311858view=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:47:34 2012
@@ -183,7 +183,6 @@
bundle
start-level=30mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/${aries.jmx.version}/bundle
bundle
start-level=30mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/bundle
bundle
start-level=30mvn:org.apache.aries.jmx/org.apache.aries.jmx.whiteboard/${aries.jmx.version}/bundle
-bundle
start-level=30mvn:org.apache.karaf.config/org.apache.karaf.config.management/${project.version}/bundle
/feature
feature name=scheduler description=Provide a scheduler service in
Karaf to fire events version=${project.version} resolver=(obr)
Copied:
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/ConfigMBean.java
(from r1311828,
karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/ConfigMBean.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/ConfigMBean.java?p2=karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/ConfigMBean.javap1=karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/ConfigMBean.javar1=1311828r2=1311858rev=1311858view=diff
==
---
karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/ConfigMBean.java
(original)
+++
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/ConfigMBean.java
Tue Apr 10 16:47:34 2012
@@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.config.management;
+package org.apache.karaf.config.core;
import java.io.IOException;
import java.util.List;
Copied:
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/impl/Config.java
(from r1311828,
karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/internal/ConfigMBeanImpl.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/impl/Config.java?p2=karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/impl/Config.javap1=karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/internal/ConfigMBeanImpl.javar1=1311828r2=1311858rev=1311858view=diff
==
---
karaf/trunk/config/management/src/main/java/org/apache/karaf/config/management/internal/ConfigMBeanImpl.java
(original)
+++
karaf/trunk/config/core/src/main/java/org/apache/karaf/config/core/impl/Config.java
Tue Apr 10 16:47:34 2012
@@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.config.management.internal;
+package org.apache.karaf.config.core.impl;
import java.io.IOException;
import java.util.ArrayList;
@@ -25,18 +25,18 @@ import java.util.Map;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
+import org.apache.karaf.config.core.ConfigMBean;
import org.apache.karaf.config.core.ConfigRepository;
-import org.apache.karaf.config.management.ConfigMBean;
import org.osgi.service.cm.Configuration;
/**
* Implementation of the ConfigMBean.
*/
-public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean {
+public class Config extends StandardMBean implements ConfigMBean {
private ConfigRepository configRepo;
-public ConfigMBeanImpl() throws NotCompliantMBeanException
svn commit: r1311978 - in /karaf/trunk: ./ assemblies/features/standard/src/main/feature/ diagnostic/ diagnostic/common/ diagnostic/core/ diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core
Author: cschneider
Date: Tue Apr 10 20:42:52 2012
New Revision: 1311978
URL: http://svn.apache.org/viewvc?rev=1311978view=rev
Log:
KARAF-1302 Use aries jmx for diagnostic module
Added:
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/DiagnosticDumpMBean.java
- copied, changed from r1311828,
karaf/trunk/diagnostic/management/src/main/java/org/apache/karaf/diagnostic/management/DiagnosticDumpMBean.java
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/BundleDumpProvider.java
- copied, changed from r1311828,
karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/BundleDumpProvider.java
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/DiagnosticDump.java
- copied, changed from r1311828,
karaf/trunk/diagnostic/management/src/main/java/org/apache/karaf/diagnostic/management/internal/DiagnosticDumpMBeanImpl.java
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/FeaturesDumpProvider.java
- copied, changed from r1311828,
karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/FeaturesDumpProvider.java
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/LogDumpProvider.java
- copied, changed from r1311828,
karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java
karaf/trunk/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/ThreadDumpProvider.java
- copied, changed from r1311828,
karaf/trunk/diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/ThreadDumpProvider.java
karaf/trunk/diagnostic/core/src/main/resources/OSGI-INF/blueprint/
- copied from r1311828,
karaf/trunk/diagnostic/management/src/main/resources/OSGI-INF/blueprint/
karaf/trunk/diagnostic/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
- copied, changed from r1311828,
karaf/trunk/diagnostic/management/src/main/resources/OSGI-INF/blueprint/diagnostic-management.xml
Removed:
karaf/trunk/diagnostic/common/
karaf/trunk/diagnostic/core/src/main/resources/OSGI-INF/blueprint/diagnostic-management.xml
karaf/trunk/diagnostic/management/
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/diagnostic/core/pom.xml
karaf/trunk/diagnostic/pom.xml
karaf/trunk/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=1311978r1=1311977r2=1311978view=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 20:42:52 2012
@@ -30,9 +30,7 @@
bundle
start-level=30mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.config/${project.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.command/${project.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.core/${project.version}/bundle
-bundle
start-level=30mvn:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.common/${project.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.command/${project.version}/bundle
-bundle
start-level=30mvn:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.management/${project.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.log/org.apache.karaf.log.core/${project.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.log/org.apache.karaf.log.command/${project.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.service/org.apache.karaf.service.core/${project.version}/bundle
Modified: karaf/trunk/diagnostic/core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/diagnostic/core/pom.xml?rev=1311978r1=1311977r2=1311978view=diff
==
--- karaf/trunk/diagnostic/core/pom.xml (original)
+++ karaf/trunk/diagnostic/core/pom.xml Tue Apr 10 20:42:52 2012
@@ -37,6 +37,25 @@
appendedResourcesDirectory${basedir}/../../etc/appended-resources/appendedResourcesDirectory
/properties
+dependencies
+dependency
+groupIdorg.apache.karaf/groupId
+artifactIdorg.apache.karaf.main/artifactId
+scopeprovided/scope
+/dependency
+
+dependency
+groupIdorg.osgi/groupId
+artifactIdorg.osgi.compendium/artifactId
+scopeprovided/scope
svn commit: r1312013 - /karaf/trunk/dev/core/pom.xml
Author: cschneider Date: Tue Apr 10 21:51:58 2012 New Revision: 1312013 URL: http://svn.apache.org/viewvc?rev=1312013view=rev Log: Remove commented out imports Modified: karaf/trunk/dev/core/pom.xml Modified: karaf/trunk/dev/core/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/dev/core/pom.xml?rev=1312013r1=1312012r2=1312013view=diff == --- karaf/trunk/dev/core/pom.xml (original) +++ karaf/trunk/dev/core/pom.xml Tue Apr 10 21:51:58 2012 @@ -86,20 +86,6 @@ Export-Package org.apache.karaf.dev.core /Export-Package -!-- Import-Package -- -!-- !junit.framework, -- -!-- !org.cyberneko.html, -- -!-- !org.cyberneko.html.filters, -- -!-- !com.sun.jdmk.comm, -- -!-- !javax.management, -- -!-- !javax.crypto, -- -!-- !javax.crypto.spec, -- -!-- !org.apache.avalon.framework.logger, -- -!-- !org.apache.log, -- -!-- !org.apache.xerces.xni, -- -!-- !org.apache.xerces.xni.parser, -- -!-- !org.objectweb.asm* -- -!-- /Import-Package -- Private-Package org.apache.karaf.dev.core.internal, org.apache.felix.utils.properties
svn commit: r1312014 - in /karaf/trunk: ./ assemblies/features/standard/src/main/feature/ features/ features/core/ features/core/src/main/java/org/apache/karaf/features/management/ features/core/src/m
Author: cschneider
Date: Tue Apr 10 21:52:38 2012
New Revision: 1312014
URL: http://svn.apache.org/viewvc?rev=1312014view=rev
Log:
KARAF-1302 Use aries jmx for features module
Added:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/FeaturesServiceMBean.java
- copied unchanged from r1311978,
karaf/trunk/features/management/src/main/java/org/apache/karaf/features/management/FeaturesServiceMBean.java
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/codec/
- copied from r1311978,
karaf/trunk/features/management/src/main/java/org/apache/karaf/features/management/codec/
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/
- copied from r1311978,
karaf/trunk/features/management/src/main/java/org/apache/karaf/features/management/internal/
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/FeaturesService.java
- copied, changed from r1311978,
karaf/trunk/features/management/src/main/java/org/apache/karaf/features/management/internal/FeaturesServiceMBeanImpl.java
karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
- copied, changed from r1311978,
karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
Removed:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/FeaturesServiceMBeanImpl.java
karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
karaf/trunk/features/management/
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/features/core/pom.xml
karaf/trunk/features/pom.xml
karaf/trunk/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=1312014r1=1312013r2=1312014view=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 21:52:38 2012
@@ -22,7 +22,6 @@
bundle
start-level=30mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/${project.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.features/org.apache.karaf.features.core/${project.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.features/org.apache.karaf.features.command/${project.version}/bundle
-bundle
start-level=30mvn:org.apache.karaf.features/org.apache.karaf.features.management/${project.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.instance/org.apache.karaf.instance.core/${project.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.instance/org.apache.karaf.instance.command/${project.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.instance/org.apache.karaf.instance.management/${project.version}/bundle
Modified: karaf/trunk/features/core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/pom.xml?rev=1312014r1=1312013r2=1312014view=diff
==
--- karaf/trunk/features/core/pom.xml (original)
+++ karaf/trunk/features/core/pom.xml Tue Apr 10 21:52:38 2012
@@ -52,6 +52,7 @@
groupIdorg.osgi/groupId
artifactIdorg.osgi.compendium/artifactId
scopeprovided/scope
+optionaltrue/optional
/dependency
dependency
@@ -65,13 +66,6 @@
scopeprovided/scope
/dependency
-!-- I think this is here only to get better attributes on the felix
gogo/shell imports which appear to be unnecessary anyway ??? --
-dependency
-groupIdorg.apache.karaf.shell/groupId
-artifactIdorg.apache.karaf.shell.console/artifactId
-scopeprovided/scope
-/dependency
-
dependency
groupIdorg.apache.servicemix.bundles/groupId
artifactIdorg.apache.servicemix.bundles.junit/artifactId
@@ -82,7 +76,6 @@
artifactIdeasymock/artifactId
scopetest/scope
/dependency
-!-- uncomment for more complete test log output --
dependency
groupIdorg.slf4j/groupId
artifactIdslf4j-jdk14/artifactId
@@ -112,18 +105,15 @@
artifactIdmaven-bundle-plugin/artifactId
configuration
instructions
-
Export-Packageorg.apache.karaf.features;version=${project.version}/Export-Package
-Import-Package
-!org.apache.karaf.features
svn commit: r1312015 - in /karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm: ProcessBuilder.java ProcessBuilderFactory.java impl/ProcessImpl.java
Author: cschneider
Date: Tue Apr 10 21:57:33 2012
New Revision: 1312015
URL: http://svn.apache.org/viewvc?rev=1312015view=rev
Log:
Handle warnings
Modified:
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java
Modified:
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java?rev=1312015r1=1312014r2=1312015view=diff
==
---
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java
(original)
+++
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java
Tue Apr 10 21:57:33 2012
@@ -18,7 +18,6 @@ package org.apache.karaf.jpm;
import java.io.File;
import java.io.IOException;
-import java.lang.*;
/**
* Interface used to create new processes.
Modified:
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java?rev=1312015r1=1312014r2=1312015view=diff
==
---
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java
(original)
+++
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java
Tue Apr 10 21:57:33 2012
@@ -16,8 +16,6 @@
*/
package org.apache.karaf.jpm;
-import java.lang.*;
-
import org.apache.karaf.jpm.impl.ProcessBuilderFactoryImpl;
/**
Modified:
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java?rev=1312015r1=1312014r2=1312015view=diff
==
---
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java
(original)
+++
karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java
Tue Apr 10 21:57:33 2012
@@ -30,6 +30,11 @@ import org.apache.karaf.jpm.Process;
public class ProcessImpl implements Process {
+/**
+ *
+ */
+private static final long serialVersionUID = -8140632422386086507L;
+
private int pid;
//private File input;
//private File output;
@@ -59,7 +64,7 @@ public class ProcessImpl implements Proc
r.readLine(); // skip headers
String s = r.readLine();
boolean running = s != null s.length() 0;
-int ret = process.waitFor();
+process.waitFor();
return running;
} catch (InterruptedException e) {
throw new InterruptedIOException();
svn commit: r1312016 - in /karaf/trunk/instance/core/src/test/java/org/apache/karaf: instance/internal/InstanceServiceImplTest.java jpm/ProcessTest.java
Author: cschneider Date: Tue Apr 10 21:58:38 2012 New Revision: 1312016 URL: http://svn.apache.org/viewvc?rev=1312016view=rev Log: Handle warnings Modified: karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/internal/InstanceServiceImplTest.java karaf/trunk/instance/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java Modified: karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/internal/InstanceServiceImplTest.java URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/internal/InstanceServiceImplTest.java?rev=1312016r1=1312015r2=1312016view=diff == --- karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/internal/InstanceServiceImplTest.java (original) +++ karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/internal/InstanceServiceImplTest.java Tue Apr 10 21:58:38 2012 @@ -102,7 +102,7 @@ public class InstanceServiceImplTest ext System.setProperty(karaf.base, new File(target/test-classes/).getAbsolutePath()); InstanceSettings settings = new InstanceSettings(8122, 1122, 4, getName(), null, null, null); -Instance instance = service.createInstance(getName(), settings, true); +service.createInstance(getName(), settings, true); service.renameInstance(getName(), getName() + b, true); assertNotNull(service.getInstance(getName() + b)); Modified: karaf/trunk/instance/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java?rev=1312016r1=1312015r2=1312016view=diff == --- karaf/trunk/instance/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java (original) +++ karaf/trunk/instance/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java Tue Apr 10 21:58:38 2012 @@ -45,12 +45,12 @@ public class ProcessTest extends TestCas assertNotNull(p); System.err.println(Process: + p.getPid()); assertNotNull(p.getPid()); -Thread.currentThread().sleep(1000); +Thread.sleep(1000); System.err.println(Running: + p.isRunning()); assertTrue(p.isRunning()); System.err.println(Destroying); p.destroy(); -Thread.currentThread().sleep(1000); +Thread.sleep(1000); System.err.println(Running: + p.isRunning()); assertFalse(p.isRunning()); }
svn commit: r1324622 - in /karaf/trunk/webconsole/instance/src: main/java/org/apache/karaf/webconsole/instance/ main/resources/OSGI-INF/blueprint/ test/java/org/apache/karaf/webconsole/instance/
Author: cschneider Date: Wed Apr 11 08:14:52 2012 New Revision: 1324622 URL: http://svn.apache.org/viewvc?rev=1324622view=rev Log: KARAF-1302 Use aries jmx for instance module, refactor package names to instance.core for core packages Modified: karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java Modified: karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java?rev=1324622r1=1324621r2=1324622view=diff == --- karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java (original) +++ karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java Wed Apr 11 08:14:52 2012 @@ -29,10 +29,10 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.karaf.instance.InstanceService; -import org.apache.karaf.instance.Instance; -import org.apache.karaf.instance.InstanceSettings; import org.apache.felix.webconsole.AbstractWebConsolePlugin; +import org.apache.karaf.instance.core.Instance; +import org.apache.karaf.instance.core.InstanceService; +import org.apache.karaf.instance.core.InstanceSettings; import org.json.JSONException; import org.json.JSONWriter; import org.osgi.framework.BundleContext; Modified: karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml?rev=1324622r1=1324621r2=1324622view=diff == --- karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml (original) +++ karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml Wed Apr 11 08:14:52 2012 @@ -19,7 +19,7 @@ -- blueprint xmlns=http://www.osgi.org/xmlns/blueprint/v1.0.0; default-activation=lazy -reference id=instanceService interface=org.apache.karaf.instance.InstanceService / +reference id=instanceService interface=org.apache.karaf.instance.core.InstanceService / bean id=instancePlugin class=org.apache.karaf.webconsole.instance.InstancePlugin init-method=start destroy-method=stop property name=instanceService ref=instanceService / Modified: karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java?rev=1324622r1=1324621r2=1324622view=diff == --- karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java (original) +++ karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java Wed Apr 11 08:14:52 2012 @@ -30,9 +30,9 @@ import javax.servlet.http.HttpServletRes import junit.framework.TestCase; -import org.apache.karaf.instance.InstanceService; -import org.apache.karaf.instance.Instance; -import org.apache.karaf.instance.InstanceSettings; +import org.apache.karaf.instance.core.Instance; +import org.apache.karaf.instance.core.InstanceService; +import org.apache.karaf.instance.core.InstanceSettings; import org.easymock.EasyMock; import org.easymock.IAnswer;
svn commit: r1324677 - in /karaf/trunk: assemblies/features/standard/src/main/feature/ kar/ kar/command/ kar/core/ kar/core/src/main/java/org/apache/karaf/kar/ kar/core/src/main/java/org/apache/karaf/
Author: cschneider
Date: Wed Apr 11 09:50:54 2012
New Revision: 1324677
URL: http://svn.apache.org/viewvc?rev=1324677view=rev
Log:
KARAF-1302 Use aries jmx for kar module
Added:
karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/KarsMBean.java
- copied, changed from r1324616,
karaf/trunk/kar/management/src/main/java/org/apache/karaf/kar/management/KarServiceMBean.java
karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/Kars.java
- copied, changed from r1324616,
karaf/trunk/kar/management/src/main/java/org/apache/karaf/kar/management/internal/KarServiceMBeanImpl.java
Removed:
karaf/trunk/kar/management/
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/kar/command/pom.xml
karaf/trunk/kar/core/pom.xml
karaf/trunk/kar/core/src/main/resources/OSGI-INF/blueprint/kar-core.xml
karaf/trunk/kar/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=1324677r1=1324676r2=1324677view=diff
==
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
(original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Wed
Apr 11 09:50:54 2012
@@ -137,7 +137,6 @@
feature name=kar description=Provide KAR (KARaf archive) support
version=${project.version} resolver=(obr)
bundle
start-level=30mvn:org.apache.karaf.kar/org.apache.karaf.kar.core/${project.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.kar/org.apache.karaf.kar.command/${project.version}/bundle
-bundle
start-level=30mvn:org.apache.karaf.kar/org.apache.karaf.kar.management/${project.version}/bundle
bundle
start-level=30mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.kar/${project.version}/bundle
/feature
Modified: karaf/trunk/kar/command/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/kar/command/pom.xml?rev=1324677r1=1324676r2=1324677view=diff
==
--- karaf/trunk/kar/command/pom.xml (original)
+++ karaf/trunk/kar/command/pom.xml Wed Apr 11 09:50:54 2012
@@ -46,6 +46,10 @@
groupIdorg.apache.karaf.shell/groupId
artifactIdorg.apache.karaf.shell.console/artifactId
/dependency
+dependency
+groupIdorg.apache.karaf/groupId
+artifactIdorg.apache.karaf.main/artifactId
+/dependency
/dependencies
build
@@ -70,13 +74,7 @@
artifactIdmaven-bundle-plugin/artifactId
configuration
instructions
-Import-Package
-org.apache.karaf.kar;version=${project.version},
-
org.apache.karaf.shell.commands;version=${project.version},
-
org.apache.karaf.shell.console*;version=${project.version},
-org.osgi.service.blueprint
-/Import-Package
-Private-Package!*/Private-Package
+Export-Package!*/Export-Package
/instructions
/configuration
/plugin
Modified: karaf/trunk/kar/core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/kar/core/pom.xml?rev=1324677r1=1324676r2=1324677view=diff
==
--- karaf/trunk/kar/core/pom.xml (original)
+++ karaf/trunk/kar/core/pom.xml Wed Apr 11 09:50:54 2012
@@ -73,17 +73,8 @@
configuration
instructions
Export-Package
-org.apache.karaf.kar;version=${project.version}
+org.apache.karaf.kar
/Export-Package
-Import-Package
-!org.apache.karaf.kar,
-javax.xml.parsers,
-
org.apache.karaf.features;version=${project.version},
-org.slf4j;resolution:=optional,
-org.w3c.dom,
-org.xml.sax,
-org.osgi.service.blueprint
-/Import-Package
Private-Package
org.apache.karaf.kar.internal
/Private-Package
Copied: karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/KarsMBean.java
(from r1324616,
karaf/trunk/kar/management/src/main/java/org/apache/karaf/kar/management/KarServiceMBean.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/KarsMBean.java?p2=karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar
svn commit: r1324686 - in /karaf/trunk/scr/management: ./ src/main/java/org/apache/karaf/scr/management/ src/main/java/org/apache/karaf/scr/management/internal/ src/main/resources/OSGI-INF/blueprint/
Author: cschneider
Date: Wed Apr 11 10:24:33 2012
New Revision: 1324686
URL: http://svn.apache.org/viewvc?rev=1324686view=rev
Log:
KARAF-1302 Use aries jmx for scr module
Added:
karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/ScrsMBean.java
- copied, changed from r1324616,
karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/ScrServiceMBean.java
karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/internal/Scrs.java
- copied, changed from r1324616,
karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java
karaf/trunk/scr/management/src/main/resources/OSGI-INF/blueprint/
karaf/trunk/scr/management/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Removed:
karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/ScrServiceMBean.java
karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java
Modified:
karaf/trunk/scr/management/pom.xml
Modified: karaf/trunk/scr/management/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/scr/management/pom.xml?rev=1324686r1=1324685r2=1324686view=diff
==
--- karaf/trunk/scr/management/pom.xml (original)
+++ karaf/trunk/scr/management/pom.xml Wed Apr 11 10:24:33 2012
@@ -90,12 +90,6 @@
Export-Package
org.apache.karaf.scr.management
/Export-Package
-Import-Package
-!org.apache.karaf.scr.management,
-javax.management,
-javax.management.loading,
-*
-/Import-Package
Private-Package
org.apache.karaf.scr.management.internal
/Private-Package
Copied:
karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/ScrsMBean.java
(from r1324616,
karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/ScrServiceMBean.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/ScrsMBean.java?p2=karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/ScrsMBean.javap1=karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/ScrServiceMBean.javar1=1324616r2=1324686rev=1324686view=diff
==
---
karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/ScrServiceMBean.java
(original)
+++
karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/ScrsMBean.java
Wed Apr 11 10:24:33 2012
@@ -1,29 +1,29 @@
-/*
- * 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.
- */
-package org.apache.karaf.scr.management;
-
-public interface ScrServiceMBean {
-
-String[] listComponents() throws Exception;
-
-boolean isComponentActive(String componentName) throws Exception;
-
-void activateComponent(String componentName) throws Exception;
-
-void deactiveateComponent(String componentName) throws Exception;
-
-}
+/*
+ * 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.
+ */
+package org.apache.karaf.scr.management;
+
+public interface ScrsMBean {
+
+String[] listComponents
svn commit: r1324693 - in /karaf/trunk: assemblies/features/standard/src/main/feature/ system/ system/commands/ system/core/ system/core/src/main/java/org/apache/karaf/system/management/ system/core/s
Author: cschneider
Date: Wed Apr 11 10:53:10 2012
New Revision: 1324693
URL: http://svn.apache.org/viewvc?rev=1324693view=rev
Log:
KARAF-1302 Use aries jmx for system module
Added:
karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/
karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/SystemMBean.java
- copied unchanged from r1324616,
karaf/trunk/system/management/src/main/java/org/apache/karaf/system/management/SystemMBean.java
karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/internal/
- copied from r1324616,
karaf/trunk/system/management/src/main/java/org/apache/karaf/system/management/internal/
karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/internal/System.java
- copied, changed from r1324616,
karaf/trunk/system/management/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java
Removed:
karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java
karaf/trunk/system/management/
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/system/commands/pom.xml
karaf/trunk/system/core/pom.xml
karaf/trunk/system/core/src/main/resources/OSGI-INF/blueprint/system-core.xml
karaf/trunk/system/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=1324693r1=1324692r2=1324693view=diff
==
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
(original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Wed
Apr 11 10:53:10 2012
@@ -173,7 +173,6 @@
feature name=management description=Provide a JMX MBeanServer and a
set of MBeans in Karaf version=${project.version}
bundle
start-level=30mvn:org.apache.karaf.management/org.apache.karaf.management.server/${project.version}/bundle
-bundle
start-level=30mvn:org.apache.karaf.system/org.apache.karaf.system.management/${project.version}/bundle
bundle
start-level=30mvn:org.apache.aries.jmx/org.apache.aries.jmx.api/${aries.jmx.version}/bundle
bundle
start-level=30mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/${aries.jmx.version}/bundle
bundle
start-level=30mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/bundle
Modified: karaf/trunk/system/commands/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/system/commands/pom.xml?rev=1324693r1=1324692r2=1324693view=diff
==
--- karaf/trunk/system/commands/pom.xml (original)
+++ karaf/trunk/system/commands/pom.xml Wed Apr 11 10:53:10 2012
@@ -48,6 +48,10 @@
groupIdorg.apache.karaf.shell/groupId
artifactIdorg.apache.karaf.shell.console/artifactId
/dependency
+dependency
+groupIdorg.apache.karaf/groupId
+artifactIdorg.apache.karaf.main/artifactId
+/dependency
/dependencies
build
Modified: karaf/trunk/system/core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/system/core/pom.xml?rev=1324693r1=1324692r2=1324693view=diff
==
--- karaf/trunk/system/core/pom.xml (original)
+++ karaf/trunk/system/core/pom.xml Wed Apr 11 10:53:10 2012
@@ -75,14 +75,12 @@
configuration
instructions
Export-Package
-org.apache.karaf.system;version=${project.version}
+org.apache.karaf.system,
+org.apache.karaf.system.management
/Export-Package
-Import-Package
-!org.apache.karaf.system*,
-*
-/Import-Package
Private-Package
-org.apache.karaf.system.internal
+org.apache.karaf.system.internal,
+org.apache.karaf.system.management.internal
/Private-Package
/instructions
/configuration
Copied:
karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/internal/System.java
(from r1324616,
karaf/trunk/system/management/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/internal/System.java?p2=karaf/trunk/system/core/src/main/java/org/apache/karaf/system/management/internal/System.javap1=karaf/trunk/system/management/src/main/java
svn commit: r1324740 - /karaf/trunk/dev/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Author: cschneider
Date: Wed Apr 11 12:39:08 2012
New Revision: 1324740
URL: http://svn.apache.org/viewvc?rev=1324740view=rev
Log:
Exporting named interface in dev
Modified:
karaf/trunk/dev/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Modified:
karaf/trunk/dev/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/dev/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1324740r1=1324739r2=1324740view=diff
==
--- karaf/trunk/dev/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
(original)
+++ karaf/trunk/dev/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Wed Apr 11 12:39:08 2012
@@ -33,13 +33,13 @@
argument ref=blueprintBundleContext/
/bean
+service ref=devService interface=org.apache.karaf.dev.core.DevService
/
+
bean id=devMBean class=org.apache.karaf.dev.core.internal.Dev
argument ref=devService /
/bean
-
-service ref=devService interface=org.apache.karaf.dev.core.DevService
/
-service ref=devMBean auto-export=interfaces
+service ref=devMBean interface=org.apache.karaf.dev.core.DevMBean
service-properties
entry key=jmx.objectname
value=org.apache.karaf:type=dev,name=${karaf.name}/
/service-properties
