You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/09/18 22:15:11 UTC
svn commit: r816769 [3/6] - in /felix/trunk/karaf: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/distribution/text/etc/
assembly/src/main/filtered-resources/
assembly/src/main/filtered-resources/bin/
assembly/src/main/filtered-resources...
Modified: felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/InstalledFeatureCompleter.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/InstalledFeatureCompleter.java?rev=816769&r1=816768&r2=816769&view=diff
==============================================================================
--- felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/InstalledFeatureCompleter.java (original)
+++ felix/trunk/karaf/features/command/src/main/java/org/apache/felix/karaf/features/command/completers/InstalledFeatureCompleter.java Fri Sep 18 20:14:54 2009
@@ -18,8 +18,8 @@
import java.util.List;
-import org.apache.felix.karaf.gshell.console.Completer;
-import org.apache.felix.karaf.gshell.console.completer.StringsCompleter;
+import org.apache.felix.karaf.shell.console.Completer;
+import org.apache.felix.karaf.shell.console.completer.StringsCompleter;
import org.apache.felix.karaf.features.FeaturesService;
import org.apache.felix.karaf.features.Feature;
Modified: felix/trunk/karaf/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml?rev=816769&r1=816768&r2=816769&view=diff
==============================================================================
--- felix/trunk/karaf/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml (original)
+++ felix/trunk/karaf/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml Fri Sep 18 20:14:54 2009
@@ -20,7 +20,7 @@
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
xmlns:ext="http://geronimo.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
- <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0">
+ <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
<command name="features/addUrl">
<action class="org.apache.felix.karaf.features.command.AddUrlCommand"/>
</command>
Modified: felix/trunk/karaf/features/core/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/features/core/pom.xml?rev=816769&r1=816768&r2=816769&view=diff
==============================================================================
--- felix/trunk/karaf/features/core/pom.xml (original)
+++ felix/trunk/karaf/features/core/pom.xml Fri Sep 18 20:14:54 2009
@@ -52,13 +52,13 @@
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.console</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.console</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.obr</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.obr</artifactId>
</dependency>
<dependency>
@@ -97,7 +97,7 @@
javax.management.loading,
org.osgi.service.command,
org.apache.felix.gogo.commands,
- org.apache.felix.karaf.gshell.console,
+ org.apache.felix.karaf.shell.console,
*
</Import-Package>
<Private-Package>org.apache.felix.karaf.features.internal</Private-Package>
Modified: felix/trunk/karaf/features/core/src/test/java/org/apache/felix/karaf/features/FeaturesServiceTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/features/core/src/test/java/org/apache/felix/karaf/features/FeaturesServiceTest.java?rev=816769&r1=816768&r2=816769&view=diff
==============================================================================
--- felix/trunk/karaf/features/core/src/test/java/org/apache/felix/karaf/features/FeaturesServiceTest.java (original)
+++ felix/trunk/karaf/features/core/src/test/java/org/apache/felix/karaf/features/FeaturesServiceTest.java Fri Sep 18 20:14:54 2009
@@ -36,13 +36,12 @@
import org.osgi.framework.BundleContext;
import org.osgi.service.prefs.Preferences;
import org.osgi.service.prefs.PreferencesService;
-import org.springframework.context.ApplicationContext;
public class FeaturesServiceTest extends TestCase {
public void testInstallFeature() throws Exception {
- String name = ApplicationContext.class.getName();
+ String name = Bundle.class.getName();
name = name.replace(".", "/") + ".class";
name = getClass().getClassLoader().getResource(name).toString();
name = name.substring("jar:".length(), name.indexOf('!'));
@@ -131,7 +130,7 @@
public void testUninstallFeature() throws Exception {
- String name = ApplicationContext.class.getName();
+ String name = Bundle.class.getName();
name = name.replace(".", "/") + ".class";
name = getClass().getClassLoader().getResource(name).toString();
name = name.substring("jar:".length(), name.indexOf('!'));
@@ -274,7 +273,7 @@
// Tests Add and Remove Repository
public void testAddAndRemoveRepository() throws Exception {
- String name = ApplicationContext.class.getName();
+ String name = Bundle.class.getName();
name = name.replace(".", "/") + ".class";
name = getClass().getClassLoader().getResource(name).toString();
name = name.substring("jar:".length(), name.indexOf('!'));
@@ -351,7 +350,7 @@
// all features in a repo
public void testInstallUninstallAllFeatures() throws Exception {
- String name = ApplicationContext.class.getName();
+ String name = Bundle.class.getName();
name = name.replace(".", "/") + ".class";
name = getClass().getClassLoader().getResource(name).toString();
name = name.substring("jar:".length(), name.indexOf('!'));
@@ -555,7 +554,7 @@
// Tests uninstall of features
public void testInstallFeatureWithDependantFeatures() throws Exception {
- String name = ApplicationContext.class.getName();
+ String name = Bundle.class.getName();
name = name.replace(".", "/") + ".class";
name = getClass().getClassLoader().getResource(name).toString();
name = name.substring("jar:".length(), name.indexOf('!'));
Modified: felix/trunk/karaf/features/core/src/test/java/org/apache/felix/karaf/features/RepositoryTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/features/core/src/test/java/org/apache/felix/karaf/features/RepositoryTest.java?rev=816769&r1=816768&r2=816769&view=diff
==============================================================================
--- felix/trunk/karaf/features/core/src/test/java/org/apache/felix/karaf/features/RepositoryTest.java (original)
+++ felix/trunk/karaf/features/core/src/test/java/org/apache/felix/karaf/features/RepositoryTest.java Fri Sep 18 20:14:54 2009
@@ -62,7 +62,7 @@
}
public void testShowWrongUriInException() throws Exception {
- String uri = "src/test/resources/org/apache/felix/karaf/gshell/features/repo1.xml";
+ String uri = "src/test/resources/org/apache/felix/karaf/shell/features/repo1.xml";
RepositoryImpl r = new RepositoryImpl(new URI(uri));
try {
r.load();
Modified: felix/trunk/karaf/features/management/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/features/management/pom.xml?rev=816769&r1=816768&r2=816769&view=diff
==============================================================================
--- felix/trunk/karaf/features/management/pom.xml (original)
+++ felix/trunk/karaf/features/management/pom.xml Fri Sep 18 20:14:54 2009
@@ -57,13 +57,13 @@
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.console</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.console</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.obr</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.obr</artifactId>
</dependency>
<dependency>
@@ -104,7 +104,7 @@
javax.management.loading,
org.osgi.service.command,
org.apache.felix.gogo.commands,
- org.apache.felix.karaf.gshell.console,
+ org.apache.felix.karaf.shell.console,
!${artifactId}*,
*
</Import-Package>
Modified: felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/AbstractIntegrationTest.java?rev=816769&r1=816768&r2=816769&view=diff
==============================================================================
--- felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/AbstractIntegrationTest.java (original)
+++ felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/AbstractIntegrationTest.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.itests;
+package org.apache.felix.karaf.shell.itests;
import java.util.Dictionary;
Modified: felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/CoreTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/CoreTest.java?rev=816769&r1=816768&r2=816769&view=diff
==============================================================================
--- felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/CoreTest.java (original)
+++ felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/CoreTest.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.itests;
+package org.apache.felix.karaf.shell.itests;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -60,7 +60,7 @@
assertTrue(e.getMessage().indexOf("Command not found") >= 0);
}
- Bundle b = getInstalledBundle("org.apache.felix.karaf.gshell.log");
+ Bundle b = getInstalledBundle("org.apache.felix.karaf.shell.log");
b.start();
Thread.sleep(1000);
@@ -93,7 +93,7 @@
//
// @Test
// public void testCommandGroupAfterInstall() throws Exception {
-// Bundle b = getInstalledBundle("org.apache.felix.karaf.gshell.log");
+// Bundle b = getInstalledBundle("org.apache.felix.karaf.shell.log");
// b.start();
//
// Thread.sleep(5000);
@@ -133,9 +133,9 @@
mavenBundle("org.apache.sshd", "sshd-core"),
mavenBundle("org.apache.felix.karaf.jaas", "org.apache.felix.karaf.jaas.config"),
mavenBundle("org.apache.felix.gogo", "org.apache.felix.gogo.runtime"),
- mavenBundle("org.apache.felix.karaf.gshell", "org.apache.felix.karaf.gshell.console"),
- mavenBundle("org.apache.felix.karaf.gshell", "org.apache.felix.karaf.gshell.osgi"),
- mavenBundle("org.apache.felix.karaf.gshell", "org.apache.felix.karaf.gshell.log").noStart(),
+ mavenBundle("org.apache.felix.karaf.shell", "org.apache.felix.karaf.shell.console"),
+ mavenBundle("org.apache.felix.karaf.shell", "org.apache.felix.karaf.shell.osgi"),
+ mavenBundle("org.apache.felix.karaf.shell", "org.apache.felix.karaf.shell.log").noStart(),
equinox()
);
Modified: felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/FeaturesTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/FeaturesTest.java?rev=816769&r1=816768&r2=816769&view=diff
==============================================================================
--- felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/FeaturesTest.java (original)
+++ felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/FeaturesTest.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.itests;
+package org.apache.felix.karaf.shell.itests;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -80,10 +80,10 @@
mavenBundle("org.apache.mina", "mina-core"),
mavenBundle("org.apache.sshd", "sshd-core"),
mavenBundle("org.apache.felix.karaf.jaas", "org.apache.felix.karaf.jaas.config"),
- mavenBundle("org.apache.felix.karaf.gshell", "org.apache.felix.karaf.gshell.console"),
+ mavenBundle("org.apache.felix.karaf.shell", "org.apache.felix.karaf.shell.console"),
mavenBundle("org.apache.felix.gogo", "org.apache.felix.gogo.runtime"),
- mavenBundle("org.apache.felix.karaf.gshell", "org.apache.felix.karaf.gshell.osgi"),
- mavenBundle("org.apache.felix.karaf.gshell", "org.apache.felix.karaf.gshell.log").noStart(),
+ mavenBundle("org.apache.felix.karaf.shell", "org.apache.felix.karaf.shell.osgi"),
+ mavenBundle("org.apache.felix.karaf.shell", "org.apache.felix.karaf.shell.log").noStart(),
scanFeatures(
maven().groupId("org.apache.felix.karaf").artifactId("apache-felix-karaf").type("xml").classifier("features").versionAsInProject(),
Copied: felix/trunk/karaf/jaas/boot/pom.xml (from r816756, felix/trunk/karaf/jaas/jaas-boot/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/boot/pom.xml?p2=felix/trunk/karaf/jaas/boot/pom.xml&p1=felix/trunk/karaf/jaas/jaas-boot/pom.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/boot/src/main/java/org/apache/felix/karaf/jaas/boot/ProxyLoginModule.java (from r816756, felix/trunk/karaf/jaas/jaas-boot/src/main/java/org/apache/felix/karaf/jaas/boot/ProxyLoginModule.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/boot/src/main/java/org/apache/felix/karaf/jaas/boot/ProxyLoginModule.java?p2=felix/trunk/karaf/jaas/boot/src/main/java/org/apache/felix/karaf/jaas/boot/ProxyLoginModule.java&p1=felix/trunk/karaf/jaas/jaas-boot/src/main/java/org/apache/felix/karaf/jaas/boot/ProxyLoginModule.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/config/pom.xml (from r816756, felix/trunk/karaf/jaas/jaas-config/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/pom.xml?p2=felix/trunk/karaf/jaas/config/pom.xml&p1=felix/trunk/karaf/jaas/jaas-config/pom.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/JaasRealm.java (from r816756, felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/JaasRealm.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/JaasRealm.java?p2=felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/JaasRealm.java&p1=felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/JaasRealm.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/KeyIsLocked.java (from r816756, felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeyIsLocked.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/KeyIsLocked.java?p2=felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/KeyIsLocked.java&p1=felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeyIsLocked.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreInstance.java (from r816756, felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreInstance.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreInstance.java?p2=felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreInstance.java&p1=felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreInstance.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreIsLocked.java (from r816756, felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreIsLocked.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreIsLocked.java?p2=felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreIsLocked.java&p1=felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreIsLocked.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreManager.java (from r816756, felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreManager.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreManager.java?p2=felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreManager.java&p1=felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreManager.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Config.java (from r816756, felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Config.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Config.java?p2=felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Config.java&p1=felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Config.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Module.java (from r816756, felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Module.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Module.java?p2=felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Module.java&p1=felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Module.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/NamespaceHandler.java (from r816756, felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/NamespaceHandler.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/NamespaceHandler.java?p2=felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/NamespaceHandler.java&p1=felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/NamespaceHandler.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/NamespaceHandler.java (original)
+++ felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/NamespaceHandler.java Fri Sep 18 20:14:54 2009
@@ -43,7 +43,7 @@
public class NamespaceHandler implements org.apache.geronimo.blueprint.NamespaceHandler {
public URL getSchemaLocation(String namespace) {
- return getClass().getResource("/org/apache/felix/karaf/jaas/config/servicemix-jaas.xsd");
+ return getClass().getResource("/org/apache/felix/karaf/jaas/config/karaf-jaas.xsd");
}
public Metadata parse(Element element, ParserContext context) {
Copied: felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiConfiguration.java (from r816756, felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiConfiguration.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiConfiguration.java?p2=felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiConfiguration.java&p1=felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiConfiguration.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiKeystoreManager.java (from r816756, felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiKeystoreManager.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiKeystoreManager.java?p2=felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiKeystoreManager.java&p1=felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiKeystoreManager.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ProxyLoginModuleInitializer.java (from r816756, felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ProxyLoginModuleInitializer.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ProxyLoginModuleInitializer.java?p2=felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ProxyLoginModuleInitializer.java&p1=felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ProxyLoginModuleInitializer.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstance.java (from r816756, felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstance.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstance.java?p2=felix/trunk/karaf/jaas/config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstance.java&p1=felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstance.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml (from r816756, felix/trunk/karaf/jaas/jaas-config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml?p2=felix/trunk/karaf/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml&p1=felix/trunk/karaf/jaas/jaas-config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/config/src/main/resources/org/apache/felix/karaf/jaas/config/karaf-jaas.xsd (from r816756, felix/trunk/karaf/jaas/jaas-config/src/main/resources/org/apache/felix/karaf/jaas/config/servicemix-jaas.xsd)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/src/main/resources/org/apache/felix/karaf/jaas/config/karaf-jaas.xsd?p2=felix/trunk/karaf/jaas/config/src/main/resources/org/apache/felix/karaf/jaas/config/karaf-jaas.xsd&p1=felix/trunk/karaf/jaas/jaas-config/src/main/resources/org/apache/felix/karaf/jaas/config/servicemix-jaas.xsd&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/modules/pom.xml (from r816756, felix/trunk/karaf/jaas/jaas-modules/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/modules/pom.xml?p2=felix/trunk/karaf/jaas/modules/pom.xml&p1=felix/trunk/karaf/jaas/jaas-modules/pom.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/modules/src/main/java/org/apache/felix/karaf/jaas/modules/RolePrincipal.java (from r816756, felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/RolePrincipal.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/modules/src/main/java/org/apache/felix/karaf/jaas/modules/RolePrincipal.java?p2=felix/trunk/karaf/jaas/modules/src/main/java/org/apache/felix/karaf/jaas/modules/RolePrincipal.java&p1=felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/RolePrincipal.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/modules/src/main/java/org/apache/felix/karaf/jaas/modules/UserPrincipal.java (from r816756, felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/UserPrincipal.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/modules/src/main/java/org/apache/felix/karaf/jaas/modules/UserPrincipal.java?p2=felix/trunk/karaf/jaas/modules/src/main/java/org/apache/felix/karaf/jaas/modules/UserPrincipal.java&p1=felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/UserPrincipal.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/ConfigAdminHolder.java (from r816756, felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/ConfigAdminHolder.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/ConfigAdminHolder.java?p2=felix/trunk/karaf/jaas/modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/ConfigAdminHolder.java&p1=felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/ConfigAdminHolder.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java (from r816756, felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java?p2=felix/trunk/karaf/jaas/modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java&p1=felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/modules/src/main/java/org/apache/felix/karaf/jaas/modules/properties/PropertiesLoginModule.java (from r816756, felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/properties/PropertiesLoginModule.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/modules/src/main/java/org/apache/felix/karaf/jaas/modules/properties/PropertiesLoginModule.java?p2=felix/trunk/karaf/jaas/modules/src/main/java/org/apache/felix/karaf/jaas/modules/properties/PropertiesLoginModule.java&p1=felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/properties/PropertiesLoginModule.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml (from r816756, felix/trunk/karaf/jaas/jaas-modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml?p2=felix/trunk/karaf/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml&p1=felix/trunk/karaf/jaas/jaas-modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Modified: felix/trunk/karaf/jaas/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/pom.xml?rev=816769&r1=816768&r2=816769&view=diff
==============================================================================
--- felix/trunk/karaf/jaas/pom.xml (original)
+++ felix/trunk/karaf/jaas/pom.xml Fri Sep 18 20:14:54 2009
@@ -34,9 +34,9 @@
<name>Apache Felix Karaf :: JAAS</name>
<modules>
- <module>jaas-boot</module>
- <module>jaas-config</module>
- <module>jaas-modules</module>
+ <module>boot</module>
+ <module>config</module>
+ <module>modules</module>
</modules>
</project>
Added: felix/trunk/karaf/main/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/NOTICE?rev=816769&view=auto
==============================================================================
--- felix/trunk/karaf/main/NOTICE (added)
+++ felix/trunk/karaf/main/NOTICE Fri Sep 18 20:14:54 2009
@@ -0,0 +1,21 @@
+Apache Felix Karaf :: Main
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
Modified: felix/trunk/karaf/main/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/pom.xml?rev=816769&r1=816768&r2=816769&view=diff
==============================================================================
--- felix/trunk/karaf/main/pom.xml (original)
+++ felix/trunk/karaf/main/pom.xml Fri Sep 18 20:14:54 2009
@@ -33,6 +33,10 @@
<version>0.9.0-SNAPSHOT</version>
<name>Apache Felix Karaf :: Main</name>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.eclipse</groupId>
@@ -63,6 +67,7 @@
<Bundle-Description>OSGi R4 framework.</Bundle-Description>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.felix.karaf.main.spi.*;version=${pom.version}</Export-Package>
+ <Include-Resource>{maven-resources},META-INF/NOTICE=NOTICE</Include-Resource>
<!--
<Private-Package>
org.apache.felix.*;-split-package:=merge-first,
Modified: felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java?rev=816769&r1=816768&r2=816769&view=diff
==============================================================================
--- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java (original)
+++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java Fri Sep 18 20:14:54 2009
@@ -149,8 +149,8 @@
karafHome = Utils.getKarafHome();
karafBase = Utils.getKarafBase(karafHome);
- //System.out.println("Karaf Home: "+main.servicemixHome.getPath());
- //System.out.println("Karaf Base: "+main.servicemixBase.getPath());
+ //System.out.println("Karaf Home: "+main.karafHome.getPath());
+ //System.out.println("Karaf Base: "+main.karafBase.getPath());
System.setProperty(PROP_KARAF_HOME, karafHome.getPath());
System.setProperty(PROP_KARAF_BASE, karafBase.getPath());
Modified: felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java?rev=816769&r1=816768&r2=816769&view=diff
==============================================================================
--- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java (original)
+++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java Fri Sep 18 20:14:54 2009
@@ -40,8 +40,8 @@
String lock = props.getProperty(PROPERTY_LOCK_DIR);
if (lock != null) {
- File servicemixLock = getServiceMixLock(new File(lock), props);
- props.setProperty(PROPERTY_LOCK_DIR, servicemixLock.getPath());
+ File karafLock = getKarafLock(new File(lock), props);
+ props.setProperty(PROPERTY_LOCK_DIR, karafLock.getPath());
} else {
props.setProperty(PROPERTY_LOCK_DIR, System.getProperty(PROP_KARAF_BASE));
}
@@ -74,7 +74,7 @@
return lock != null;
}
- private static File getServiceMixLock(File lock,Properties props) {
+ private static File getKarafLock(File lock,Properties props) {
File rc = null;
String path = lock.getPath();
Modified: felix/trunk/karaf/management/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/management/pom.xml?rev=816769&r1=816768&r2=816769&view=diff
==============================================================================
--- felix/trunk/karaf/management/pom.xml (original)
+++ felix/trunk/karaf/management/pom.xml Fri Sep 18 20:14:54 2009
@@ -33,6 +33,10 @@
<version>0.9.0-SNAPSHOT</version>
<name>Apache Felix Karaf :: Management</name>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: felix/trunk/karaf/management/src/test/configs/services/org.ops4j.pax.logging.properties
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/management/src/test/configs/services/org.ops4j.pax.logging.properties?rev=816769&r1=816768&r2=816769&view=diff
==============================================================================
--- felix/trunk/karaf/management/src/test/configs/services/org.ops4j.pax.logging.properties (original)
+++ felix/trunk/karaf/management/src/test/configs/services/org.ops4j.pax.logging.properties Fri Sep 18 20:14:54 2009
@@ -30,5 +30,5 @@
log4j.appender.out=org.apache.log4j.FileAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
-log4j.appender.out.file=target/gshell.log
+log4j.appender.out.file=target/shell.log
log4j.appender.out.append=true
Modified: felix/trunk/karaf/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/pom.xml?rev=816769&r1=816768&r2=816769&view=diff
==============================================================================
--- felix/trunk/karaf/pom.xml (original)
+++ felix/trunk/karaf/pom.xml Fri Sep 18 20:14:54 2009
@@ -38,7 +38,7 @@
<module>main</module>
<module>features</module>
<module>deployer</module>
- <module>gshell</module>
+ <module>shell</module>
<module>jaas</module>
<module>client</module>
<module>management</module>
@@ -96,7 +96,6 @@
<pax.runner.version>1.1.1</pax.runner.version>
<pax.url.version>1.0.0</pax.url.version>
<pax.web.version>0.6.0</pax.web.version>
- <servicemix.legal.version>1.0</servicemix.legal.version>
<servlet.api.version>2.5</servlet.api.version>
<spring.osgi.version>1.2.0</spring.osgi.version>
<spring.version>2.5.6.SEC01</spring.version>
@@ -104,7 +103,7 @@
<osgi.jmx.version>4.2.0.200907080519</osgi.jmx.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
+ <appendedResourcesDirectory>${basedir}/etc/appended-resources</appendedResourcesDirectory>
<bnd.version.policy>[$(version;==;$(@)),$(version;+;$(@)))</bnd.version.policy>
</properties>
@@ -206,58 +205,58 @@
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.core</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.core</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.console</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.console</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.run</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.run</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.admin</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.admin</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.obr</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.obr</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.osgi</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.osgi</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.log</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.log</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.config</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.config</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.packages</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.packages</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.ssh</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.ssh</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.commands</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.commands</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
@@ -392,6 +391,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.aopalliance</groupId>
+ <artifactId>com.springsource.org.aopalliance</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -417,6 +422,24 @@
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
<version>${spring.osgi.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.aop</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
@@ -729,40 +752,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- <executions>
- <execution>
- <id>copy-legal</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.servicemix.legal</groupId>
- <artifactId>legal</artifactId>
- <version>${servicemix.legal.version}</version>
- <type>xml</type>
- <outputDirectory>target/legal/</outputDirectory>
- </artifactItem>
- </artifactItems>
- <stripVersion>true</stripVersion>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.servicemix.legal</groupId>
- <artifactId>legal</artifactId>
- <version>${servicemix.legal.version}</version>
- <type>xml</type>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.0</version>
<executions>
@@ -771,17 +760,10 @@
<goal>process</goal>
</goals>
<configuration>
+ <appendedResourcesDirectory>${appendedResourcesDirectory}</appendedResourcesDirectory>
<resourceBundles>
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
</resourceBundles>
- <supplementalModels>
- <supplementalModel>target/legal/legal.xml</supplementalModel>
- </supplementalModels>
- <properties>
- <addLicense>true</addLicense>
- <addArtifact>true</addArtifact>
- <projectName>Apache ServiceMix</projectName>
- </properties>
</configuration>
</execution>
</executions>
Copied: felix/trunk/karaf/shell/admin/pom.xml (from r816756, felix/trunk/karaf/gshell/gshell-admin/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/pom.xml?p2=felix/trunk/karaf/shell/admin/pom.xml&p1=felix/trunk/karaf/gshell/gshell-admin/pom.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/pom.xml (original)
+++ felix/trunk/karaf/shell/admin/pom.xml Fri Sep 18 20:14:54 2009
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>gshell</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>shell</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.admin</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.admin</artifactId>
<packaging>bundle</packaging>
<version>0.9.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: GShell Admin</name>
+ <name>Apache Felix Karaf :: Shell Admin</name>
<description>
Provides administration commands
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.console</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.console</artifactId>
</dependency>
<dependency>
@@ -155,7 +155,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/target/classes/org/apache/felix/karaf/gshell/admin/etc</outputDirectory>
+ <outputDirectory>${basedir}/target/classes/org/apache/felix/karaf/shell/admin/etc</outputDirectory>
<resources>
<resource>
<directory>../../assembly/src/main/distribution/text/etc/</directory>
@@ -180,7 +180,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/target/classes/org/apache/felix/karaf/gshell/admin/etc</outputDirectory>
+ <outputDirectory>${basedir}/target/classes/org/apache/felix/karaf/shell/admin/etc</outputDirectory>
<resources>
<resource>
<directory>../../assembly/src/main/filtered-resources/etc</directory>
@@ -212,7 +212,7 @@
<Import-Package>
org.osgi.service.command,
org.apache.felix.gogo.commands,
- org.apache.felix.karaf.gshell.console,
+ org.apache.felix.karaf.shell.console,
*
</Import-Package>
<Private-Package>org.apache.felix.karaf.jpm.*</Private-Package>
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/Process.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/Process.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/Process.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/Process.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/Process.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/AdminService.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/AdminService.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/AdminService.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/AdminService.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/AdminService.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/AdminService.java (original)
+++ felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/AdminService.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.admin;
+package org.apache.felix.karaf.shell.admin;
public interface AdminService {
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/AdminServiceMBean.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/AdminServiceMBean.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/AdminServiceMBean.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/AdminServiceMBean.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/AdminServiceMBean.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/AdminServiceMBean.java (original)
+++ felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/AdminServiceMBean.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.admin;
+package org.apache.felix.karaf.shell.admin;
public interface AdminServiceMBean {
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/Instance.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/Instance.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/Instance.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/Instance.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/Instance.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/Instance.java (original)
+++ felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/Instance.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.admin;
+package org.apache.felix.karaf.shell.admin;
public interface Instance {
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceImpl.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceImpl.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceImpl.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceImpl.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceImpl.java (original)
+++ felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceImpl.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.admin.internal;
+package org.apache.felix.karaf.shell.admin.internal;
import java.io.File;
import java.io.FileOutputStream;
@@ -29,8 +29,8 @@
import java.util.Scanner;
import java.util.Properties;
-import org.apache.felix.karaf.gshell.admin.AdminService;
-import org.apache.felix.karaf.gshell.admin.Instance;
+import org.apache.felix.karaf.shell.admin.AdminService;
+import org.apache.felix.karaf.shell.admin.Instance;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.fusesource.jansi.Ansi;
@@ -121,49 +121,49 @@
throw new IllegalArgumentException("Instance '" + name + "' already exists");
}
String loc = location != null ? location : name;
- File serviceMixBase = new File(loc);
- if (!serviceMixBase.isAbsolute()) {
- serviceMixBase = new File(storageLocation, loc);
+ File karafBase = new File(loc);
+ if (!karafBase.isAbsolute()) {
+ karafBase = new File(storageLocation, loc);
}
int sshPort = port;
if (sshPort <= 0) {
sshPort = ++defaultPortStart;
}
- println(Ansi.ansi().a("Creating new instance on port ").a(sshPort).a(" at: ").a(Ansi.Attribute.INTENSITY_BOLD).a(serviceMixBase).a(Ansi.Attribute.RESET).toString());
+ println(Ansi.ansi().a("Creating new instance on port ").a(sshPort).a(" at: ").a(Ansi.Attribute.INTENSITY_BOLD).a(karafBase).a(Ansi.Attribute.RESET).toString());
- mkdir(serviceMixBase, "bin");
- mkdir(serviceMixBase, "etc");
- mkdir(serviceMixBase, "system");
- mkdir(serviceMixBase, "deploy");
- mkdir(serviceMixBase, "data");
-
- copyResourceToDir(serviceMixBase, "etc/config.properties", true);
- copyResourceToDir(serviceMixBase, "etc/java.util.logging.properties", true);
- copyResourceToDir(serviceMixBase, "etc/org.apache.felix.karaf.log.cfg", true);
- copyResourceToDir(serviceMixBase, "etc/org.apache.felix.karaf.features.cfg", true);
- copyResourceToDir(serviceMixBase, "etc/org.apache.felix.karaf.management.cfg", true);
- copyResourceToDir(serviceMixBase, "etc/org.ops4j.pax.logging.cfg", true);
- copyResourceToDir(serviceMixBase, "etc/org.ops4j.pax.url.mvn.cfg", true);
- copyResourceToDir(serviceMixBase, "etc/startup.properties", true);
- copyResourceToDir(serviceMixBase, "etc/users.properties", true);
+ mkdir(karafBase, "bin");
+ mkdir(karafBase, "etc");
+ mkdir(karafBase, "system");
+ mkdir(karafBase, "deploy");
+ mkdir(karafBase, "data");
+
+ copyResourceToDir(karafBase, "etc/config.properties", true);
+ copyResourceToDir(karafBase, "etc/java.util.logging.properties", true);
+ copyResourceToDir(karafBase, "etc/org.apache.felix.karaf.log.cfg", true);
+ copyResourceToDir(karafBase, "etc/org.apache.felix.karaf.features.cfg", true);
+ copyResourceToDir(karafBase, "etc/org.apache.felix.karaf.management.cfg", true);
+ copyResourceToDir(karafBase, "etc/org.ops4j.pax.logging.cfg", true);
+ copyResourceToDir(karafBase, "etc/org.ops4j.pax.url.mvn.cfg", true);
+ copyResourceToDir(karafBase, "etc/startup.properties", true);
+ copyResourceToDir(karafBase, "etc/users.properties", true);
HashMap<String, String> props = new HashMap<String, String>();
props.put("${karaf.name}", name);
props.put("${karaf.home}", System.getProperty("karaf.home"));
- props.put("${karaf.base}", serviceMixBase.getPath());
+ props.put("${karaf.base}", karafBase.getPath());
props.put("${karaf.sshPort}", Integer.toString(sshPort));
- copyFilteredResourceToDir(serviceMixBase, "etc/system.properties", props);
- copyFilteredResourceToDir(serviceMixBase, "etc/org.apache.felix.karaf.shell.cfg", props);
+ copyFilteredResourceToDir(karafBase, "etc/system.properties", props);
+ copyFilteredResourceToDir(karafBase, "etc/org.apache.felix.karaf.shell.cfg", props);
if( System.getProperty("os.name").startsWith("Win") ) {
- copyFilteredResourceToDir(serviceMixBase, "bin/start.bat", props);
- copyFilteredResourceToDir(serviceMixBase, "bin/stop.bat", props);
+ copyFilteredResourceToDir(karafBase, "bin/start.bat", props);
+ copyFilteredResourceToDir(karafBase, "bin/stop.bat", props);
} else {
- copyFilteredResourceToDir(serviceMixBase, "bin/start", props);
- copyFilteredResourceToDir(serviceMixBase, "bin/stop", props);
- chmod(new File(serviceMixBase, "bin/start"), "a+x");
- chmod(new File(serviceMixBase, "bin/stop"), "a+x");
+ copyFilteredResourceToDir(karafBase, "bin/start", props);
+ copyFilteredResourceToDir(karafBase, "bin/stop", props);
+ chmod(new File(karafBase, "bin/start"), "a+x");
+ chmod(new File(karafBase, "bin/stop"), "a+x");
}
- Instance instance = new InstanceImpl(this, name, serviceMixBase.toString());
+ Instance instance = new InstanceImpl(this, name, karafBase.toString());
instances.put(name, instance);
saveState();
return instance;
@@ -198,7 +198,7 @@
File outFile = new File(target, resource);
if( !outFile.exists() ) {
println(Ansi.ansi().a("Creating file: ").a(Ansi.Attribute.INTENSITY_BOLD).a(outFile.getPath()).a(Ansi.Attribute.RESET).toString());
- InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/felix/karaf/gshell/admin/" + resource);
+ InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/felix/karaf/shell/admin/" + resource);
try {
if( text ) {
// Read it line at a time so that we can use the platform line ending when we write it out.
@@ -238,7 +238,7 @@
File outFile = new File(target, resource);
if( !outFile.exists() ) {
println(Ansi.ansi().a("Creating file: ").a(Ansi.Attribute.INTENSITY_BOLD).a(outFile.getPath()).a(Ansi.Attribute.RESET).toString());
- InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/felix/karaf/gshell/admin/" + resource);
+ InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/felix/karaf/shell/admin/" + resource);
try {
// Read it line at a time so that we can use the platform line ending when we write it out.
PrintStream out = new PrintStream(new FileOutputStream(outFile));
@@ -290,8 +290,8 @@
return line;
}
- private void mkdir(File serviceMixBase, String path) {
- File file = new File(serviceMixBase, path);
+ private void mkdir(File karafBase, String path) {
+ File file = new File(karafBase, path);
if( !file.exists() ) {
println(Ansi.ansi().a("Creating dir: ").a(Ansi.Attribute.INTENSITY_BOLD).a(file.getPath()).a(Ansi.Attribute.RESET).toString());
file.mkdirs();
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceMBeanImpl.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceMBeanImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceMBeanImpl.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceMBeanImpl.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceMBeanImpl.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceMBeanImpl.java (original)
+++ felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/AdminServiceMBeanImpl.java Fri Sep 18 20:14:54 2009
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.admin.internal;
+package org.apache.felix.karaf.shell.admin.internal;
-import org.apache.felix.karaf.gshell.admin.AdminService;
-import org.apache.felix.karaf.gshell.admin.AdminServiceMBean;
-import org.apache.felix.karaf.gshell.admin.Instance;
+import org.apache.felix.karaf.shell.admin.AdminService;
+import org.apache.felix.karaf.shell.admin.AdminServiceMBean;
+import org.apache.felix.karaf.shell.admin.Instance;
public class AdminServiceMBeanImpl implements AdminServiceMBean {
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/InstanceImpl.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/InstanceImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/InstanceImpl.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/InstanceImpl.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/InstanceImpl.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/InstanceImpl.java (original)
+++ felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/InstanceImpl.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.admin.internal;
+package org.apache.felix.karaf.shell.admin.internal;
import java.io.File;
import java.io.FileInputStream;
@@ -26,7 +26,7 @@
import java.net.Socket;
import java.util.Properties;
-import org.apache.felix.karaf.gshell.admin.Instance;
+import org.apache.felix.karaf.shell.admin.Instance;
import org.apache.felix.karaf.jpm.Process;
import org.apache.felix.karaf.jpm.ProcessBuilderFactory;
import org.apache.felix.karaf.jpm.impl.ScriptUtils;
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/AdminCommandSupport.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/AdminCommandSupport.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/AdminCommandSupport.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/AdminCommandSupport.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/AdminCommandSupport.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/AdminCommandSupport.java (original)
+++ felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/AdminCommandSupport.java Fri Sep 18 20:14:54 2009
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.admin.internal.commands;
+package org.apache.felix.karaf.shell.admin.internal.commands;
-import org.apache.felix.karaf.gshell.admin.AdminService;
-import org.apache.felix.karaf.gshell.admin.Instance;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.admin.AdminService;
+import org.apache.felix.karaf.shell.admin.Instance;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Command;
public abstract class AdminCommandSupport extends OsgiCommandSupport {
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ChangePortCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ChangePortCommand.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ChangePortCommand.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.java (original)
+++ felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ChangePortCommand.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.admin.internal.commands;
+package org.apache.felix.karaf.shell.admin.internal.commands;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ConnectCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ConnectCommand.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ConnectCommand.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.java (original)
+++ felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ConnectCommand.java Fri Sep 18 20:14:54 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.gshell.admin.internal.commands;
+package org.apache.felix.karaf.shell.admin.internal.commands;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Argument;
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/CreateCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/CreateCommand.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/CreateCommand.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.java (original)
+++ felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/CreateCommand.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.admin.internal.commands;
+package org.apache.felix.karaf.shell.admin.internal.commands;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Option;
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/DestroyCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/DestroyCommand.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/DestroyCommand.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.java (original)
+++ felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/DestroyCommand.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.admin.internal.commands;
+package org.apache.felix.karaf.shell.admin.internal.commands;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ListCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ListCommand.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ListCommand.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.java (original)
+++ felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/ListCommand.java Fri Sep 18 20:14:54 2009
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.admin.internal.commands;
+package org.apache.felix.karaf.shell.admin.internal.commands;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.karaf.gshell.admin.Instance;
+import org.apache.felix.karaf.shell.admin.Instance;
/**
* List available instances
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StartCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StartCommand.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StartCommand.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.java (original)
+++ felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StartCommand.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.admin.internal.commands;
+package org.apache.felix.karaf.shell.admin.internal.commands;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Argument;
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StopCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StopCommand.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StopCommand.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.java (original)
+++ felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/StopCommand.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.admin.internal.commands;
+package org.apache.felix.karaf.shell.admin.internal.commands;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/completers/InstanceCompleter.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/completers/InstanceCompleter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/completers/InstanceCompleter.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/completers/InstanceCompleter.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/completers/InstanceCompleter.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/completers/InstanceCompleter.java (original)
+++ felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/completers/InstanceCompleter.java Fri Sep 18 20:14:54 2009
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.admin.internal.completers;
+package org.apache.felix.karaf.shell.admin.internal.completers;
import java.util.List;
-import org.apache.felix.karaf.gshell.admin.AdminService;
-import org.apache.felix.karaf.gshell.admin.Instance;
-import org.apache.felix.karaf.gshell.console.completer.StringsCompleter;
-import org.apache.felix.karaf.gshell.console.Completer;
+import org.apache.felix.karaf.shell.admin.AdminService;
+import org.apache.felix.karaf.shell.admin.Instance;
+import org.apache.felix.karaf.shell.console.completer.StringsCompleter;
+import org.apache.felix.karaf.shell.console.Completer;
/**
* {@link jline.Completor} for server instance names.
Copied: felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/main/Execute.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/main/Execute.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/main/Execute.java?p2=felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/main/Execute.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/main/Execute.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/main/Execute.java (original)
+++ felix/trunk/karaf/shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/main/Execute.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.admin.main;
+package org.apache.felix.karaf.shell.admin.main;
import java.io.File;
import java.util.ArrayList;
@@ -26,14 +26,14 @@
import org.apache.felix.gogo.commands.Action;
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.basic.DefaultActionPreparator;
-import org.apache.felix.karaf.gshell.admin.internal.AdminServiceImpl;
-import org.apache.felix.karaf.gshell.admin.internal.commands.AdminCommandSupport;
-import org.apache.felix.karaf.gshell.admin.internal.commands.CreateCommand;
-import org.apache.felix.karaf.gshell.admin.internal.commands.DestroyCommand;
-import org.apache.felix.karaf.gshell.admin.internal.commands.ListCommand;
-import org.apache.felix.karaf.gshell.admin.internal.commands.StartCommand;
-import org.apache.felix.karaf.gshell.admin.internal.commands.StopCommand;
-import org.apache.felix.karaf.gshell.admin.internal.commands.ChangePortCommand;
+import org.apache.felix.karaf.shell.admin.internal.AdminServiceImpl;
+import org.apache.felix.karaf.shell.admin.internal.commands.AdminCommandSupport;
+import org.apache.felix.karaf.shell.admin.internal.commands.CreateCommand;
+import org.apache.felix.karaf.shell.admin.internal.commands.DestroyCommand;
+import org.apache.felix.karaf.shell.admin.internal.commands.ListCommand;
+import org.apache.felix.karaf.shell.admin.internal.commands.StartCommand;
+import org.apache.felix.karaf.shell.admin.internal.commands.StopCommand;
+import org.apache.felix.karaf.shell.admin.internal.commands.ChangePortCommand;
import org.fusesource.jansi.AnsiConsole;
public class Execute {