You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/01/09 10:25:00 UTC
svn commit: r1229068 [2/4] - in /karaf/eik/trunk:
features/org.apache.karaf.eik.update/src/main/resources/
plugins/org.apache.karaf.eik.app/ plugins/org.apache.karaf.eik.app/META-INF/
plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/a...
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/DefaultJDBCLock.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/DefaultJDBCLock.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/DefaultJDBCLock.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/DefaultJDBCLock.java Mon Jan 9 09:24:53 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.main;
import java.sql.Connection;
import java.sql.DriverManager;
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/Lock.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/Lock.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/Lock.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/Lock.java Mon Jan 9 09:24:53 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.main;
public interface Lock {
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/MySQLJDBCLock.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/MySQLJDBCLock.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/MySQLJDBCLock.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/MySQLJDBCLock.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/MySQLJDBCLock.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/MySQLJDBCLock.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/MySQLJDBCLock.java Mon Jan 9 09:24:53 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.main;
import java.sql.Connection;
import java.sql.DriverManager;
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/OracleJDBCLock.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/OracleJDBCLock.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/OracleJDBCLock.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/OracleJDBCLock.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/OracleJDBCLock.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/OracleJDBCLock.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/OracleJDBCLock.java Mon Jan 9 09:24:53 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.main;
import java.sql.Connection;
import java.sql.DriverManager;
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/SimpleFileLock.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/SimpleFileLock.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/SimpleFileLock.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/SimpleFileLock.java Mon Jan 9 09:24:53 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.main;
import java.io.File;
import java.io.IOException;
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/Statements.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Statements.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/Statements.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/Statements.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Statements.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Statements.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/Statements.java Mon Jan 9 09:24:53 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.main;
import java.sql.Connection;
import java.sql.ResultSet;
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/StringMap.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/StringMap.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/StringMap.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/StringMap.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/StringMap.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/StringMap.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/StringMap.java Mon Jan 9 09:24:53 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.main;
import java.util.Comparator;
import java.util.Map;
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF?rev=1229068&r1=1229067&r2=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF Mon Jan 9 09:24:53 2012
@@ -14,14 +14,14 @@ Require-Bundle: org.eclipse.core.runtime
org.apache.mina.core;bundle-version="2.0.0",
org.fusesource.jansi;bundle-version="1.5.0",
sshd-core;bundle-version="0.5.0"
-Export-Package: info.evanchik.eclipse.karaf.core,
- info.evanchik.eclipse.karaf.core.configuration,
- info.evanchik.eclipse.karaf.core.configuration.internal,
- info.evanchik.eclipse.karaf.core.equinox,
- info.evanchik.eclipse.karaf.core.features,
- info.evanchik.eclipse.karaf.core.model,
- info.evanchik.eclipse.karaf.core.shell
+Export-Package: org.apache.karaf.eik.core,
+ org.apache.karaf.eik.core.configuration,
+ org.apache.karaf.eik.core.configuration.internal,
+ org.apache.karaf.eik.core.equinox,
+ org.apache.karaf.eik.core.features,
+ org.apache.karaf.eik.core.model,
+ org.apache.karaf.eik.core.shell
Bundle-ActivationPolicy: lazy
-Bundle-Activator: info.evanchik.eclipse.karaf.core.internal.KarafCorePluginActivator
+Bundle-Activator: org.apache.karaf.eik.core.internal.KarafCorePluginActivator
Bundle-Vendor: Apache Software Foundation
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/plugin.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/plugin.xml?rev=1229068&r1=1229067&r2=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/plugin.xml (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/plugin.xml Mon Jan 9 09:24:53 2012
@@ -7,18 +7,18 @@
<variable
description="A variable resolver for filesystem locations of Eclipse plugins"
name="plugin_loc"
- resolver="info.evanchik.eclipse.karaf.core.internal.PluginLocVariableResolver"
+ resolver="org.apache.karaf.eik.core.internal.PluginLocVariableResolver"
supportsArgument="true">
</variable>
</extension>
<extension
id="directoryModel"
name="Directory based platform for Apache Felix Karaf"
- point="info.evanchik.eclipse.karaf.core.platformModel">
+ point="org.apache.karaf.eik.core.platformModel">
<model
- class="info.evanchik.eclipse.karaf.core.internal.GenericKarafPlatformModelFactory">
+ class="org.apache.karaf.eik.core.internal.GenericKarafPlatformModelFactory">
<triggerBundle
- symbolicName="org.apache.felix.karaf.main"></triggerBundle>
+ symbolicName="org.apache.karaf.main"></triggerBundle>
<triggerBundle
symbolicName="org.apache.felix.karaf.jaas.boot">
</triggerBundle>
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/schema/platformModel.exsd
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/schema/platformModel.exsd?rev=1229068&r1=1229067&r2=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/schema/platformModel.exsd (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/schema/platformModel.exsd Mon Jan 9 09:24:53 2012
@@ -1,12 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="info.evanchik.eclipse.karaf.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.apache.karaf.eik.core" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="info.evanchik.eclipse.karaf.core" id="platformModel" name="Apache Felix Karaf Platform Models"/>
+ <meta.schema plugin="org.apache.karaf.eik.core" id="platformModel" name="Apache Karaf Platform Models"/>
</appinfo>
<documentation>
- [Enter description of this extension point.]
+
</documentation>
</annotation>
@@ -58,7 +58,7 @@
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":info.evanchik.eclipse.karaf.core.KarafPlatformModelFactory"/>
+ <meta.attribute kind="java" basedOn=":org.apache.karaf.eik.core.KarafPlatformModelFactory"/>
</appinfo>
</annotation>
</attribute>
@@ -82,7 +82,7 @@
<meta.section type="since"/>
</appinfo>
<documentation>
- [Enter the first release in which this extension point appears.]
+
</documentation>
</annotation>
@@ -91,7 +91,7 @@
<meta.section type="examples"/>
</appinfo>
<documentation>
- [Enter extension point usage example here.]
+
</documentation>
</annotation>
@@ -100,7 +100,7 @@
<meta.section type="apiinfo"/>
</appinfo>
<documentation>
- [Enter API information here.]
+
</documentation>
</annotation>
@@ -109,9 +109,8 @@
<meta.section type="implementation"/>
</appinfo>
<documentation>
- [Enter information about supplied implementation of this extension point.]
+
</documentation>
</annotation>
-
</schema>
Added: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/IKarafConstants.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/IKarafConstants.java?rev=1229068&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/IKarafConstants.java (added)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/IKarafConstants.java Mon Jan 9 09:24:53 2012
@@ -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.eik.core;
+
+public interface IKarafConstants {
+
+ /**
+ * Karaf base directory, used to reference core Karaf system files; takes
+ * precedence over Karaf home directory
+ */
+ public static final String KARAF_BASE_PROP = "karaf.base";
+
+ public static final String KARAF_BUNDLE_LOCATIONS_PROP = "bundle.locations";
+
+ public static final String KARAF_DATA_PROP = "karaf.data";
+
+ public static final String KARAF_DEFAULT_BUNDLE_START_LEVEL = "60";
+
+ public static final String KARAF_DEFAULT_CONFIG_PROPERTIES_FILE = "config.properties";
+
+ public static final String KARAF_DEFAULT_PLATFORM_PROVIDER_SYMBOLIC_NAME = "org.apache.karaf.eik.target";
+
+ public static final String KARAF_DEFAULT_STARTUP_PROPERTIES_FILE = "startup.properties";
+
+ public static final String KARAF_DEFAULT_SYSTEM_PROPERTIES_FILE = "system.properties";
+
+ /**
+ * Karaf home directory, used to reference installation specific files
+ */
+ public static final String KARAF_HOME_PROP = "karaf.home";
+
+ public static final String KARAF_INSTANCES_PROP = "karaf.instances";
+
+ public static final String KARAF_JAAS_BOOT_BUNDLE_SYMBOLIC_NAME = "org.apache.karaf.jaas.boot";
+
+ public static final String KARAF_MAIN_BUNDLE_SYMBOLIC_NAME = "org.apache.karaf.main";
+
+ public static final String KARAF_OBR_REPOSITORY_PROP = "obr.repository.url";
+
+ public static final String KARAF_OSGI_FRAMEWORK_ID = "org.apache.karaf.eik.Framework";
+
+ public static final String ORG_APACHE_KARAF_MANAGEMENT_CFG_FILENAME = "org.apache.karaf.management.cfg";
+
+ public static final String ORG_APACHE_KARAF_FEATURES_CFG_FILENAME = "org.apache.karaf.features.cfg";
+
+}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafCorePluginUtils.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafCorePluginUtils.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafCorePluginUtils.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafCorePluginUtils.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafCorePluginUtils.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafCorePluginUtils.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafCorePluginUtils.java Mon Jan 9 09:24:53 2012
@@ -1,17 +1,25 @@
-/**
- * Copyright (c) 2009 Stephen Evanchik
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * 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
*
- * Contributors:
- * Stephen Evanchik - initial implementation
+ * 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 info.evanchik.eclipse.karaf.core;
+package org.apache.karaf.eik.core;
-import info.evanchik.eclipse.karaf.core.equinox.BundleEntry;
-import info.evanchik.eclipse.karaf.core.internal.KarafCorePluginActivator;
+import org.apache.karaf.eik.core.equinox.BundleEntry;
+import org.apache.karaf.eik.core.internal.KarafCorePluginActivator;
import java.io.File;
import java.io.FileInputStream;
@@ -31,13 +39,9 @@ import org.eclipse.core.runtime.Platform
import org.eclipse.core.runtime.Status;
import org.osgi.framework.Bundle;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public final class KarafCorePluginUtils {
- private static final String INCLUDES_PROPERTY = "${includes}"; //$NON-NLS-1$
+ private static final String INCLUDES_PROPERTY = "${includes}";
/**
* Create a JVM system property argument (e.g -DpropertyName=propertyValue).
@@ -49,56 +53,15 @@ public final class KarafCorePluginUtils
* @return the fully constructed system property string
*/
public static String constructSystemProperty(final String name, final String value) {
- final StringBuilder sb = new StringBuilder("-D"); //$NON-NLS-1$
+ final StringBuilder sb = new StringBuilder("-D");
sb.append(name);
- sb.append("="); //$NON-NLS-1$
+ sb.append("=");
sb.append(value);
return sb.toString();
}
/**
- * Determines if a Karaf platform model points to a ServiceMix Kernel based
- * distribution.
- *
- * @param model
- * the candidate {@link KarafPlatformModel}
- * @return true if it is a ServiceMix Kernel based model, false if it is
- * Apache Felix Karaf model
- * @throws IllegalArgumentException
- * if the Karaf platform model does not contain the appropriate
- * sentry file
- */
- public static boolean isServiceMix(final KarafPlatformModel model) {
- if ( model.getConfigurationFile(IKarafConstants.ORG_APACHE_SERVICEMIX_MANAGEMENT_CFG_FILENAME).toFile().exists()
- || model.getConfigurationFile(IKarafConstants.ORG_APACHE_SERVICEMIX_FEATURES_CFG_FILENAME).toFile().exists())
- {
- return true;
- } else if (model instanceof KarafWorkingPlatformModel) {
- final KarafWorkingPlatformModel workingModel = (KarafWorkingPlatformModel) model;
- return workingModel.getConfigurationFile(IKarafConstants.ORG_APACHE_SERVICEMIX_MANAGEMENT_CFG_FILENAME).toFile().exists();
- } else {
- return false;
- }
- }
-
- /**
- *
- * @param model
- * @return
- */
- public static boolean isFelixKaraf(final KarafPlatformModel model) {
- if ( model.getConfigurationFile(IKarafConstants.ORG_APACHE_FELIX_KARAF_MANAGEMENT_CFG_FILENAME).toFile().exists()) {
- return true;
- } else if (model instanceof KarafWorkingPlatformModel) {
- final KarafWorkingPlatformModel workingModel = (KarafWorkingPlatformModel) model;
- return workingModel.getConfigurationFile(IKarafConstants.ORG_APACHE_FELIX_KARAF_MANAGEMENT_CFG_FILENAME).toFile().exists();
- } else {
- return false;
- }
- }
-
- /**
*
* @param model
* @return
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformDetails.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformDetails.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformDetails.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformDetails.java Mon Jan 9 09:24:53 2012
@@ -16,14 +16,29 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.eik.core;
-public interface Lock {
+public interface KarafPlatformDetails {
- boolean lock() throws Exception;
+ /**
+ * Retrieves the description of this Karaf platform
+ *
+ * @return the description of the Karaf platform
+ */
+ public String getDescription();
- void release() throws Exception;
+ /**
+ * Retrieves the name of this Karaf platform
+ *
+ * @return the name of the Karaf platform
+ */
+ public String getName();
- boolean isAlive() throws Exception;
+ /**
+ * Retrieves the version of this Karaf platform
+ *
+ * @return the version of the Karaf platform
+ */
+ public String getVersion();
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformModel.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafPlatformModel.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformModel.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformModel.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafPlatformModel.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafPlatformModel.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformModel.java Mon Jan 9 09:24:53 2012
@@ -1,14 +1,22 @@
-/**
- * Copyright (c) 2009 Stephen Evanchik
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * 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
*
- * Contributors:
- * Stephen Evanchik - initial implementation
+ * 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 info.evanchik.eclipse.karaf.core;
+package org.apache.karaf.eik.core;
import java.util.List;
@@ -17,10 +25,6 @@ import org.eclipse.core.runtime.IPath;
import org.eclipse.osgi.service.resolver.State;
import org.eclipse.pde.core.plugin.IPluginModelBase;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public interface KarafPlatformModel extends IAdaptable {
/**
@@ -113,4 +117,5 @@ public interface KarafPlatformModel exte
* writable configuration files
*/
public boolean isReadOnly();
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformModelFactory.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformModelFactory.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformModelFactory.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformModelFactory.java Mon Jan 9 09:24:53 2012
@@ -16,14 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.eik.core;
-public interface Lock {
+import org.eclipse.core.runtime.IPath;
- boolean lock() throws Exception;
+public interface KarafPlatformModelFactory {
- void release() throws Exception;
+ /**
+ *
+ * @return
+ */
+ public KarafPlatformModel getPlatformModel(IPath rootDirectory);
- boolean isAlive() throws Exception;
+ /**
+ *
+ * @return
+ */
+ public KarafPlatformValidator getPlatformValidator();
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformModelRegistry.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafPlatformModelRegistry.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformModelRegistry.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformModelRegistry.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafPlatformModelRegistry.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafPlatformModelRegistry.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformModelRegistry.java Mon Jan 9 09:24:53 2012
@@ -1,16 +1,24 @@
-/**
- * Copyright (c) 2010 Stephen Evanchik
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * 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
*
- * Contributors:
- * Stephen Evanchik - initial implementation
+ * 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 info.evanchik.eclipse.karaf.core;
+package org.apache.karaf.eik.core;
-import info.evanchik.eclipse.karaf.core.internal.KarafCorePluginActivator;
+import org.apache.karaf.eik.core.internal.KarafCorePluginActivator;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@@ -26,10 +34,6 @@ import org.eclipse.core.runtime.Platform
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.PluginRegistry;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public final class KarafPlatformModelRegistry {
private static final String ATT_CLASS = "class";
@@ -190,4 +194,5 @@ public final class KarafPlatformModelReg
return triggerBundleMap;
}
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformValidator.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformValidator.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformValidator.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformValidator.java Mon Jan 9 09:24:53 2012
@@ -16,14 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.eik.core;
-public interface Lock {
+import org.eclipse.core.runtime.IPath;
- boolean lock() throws Exception;
+public interface KarafPlatformValidator {
- void release() throws Exception;
-
- boolean isAlive() throws Exception;
+ /**
+ * Determines if the Karaf platform model is valid and complete.
+ *
+ * @param rootPath
+ * the root path of the platform model that will be evaluated
+ * @return true if the platform is valid, false otherwise
+ */
+ public boolean isValid(IPath rootPath);
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafWorkingPlatformModel.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafWorkingPlatformModel.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafWorkingPlatformModel.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafWorkingPlatformModel.java Mon Jan 9 09:24:53 2012
@@ -16,14 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.eik.core;
-public interface Lock {
+public interface KarafWorkingPlatformModel extends KarafPlatformModel {
- boolean lock() throws Exception;
-
- void release() throws Exception;
-
- boolean isAlive() throws Exception;
+ /**
+ * Retrieves the parent {@link KarafPlatformModel} that this working model
+ * represents
+ *
+ * @return the parent {@code KarafPlatformModel}
+ */
+ public KarafPlatformModel getParentKarafModel();
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/LogWrapper.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/LogWrapper.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/LogWrapper.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/LogWrapper.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/LogWrapper.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/LogWrapper.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/LogWrapper.java Mon Jan 9 09:24:53 2012
@@ -1,23 +1,27 @@
-/**
- * Copyright (c) 2009 Stephen Evanchik
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * 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
*
- * Contributors:
- * Stephen Evanchik - initial implementation
+ * 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 info.evanchik.eclipse.karaf.core;
+package org.apache.karaf.eik.core;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public class LogWrapper {
/**
@@ -70,4 +74,5 @@ public class LogWrapper {
final IStatus status = new Status(IStatus.WARNING, pluginId, message, t);
log.log(status);
}
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/PropertyUtils.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/PropertyUtils.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/PropertyUtils.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/PropertyUtils.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/PropertyUtils.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/PropertyUtils.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/PropertyUtils.java Mon Jan 9 09:24:53 2012
@@ -1,14 +1,22 @@
-/**
- * Copyright (c) 2009 Stephen Evanchik
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * 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
*
- * Contributors:
- * Stephen Evanchik - initial implementation
+ * 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 info.evanchik.eclipse.karaf.core;
+package org.apache.karaf.eik.core;
import java.util.Enumeration;
import java.util.HashMap;
@@ -16,8 +24,7 @@ import java.util.Map;
import java.util.Properties;
/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
+ * Extracted from Karaf Main
*/
public final class PropertyUtils {
@@ -25,10 +32,6 @@ public final class PropertyUtils {
private static final String DELIM_STOP = "}";
- /*
- * From Karaf Main.java
- */
-
/**
* Interpolates variables found in the property string values. A variable is
* {@code $ name} and can be nested {@code $ outer-$ inner} .
@@ -36,8 +39,6 @@ public final class PropertyUtils {
* @param configProperties
* the {@link Properties} object that will have its variables
* interpolated
- *
- * @see StrSubstitutor
*/
public static void interpolateVariables(final Properties configProperties, final Properties initialProperties) {
@@ -155,4 +156,5 @@ public final class PropertyUtils {
// Return the value.
return val;
}
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/SystemBundleNames.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/SystemBundleNames.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/SystemBundleNames.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/SystemBundleNames.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/SystemBundleNames.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/SystemBundleNames.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/SystemBundleNames.java Mon Jan 9 09:24:53 2012
@@ -8,7 +8,7 @@
* Contributors:
* Stephen Evanchik - initial implementation
*/
-package info.evanchik.eclipse.karaf.core;
+package org.apache.karaf.eik.core;
/**
* @author Stephen Evanchik (evanchsa@gmail.com)
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/AbstractConfigurationSection.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/AbstractConfigurationSection.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/AbstractConfigurationSection.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/AbstractConfigurationSection.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/AbstractConfigurationSection.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/AbstractConfigurationSection.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/AbstractConfigurationSection.java Mon Jan 9 09:24:53 2012
@@ -1,21 +1,25 @@
-/**
- * Copyright (c) 2009 Stephen Evanchik
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * 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
*
- * Contributors:
- * Stephen Evanchik - initial implementation
+ * 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 info.evanchik.eclipse.karaf.core.configuration;
+package org.apache.karaf.eik.core.configuration;
-import info.evanchik.eclipse.karaf.core.KarafPlatformModel;
+import org.apache.karaf.eik.core.KarafPlatformModel;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public abstract class AbstractConfigurationSection implements ConfigurationSection {
private final String configSectionId;
@@ -58,4 +62,5 @@ public abstract class AbstractConfigurat
public KarafPlatformModel getParent() {
return parent;
}
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/AbstractPropertiesConfigurationSection.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/AbstractPropertiesConfigurationSection.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/AbstractPropertiesConfigurationSection.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/AbstractPropertiesConfigurationSection.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/AbstractPropertiesConfigurationSection.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/AbstractPropertiesConfigurationSection.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/AbstractPropertiesConfigurationSection.java Mon Jan 9 09:24:53 2012
@@ -1,17 +1,25 @@
-/**
- * Copyright (c) 2009 Stephen Evanchik
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * 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
*
- * Contributors:
- * Stephen Evanchik - initial implementation
+ * 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 info.evanchik.eclipse.karaf.core.configuration;
+package org.apache.karaf.eik.core.configuration;
-import info.evanchik.eclipse.karaf.core.KarafPlatformModel;
-import info.evanchik.eclipse.karaf.core.internal.KarafCorePluginActivator;
+import org.apache.karaf.eik.core.KarafPlatformModel;
+import org.apache.karaf.eik.core.internal.KarafCorePluginActivator;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -23,10 +31,6 @@ import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
abstract public class AbstractPropertiesConfigurationSection extends AbstractConfigurationSection {
private Properties properties;
@@ -117,4 +121,5 @@ abstract public class AbstractProperties
protected void setProperties(Properties p) {
this.properties = p;
}
+
}
Added: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/ConfigurationSection.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/ConfigurationSection.java?rev=1229068&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/ConfigurationSection.java (added)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/ConfigurationSection.java Mon Jan 9 09:24:53 2012
@@ -0,0 +1,59 @@
+/*
+ * 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.eik.core.configuration;
+
+import org.apache.karaf.eik.core.KarafPlatformModel;
+
+import org.eclipse.core.runtime.IStatus;
+
+public interface ConfigurationSection {
+
+ /**
+ * The name of the file where these configuration items are typically stored
+ *
+ * @return the name of the file that backs this configuration section
+ */
+ public String getFilename();
+
+ /**
+ * Getter for the identifier of this configuration section.
+ *
+ * @return the identifier, in reverse domain notation, of this configuration
+ * section.
+ */
+ public String getId();
+
+ /**
+ * Getter for the parent {@link KarafTargetPlatform}
+ *
+ * @return a {@link KarafTargetPlatform}
+ */
+ public KarafPlatformModel getParent();
+
+ /**
+ * Loads the configuration data for this section
+ */
+ public IStatus load();
+
+ /**
+ * Saves the configuration data for this section
+ */
+ public IStatus save();
+
+}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/FeaturesSection.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/FeaturesSection.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/FeaturesSection.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/FeaturesSection.java Mon Jan 9 09:24:53 2012
@@ -16,14 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.eik.core.configuration;
-public interface Lock {
+import java.util.List;
- boolean lock() throws Exception;
+public interface FeaturesSection extends ConfigurationSection {
- void release() throws Exception;
+ public List<String> getBootFeatureNames();
- boolean isAlive() throws Exception;
+ public List<String> getRepositoryList();
+
+ public void setBootFeatureNames(List<String> bootFeatureNames);
+
+ public void setRepositoryList(List<String> repositoryList);
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/GeneralSection.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/GeneralSection.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/GeneralSection.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/GeneralSection.java Mon Jan 9 09:24:53 2012
@@ -16,14 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.eik.core.configuration;
-public interface Lock {
-
- boolean lock() throws Exception;
-
- void release() throws Exception;
-
- boolean isAlive() throws Exception;
+public interface GeneralSection extends ConfigurationSection {
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/ManagementSection.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/ManagementSection.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/ManagementSection.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/ManagementSection.java Mon Jan 9 09:24:53 2012
@@ -16,14 +16,39 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.eik.core.configuration;
-public interface Lock {
+import java.net.URL;
- boolean lock() throws Exception;
+public interface ManagementSection extends ConfigurationSection {
- void release() throws Exception;
+ /**
+ * Getter for the JMX MBeanServer port
+ *
+ * @return the JXM MBeanServer port
+ */
+ public int getPort();
- boolean isAlive() throws Exception;
+ /**
+ * The JMX Realm
+ *
+ * @return the JMX realm
+ */
+ public String getRealm();
+
+ /**
+ * The complete {@link URL} to the JMX MBeanServer
+ *
+ * @return the {@link URL} to the JMX MBeanServer
+ */
+ public URL getUrl();
+
+ /**
+ * Setter for the port that the JMX MBeanServer will listen on
+ *
+ * @param port
+ * the JMX MBeanServer port
+ */
+ public void setPort(int port);
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/ShellSection.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/ShellSection.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/ShellSection.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/ShellSection.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/ShellSection.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/ShellSection.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/ShellSection.java Mon Jan 9 09:24:53 2012
@@ -1,21 +1,25 @@
-/**
- * Copyright (c) 2011 Stephen Evanchik
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * 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
*
- * Contributors:
- * Stephen Evanchik - initial implementation
+ * 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 info.evanchik.eclipse.karaf.core.configuration;
+package org.apache.karaf.eik.core.configuration;
import java.io.File;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public interface ShellSection extends ConfigurationSection {
/**
@@ -48,4 +52,5 @@ public interface ShellSection extends Co
* public/private key pair.
*/
File getHostKey();
+
}
Added: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/StartupSection.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/StartupSection.java?rev=1229068&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/StartupSection.java (added)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/StartupSection.java Mon Jan 9 09:24:53 2012
@@ -0,0 +1,44 @@
+/*
+ * 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.eik.core.configuration;
+
+public interface StartupSection extends ConfigurationSection {
+
+ /**
+ * Determines if the specified bundle will be started by Karaf during its
+ * initialization.
+ *
+ * @param bundleSymbolicName
+ * the symbolic name of the bundle
+ * @return true if the plugin is listed in the startup configuration for
+ * Karaf, false otherwise
+ */
+ public boolean containsPlugin(String bundleSymbolicName);
+
+ /**
+ * Getter for the start level of the bundle specified by the symbolic name.
+ *
+ * @param bundleSymbolicName
+ * the symbolic name of the bundle
+ * @return the start level of the bundle, null if the bundle does not exist
+ * in the system startup configuration.
+ */
+ public String getStartLevel(String bundleSymbolicName);
+
+}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/SystemSection.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/SystemSection.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/SystemSection.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/SystemSection.java Mon Jan 9 09:24:53 2012
@@ -16,14 +16,27 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.eik.core.configuration;
-public interface Lock {
+public interface SystemSection extends ConfigurationSection {
- boolean lock() throws Exception;
+ /**
+ * Getter for a System property that is set during Karaf execution
+ *
+ * @param key
+ * the key of the System property
+ * @return the value of the System property
+ */
+ public String getProperty(String key);
- void release() throws Exception;
-
- boolean isAlive() throws Exception;
+ /**
+ * Setter for a System property that is set during Karaf execution
+ *
+ * @param key
+ * the key of the System property
+ * @param value
+ * the value of the System property
+ */
+ public void setProperty(String key, String value);
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/FeaturesSectionImpl.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/internal/FeaturesSectionImpl.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/FeaturesSectionImpl.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/FeaturesSectionImpl.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/internal/FeaturesSectionImpl.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/internal/FeaturesSectionImpl.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/FeaturesSectionImpl.java Mon Jan 9 09:24:53 2012
@@ -1,38 +1,42 @@
-/**
- * Copyright (c) 2011 Stephen Evanchik
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * 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
*
- * Contributors:
- * Stephen Evanchik - initial implementation
+ * 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 info.evanchik.eclipse.karaf.core.configuration.internal;
+package org.apache.karaf.eik.core.configuration.internal;
-import info.evanchik.eclipse.karaf.core.KarafCorePluginUtils;
-import info.evanchik.eclipse.karaf.core.KarafPlatformModel;
-import info.evanchik.eclipse.karaf.core.configuration.AbstractPropertiesConfigurationSection;
-import info.evanchik.eclipse.karaf.core.configuration.FeaturesSection;
+import org.apache.karaf.eik.core.KarafCorePluginUtils;
+import org.apache.karaf.eik.core.KarafPlatformModel;
+import org.apache.karaf.eik.core.configuration.AbstractPropertiesConfigurationSection;
+import org.apache.karaf.eik.core.configuration.FeaturesSection;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public class FeaturesSectionImpl extends AbstractPropertiesConfigurationSection
implements FeaturesSection {
- public static final String FEATURE_FILENAME = "org.apache.karaf.features.cfg"; // $NON-NLS-1$
+ public static final String FEATURE_FILENAME = "org.apache.karaf.features.cfg";
- public static final String FEATURE_SECTION_ID = "info.evanchik.eclipse.karaf.configuration.section.Features"; // $NON-NLS-1$
+ public static final String FEATURE_SECTION_ID = "org.apache.karaf.eik.configuration.section.Features";
- private static final String FEATURES_BOOT_KEY = "featuresBoot"; // $NON-NLS-1$
+ private static final String FEATURES_BOOT_KEY = "featuresBoot";
- private static final String FEATURES_REPOSITORIES_KEY = "featuresRepositories"; // $NON-NLS-1$
+ private static final String FEATURES_REPOSITORIES_KEY = "featuresRepositories";
/**
*
@@ -49,7 +53,7 @@ public class FeaturesSectionImpl extends
return Collections.emptyList();
}
- final String[] bootFeatures = rawBootFeatures.split(","); // $NON-NLS-1$
+ final String[] bootFeatures = rawBootFeatures.split(",");
return Arrays.asList(bootFeatures);
}
@@ -61,22 +65,23 @@ public class FeaturesSectionImpl extends
return Collections.emptyList();
}
- final String[] repositories = rawRepositories.split(","); // $NON-NLS-1$
+ final String[] repositories = rawRepositories.split(",");
return Arrays.asList(repositories);
}
@Override
public void setBootFeatureNames(final List<String> bootFeatures) {
- final String property = KarafCorePluginUtils.join(bootFeatures, ","); // $NON-NLS-1$
+ final String property = KarafCorePluginUtils.join(bootFeatures, ",");
getProperties().setProperty(FEATURES_BOOT_KEY, property);
}
@Override
public void setRepositoryList(final List<String> featuresRepositories) {
- final String property = KarafCorePluginUtils.join(featuresRepositories, ","); // $NON-NLS-1$
+ final String property = KarafCorePluginUtils.join(featuresRepositories, ",");
getProperties().setProperty(FEATURES_REPOSITORIES_KEY, property);
}
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/GeneralSectionImpl.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/GeneralSectionImpl.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/GeneralSectionImpl.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/GeneralSectionImpl.java Mon Jan 9 09:24:53 2012
@@ -16,14 +16,23 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.eik.core.configuration.internal;
-public interface Lock {
+import org.apache.karaf.eik.core.KarafPlatformModel;
+import org.apache.karaf.eik.core.configuration.AbstractPropertiesConfigurationSection;
+import org.apache.karaf.eik.core.configuration.GeneralSection;
- boolean lock() throws Exception;
+public class GeneralSectionImpl extends AbstractPropertiesConfigurationSection implements GeneralSection {
- void release() throws Exception;
+ public static final String GENERAL_SECTION_ID = "org.apache.karaf.eik.configuration.section.General";
- boolean isAlive() throws Exception;
+ public static final String GENERAL_FILENAME = "config.properties";
+
+ /**
+ * @param parent
+ */
+ public GeneralSectionImpl(KarafPlatformModel parent) {
+ super(GENERAL_SECTION_ID, GENERAL_FILENAME, parent);
+ }
}
Added: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/ManagementSectionImpl.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/ManagementSectionImpl.java?rev=1229068&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/ManagementSectionImpl.java (added)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/ManagementSectionImpl.java Mon Jan 9 09:24:53 2012
@@ -0,0 +1,82 @@
+/*
+ * 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.eik.core.configuration.internal;
+
+import org.apache.karaf.eik.core.KarafPlatformModel;
+import org.apache.karaf.eik.core.configuration.AbstractPropertiesConfigurationSection;
+import org.apache.karaf.eik.core.configuration.ManagementSection;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+public class ManagementSectionImpl extends AbstractPropertiesConfigurationSection implements ManagementSection {
+
+ public static final String MANAGEMENT_SECTION_ID = "org.apache.karaf.eik.configuration.section.Management";
+
+ /**
+ * @param parent
+ * @param filename
+ */
+ public ManagementSectionImpl(final KarafPlatformModel parent, final String filename) {
+ super(MANAGEMENT_SECTION_ID, filename, parent);
+ }
+
+ @Override
+ public int getPort() {
+ final String portString = getProperties().getProperty("rmiRegistryPort");
+ return new Integer(portString);
+ }
+
+ @Override
+ public String getRealm() {
+ return getProperties().getProperty("jmxRealm");
+ }
+
+ @Override
+ public URL getUrl() {
+ try {
+ final String url = getProperties().getProperty("serviceUrl");
+ return new URL(url);
+ } catch (final MalformedURLException e) {
+ }
+
+ return null;
+ }
+
+ @Override
+ public void setPort(final int port) {
+ getProperties().setProperty("rmiRegistryPort", new Integer(port).toString());
+ getProperties().setProperty("serviceUrl", makeJMXUrl(new Integer(port).toString()));
+ }
+
+ private String makeJMXUrl(final String port) {
+ final StringBuilder sb = new StringBuilder();
+
+ // Build up something like:
+ // service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi
+ sb.append("service:jmx:rmi:///jndi/rmi://");
+ sb.append("localhost");
+ sb.append(":");
+ sb.append(port);
+ sb.append("/jmxrmi");
+
+ return sb.toString();
+ }
+
+}
Added: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/ShellSectionImpl.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/ShellSectionImpl.java?rev=1229068&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/ShellSectionImpl.java (added)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/ShellSectionImpl.java Mon Jan 9 09:24:53 2012
@@ -0,0 +1,60 @@
+/*
+ * 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.eik.core.configuration.internal;
+
+import org.apache.karaf.eik.core.KarafPlatformModel;
+import org.apache.karaf.eik.core.configuration.AbstractPropertiesConfigurationSection;
+import org.apache.karaf.eik.core.configuration.ShellSection;
+
+import java.io.File;
+
+public class ShellSectionImpl extends AbstractPropertiesConfigurationSection
+ implements ShellSection {
+
+ public static final String FILENAME = "org.apache.karaf.shell.cfg";
+
+ public static final String SECTION_ID = "org.apache.karaf.eik.configuration.section.Shell";
+
+ public ShellSectionImpl(final KarafPlatformModel parent) {
+ super(SECTION_ID, FILENAME, parent);
+ }
+
+ @Override
+ public Integer getSshPort() {
+ final String portString = getProperties().getProperty("sshPort");
+ return new Integer(portString);
+ }
+
+ @Override
+ public String getSshHost() {
+ return getProperties().getProperty("sshHost");
+ }
+
+ @Override
+ public String getSshRealm() {
+ return getProperties().getProperty("sshRealm");
+ }
+
+ @Override
+ public File getHostKey() {
+ final String fileString = getProperties().getProperty("hostKey");
+ return new File(fileString);
+ }
+
+}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/StartupSectionImpl.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/internal/StartupSectionImpl.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/StartupSectionImpl.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/StartupSectionImpl.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/internal/StartupSectionImpl.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/internal/StartupSectionImpl.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/StartupSectionImpl.java Mon Jan 9 09:24:53 2012
@@ -1,19 +1,27 @@
-/**
- * Copyright (c) 2009 Stephen Evanchik
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * 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
*
- * Contributors:
- * Stephen Evanchik - initial implementation
+ * 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 info.evanchik.eclipse.karaf.core.configuration.internal;
+package org.apache.karaf.eik.core.configuration.internal;
-import info.evanchik.eclipse.karaf.core.KarafPlatformModel;
-import info.evanchik.eclipse.karaf.core.configuration.AbstractPropertiesConfigurationSection;
-import info.evanchik.eclipse.karaf.core.configuration.StartupSection;
-import info.evanchik.eclipse.karaf.core.internal.KarafCorePluginActivator;
+import org.apache.karaf.eik.core.KarafPlatformModel;
+import org.apache.karaf.eik.core.configuration.AbstractPropertiesConfigurationSection;
+import org.apache.karaf.eik.core.configuration.StartupSection;
+import org.apache.karaf.eik.core.internal.KarafCorePluginActivator;
import java.io.File;
import java.util.LinkedHashMap;
@@ -22,10 +30,6 @@ import java.util.Map;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.osgi.service.resolver.BundleDescription;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public class StartupSectionImpl extends AbstractPropertiesConfigurationSection implements
StartupSection {
@@ -56,7 +60,7 @@ public class StartupSectionImpl extends
}
}
- public static final String STARTUP_SECTION_ID = "info.evanchik.eclipse.karaf.configuration.section.Startup";
+ public static final String STARTUP_SECTION_ID = "org.apache.karaf.eik.configuration.section.Startup";
public static final String STARTUP_FILENAME = "startup.properties";
@@ -132,4 +136,5 @@ public class StartupSectionImpl extends
}
}
}
+
}
Added: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/SystemSectionImpl.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/SystemSectionImpl.java?rev=1229068&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/SystemSectionImpl.java (added)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/SystemSectionImpl.java Mon Jan 9 09:24:53 2012
@@ -0,0 +1,47 @@
+/*
+ * 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.eik.core.configuration.internal;
+
+import org.apache.karaf.eik.core.KarafPlatformModel;
+import org.apache.karaf.eik.core.configuration.AbstractPropertiesConfigurationSection;
+import org.apache.karaf.eik.core.configuration.SystemSection;
+
+public class SystemSectionImpl extends AbstractPropertiesConfigurationSection implements
+ SystemSection {
+
+ public static String SYSTEM_SECTION_ID = "org.apache.karaf.eik.configuration.section.System";
+
+ public static String SYSTEM_FILENAME = "system.properties";
+
+ /**
+ * @param parent
+ */
+ public SystemSectionImpl(KarafPlatformModel parent) {
+ super(SYSTEM_SECTION_ID, SYSTEM_FILENAME, parent);
+ }
+
+ public String getProperty(String key) {
+ return getProperties().getProperty(key);
+ }
+
+ public void setProperty(String key, String value) {
+ getProperties().setProperty(key, value);
+ }
+
+}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/equinox/BundleEntry.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/equinox/BundleEntry.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/equinox/BundleEntry.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/equinox/BundleEntry.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/equinox/BundleEntry.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/equinox/BundleEntry.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/equinox/BundleEntry.java Mon Jan 9 09:24:53 2012
@@ -1,30 +1,31 @@
-/**
- * Copyright (c) 2009 Stephen Evanchik
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * 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
*
- * Contributors:
- * Stephen Evanchik - initial implementation
+ * 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 info.evanchik.eclipse.karaf.core.equinox;
+package org.apache.karaf.eik.core.equinox;
import java.net.MalformedURLException;
import java.net.URL;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public class BundleEntry {
/**
* A builder to help facilitate the construction of {@link BundleEntry}
- * objects
- *
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
+ * objects.
*/
public static class Builder {
@@ -157,8 +158,6 @@ public class BundleEntry {
* A simple class to distinguish between simple bundle entries and URL
* bundle entries.
*
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
*/
private static class UrlBundleEntry extends BundleEntry {