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 [1/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...
Author: jbonofre
Date: Mon Jan 9 09:24:53 2012
New Revision: 1229068
URL: http://svn.apache.org/viewvc?rev=1229068&view=rev
Log:
Update files headers with ASF mention.
Rename of the package.
Added:
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/Activator.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/MainApplication.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/MainApplication.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/PropertyUtils.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/PropertyUtils.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/internal/
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/internal/LockManager.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/internal/LockManager.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/internal/SystemPropertyLoader.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/internal/SystemPropertyLoader.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/BootstrapLogManager.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/BootstrapLogManager.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/DefaultJDBCLock.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/Lock.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/MySQLJDBCLock.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/MySQLJDBCLock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/OracleJDBCLock.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/OracleJDBCLock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/SimpleFileLock.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/Statements.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Statements.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/StringMap.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/StringMap.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/IKarafConstants.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafCorePluginUtils.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafCorePluginUtils.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformDetails.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformModel.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafPlatformModel.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformModelFactory.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformModelRegistry.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafPlatformModelRegistry.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafPlatformValidator.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/KarafWorkingPlatformModel.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/LogWrapper.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/LogWrapper.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/PropertyUtils.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/PropertyUtils.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/SystemBundleNames.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/SystemBundleNames.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/AbstractConfigurationSection.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/AbstractConfigurationSection.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/AbstractPropertiesConfigurationSection.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/AbstractPropertiesConfigurationSection.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/ConfigurationSection.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/FeaturesSection.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/GeneralSection.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/ManagementSection.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/ShellSection.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/ShellSection.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/StartupSection.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/SystemSection.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/FeaturesSectionImpl.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/internal/FeaturesSectionImpl.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/GeneralSectionImpl.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/ManagementSectionImpl.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/ShellSectionImpl.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/StartupSectionImpl.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/internal/StartupSectionImpl.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/configuration/internal/SystemSectionImpl.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/equinox/
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/equinox/BundleEntry.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/equinox/BundleEntry.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/features/
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/features/Bundle.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/features/Feature.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/Feature.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/features/FeatureOnlyPredicate.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/features/FeatureResolverImpl.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/FeatureResolverImpl.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/features/Features.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/Features.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/features/FeaturesRepository.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/FeaturesRepository.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/features/ParentAwareObject.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/features/Repository.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/Repository.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/features/RepositoryOnlyPredicate.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/features/XmlFeaturesRepository.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/XmlFeaturesRepository.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/features/internal/
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/features/internal/ElementTransformer.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/internal/
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/internal/GenericKarafPlatformModelFactory.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/internal/GenericKarafPlatformValidator.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/internal/GenericKarafPlatformValidator.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/internal/KarafCorePluginActivator.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/internal/KarafCorePluginActivator.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/internal/PluginLocVariableResolver.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/internal/PluginLocVariableResolver.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/model/
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/model/AbstractKarafPlatformModel.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/model/AbstractKarafPlatformModel.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/model/GenericKarafPlatformDetails.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/model/GenericKarafPlatformDetails.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/model/GenericKarafPlatformModel.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/model/GenericKarafPlatformModel.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/model/WorkingKarafPlatformModel.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/model/WorkingKarafPlatformModel.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/shell/
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/shell/KarafRemoteShellConnection.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/shell/KarafSshConnectionUrl.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/shell/KarafSshConnectionUrl.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/shell/KarafSshShellConnection.java
- copied, changed from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/shell/KarafSshShellConnection.java
Removed:
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/Activator.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/MainApplication.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/PropertyUtils.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/internal/LockManager.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/internal/SystemPropertyLoader.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/BootstrapLogManager.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Lock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/MySQLJDBCLock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/OracleJDBCLock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/Statements.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/StringMap.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/IKarafConstants.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafCorePluginUtils.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafPlatformDetails.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafPlatformModel.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafPlatformModelFactory.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafPlatformModelRegistry.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafPlatformValidator.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/KarafWorkingPlatformModel.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/LogWrapper.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/PropertyUtils.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/SystemBundleNames.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/AbstractConfigurationSection.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/AbstractPropertiesConfigurationSection.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/ConfigurationSection.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/FeaturesSection.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/GeneralSection.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/ManagementSection.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/ShellSection.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/StartupSection.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/SystemSection.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/internal/FeaturesSectionImpl.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/internal/GeneralSectionImpl.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/internal/ManagementSectionImpl.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/internal/ShellSectionImpl.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/internal/StartupSectionImpl.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/configuration/internal/SystemSectionImpl.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/equinox/BundleEntry.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/Bundle.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/Feature.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/FeatureOnlyPredicate.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/FeatureResolverImpl.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/Features.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/FeaturesRepository.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/ParentAwareObject.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/Repository.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/RepositoryOnlyPredicate.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/XmlFeaturesRepository.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/features/internal/ElementTransformer.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/internal/GenericKarafPlatformModelFactory.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/internal/GenericKarafPlatformValidator.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/internal/KarafCorePluginActivator.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/internal/PluginLocVariableResolver.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/model/AbstractKarafPlatformModel.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/model/GenericKarafPlatformDetails.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/model/GenericKarafPlatformModel.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/model/WorkingKarafPlatformModel.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/shell/KarafRemoteShellConnection.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/shell/KarafSshConnectionUrl.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/src/main/java/info/evanchik/eclipse/karaf/core/shell/KarafSshShellConnection.java
Modified:
karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/artifacts.xml
karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/content.xml
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/META-INF/MANIFEST.MF
karaf/eik/trunk/plugins/org.apache.karaf.eik.app/plugin.xml
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/plugin.xml
karaf/eik/trunk/plugins/org.apache.karaf.eik.core/schema/platformModel.exsd
karaf/eik/trunk/plugins/org.apache.karaf.eik.smk/META-INF/MANIFEST.MF
karaf/eik/trunk/plugins/org.apache.karaf.eik.smk/plugin.xml
karaf/eik/trunk/plugins/org.apache.karaf.eik.smk/src/main/java/info/evanchik/eclipse/smk/ServiceMixKernelPlatformModelFactory.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.smk/src/main/java/info/evanchik/eclipse/smk/internal/ServiceMixKernelActivator.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.smk/src/main/java/info/evanchik/eclipse/smk/internal/ServiceMixKernelPlatformModel.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.smk/src/main/java/info/evanchik/eclipse/smk/internal/ServiceMixKernelPlatformValidator.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.smk/src/main/java/info/evanchik/eclipse/smk/internal/ServiceMixKernelWorkbenchService.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/META-INF/MANIFEST.MF
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/plugin.xml
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/KarafConfigurationTab.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/KarafLaunchConfigurationDelegate.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/KarafLaunchConfigurationInitializer.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/KarafUIPluginActivator.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/console/KarafRemoteConsole.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/features/FeaturesContentProvider.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/features/FeaturesLabelProvider.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/features/FeaturesResolverJob.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/internal/KarafLaunchConfigurationAdapterFactory.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/internal/KarafLaunchUtils.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/internal/KarafRemoteShellConnectJob.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/model/AbstractContentModel.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/model/FeatureRepositoryContentModel.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/model/SystemBundles.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/model/UserBundles.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/KarafProject.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/KarafProjectBuilder.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/NewKarafProjectOperation.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/AbstractKarafBuildUnit.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/ConfigurationFileBuildUnit.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/FeaturesRepositoriesBuildUnit.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/FilteredOsgiFrameworkJarBuildUnit.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/KarafPlatformResourcesBuildUnit.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/KarafRuntimePropertyBuildUnit.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/PopulateObrFileBuildUnit.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/wizards/NewKarafProjectWizard.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/wizards/provisioner/KarafInstallationProvisionerWizard.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/wizards/provisioner/KarafInstallationSelectionPage.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/workbench/KarafWorkbenchService.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/workbench/internal/GenericKarafWorkbenchService.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/META-INF/MANIFEST.MF
karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/KarafWorkbenchActivator.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/internal/KarafMBeanProviderWorkbenchService.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/internal/LocalKarafMBeanProvider.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/jmx/LocalJMXServiceDescriptor.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/ui/editor/KarafPlatformEditorInput.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/ui/editor/KarafPlatformEditorPart.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/ui/editor/KarafPlatformGeneralFormPage.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/ui/editor/KarafPlatformRuntimeFormPage.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/META-INF/MANIFEST.MF
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/src/main/java/info/evanchik/eclipse/karaf/wtp/core/KarafServerLaunchConfiguration.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/src/main/java/info/evanchik/eclipse/karaf/wtp/core/KarafServerLaunchConfigurationInitializer.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/src/main/java/info/evanchik/eclipse/karaf/wtp/core/KarafWtpPluginActivator.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/src/main/java/info/evanchik/eclipse/karaf/wtp/core/runtime/KarafRuntime.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/src/main/java/info/evanchik/eclipse/karaf/wtp/core/runtime/KarafRuntimeClasspathProvider.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/META-INF/MANIFEST.MF
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafWtpUIPluginActivator.java
Modified: karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/artifacts.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/artifacts.xml?rev=1229068&r1=1229067&r2=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/artifacts.xml (original)
+++ karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/artifacts.xml Mon Jan 9 09:24:53 2012
@@ -47,7 +47,7 @@
<property name='download.size' value='1693579'/>
</properties>
</artifact>
- <artifact classifier='osgi.bundle' id='info.evanchik.karaf.app' version='0.5.0.201109050850'>
+ <artifact classifier='osgi.bundle' id='org.apache.karaf.eik.app' version='0.5.0.201109050850'>
<properties size='2'>
<property name='artifact.size' value='4096'/>
<property name='download.size' value='35987'/>
@@ -71,7 +71,7 @@
<property name='download.size' value='7217'/>
</properties>
</artifact>
- <artifact classifier='osgi.bundle' id='info.evanchik.eclipse.karaf.core' version='0.5.3.201109050850'>
+ <artifact classifier='osgi.bundle' id='org.apache.karaf.eik.core' version='0.5.3.201109050850'>
<properties size='2'>
<property name='artifact.size' value='4096'/>
<property name='download.size' value='74064'/>
Modified: karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/content.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/content.xml?rev=1229068&r1=1229067&r2=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/content.xml (original)
+++ karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/content.xml Mon Jan 9 09:24:53 2012
@@ -65,7 +65,7 @@
<required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.debug.ui' range='[3.2.0,4.0.0)'/>
<required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.pde.core' range='[3.2.0,4.0.0)'/>
<required namespace='org.eclipse.equinox.p2.iu' name='org.apache.servicemix.kernel.main' range='1.1.0'/>
- <required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.core' range='0.5.0'/>
+ <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.core' range='0.5.0'/>
<required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.ui' range='0.5.0'/>
<required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.workbench' range='0.5.0'/>
<required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.smk.app' range='0.5.0'/>
@@ -88,22 +88,22 @@
Copyright (c) 2010 Stephen Evanchik
</copyright>
</unit>
- <unit id='info.evanchik.eclipse.karaf.core' version='0.5.3.201109050850'>
- <update id='info.evanchik.eclipse.karaf.core' range='[0.0.0,0.5.3.201109050850)' severity='0'/>
+ <unit id='org.apache.karaf.eik.core' version='0.5.3.201109050850'>
+ <update id='org.apache.karaf.eik.core' range='[0.0.0,0.5.3.201109050850)' severity='0'/>
<properties size='2'>
<property name='org.eclipse.equinox.p2.name' value='Eclipse Integration for Apache Karaf'/>
<property name='org.eclipse.equinox.p2.provider' value='evanchik.info'/>
</properties>
<provides size='10'>
- <provided namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.core' version='0.5.3.201109050850'/>
- <provided namespace='osgi.bundle' name='info.evanchik.eclipse.karaf.core' version='0.5.3.201109050850'/>
- <provided namespace='java.package' name='info.evanchik.eclipse.karaf.core' version='0.0.0'/>
- <provided namespace='java.package' name='info.evanchik.eclipse.karaf.core.configuration' version='0.0.0'/>
- <provided namespace='java.package' name='info.evanchik.eclipse.karaf.core.configuration.internal' version='0.0.0'/>
- <provided namespace='java.package' name='info.evanchik.eclipse.karaf.core.equinox' version='0.0.0'/>
- <provided namespace='java.package' name='info.evanchik.eclipse.karaf.core.features' version='0.0.0'/>
- <provided namespace='java.package' name='info.evanchik.eclipse.karaf.core.model' version='0.0.0'/>
- <provided namespace='java.package' name='info.evanchik.eclipse.karaf.core.shell' version='0.0.0'/>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.core' version='0.5.3.201109050850'/>
+ <provided namespace='osgi.bundle' name='org.apache.karaf.eik.core' version='0.5.3.201109050850'/>
+ <provided namespace='java.package' name='org.apache.karaf.eik.core' version='0.0.0'/>
+ <provided namespace='java.package' name='org.apache.karaf.eik.core.configuration' version='0.0.0'/>
+ <provided namespace='java.package' name='org.apache.karaf.eik.core.configuration.internal' version='0.0.0'/>
+ <provided namespace='java.package' name='org.apache.karaf.eik.core.equinox' version='0.0.0'/>
+ <provided namespace='java.package' name='org.apache.karaf.eik.core.features' version='0.0.0'/>
+ <provided namespace='java.package' name='org.apache.karaf.eik.core.model' version='0.0.0'/>
+ <provided namespace='java.package' name='org.apache.karaf.eik.core.shell' version='0.0.0'/>
<provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
</provides>
<requires size='10'>
@@ -119,14 +119,14 @@
<required namespace='osgi.bundle' name='sshd-core' range='0.5.0'/>
</requires>
<artifacts size='1'>
- <artifact classifier='osgi.bundle' id='info.evanchik.eclipse.karaf.core' version='0.5.3.201109050850'/>
+ <artifact classifier='osgi.bundle' id='org.apache.karaf.eik.core' version='0.5.3.201109050850'/>
</artifacts>
<touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
<touchpointData size='1'>
<instructions size='1'>
- <instruction key='manifest'>
- Bundle-Vendor: evanchik.info
Bundle-ManifestVersion: 2
Bundle-Activator: info.evanchik.eclipse.karaf.core.internal.KarafCorePluginActivator
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",org.eclipse.core.resources;bundle-version="[3.0.0,4.0.0)",org.eclipse.osgi.services;bundle-version="3.2.0",org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)",org.eclipse.pde.ui;bundle-version="[3.2.0,4.0.0)",org.apache.commons.collections;bundle-version="3.2.0",org.jdom;bundle-version="1.0.0",org.apache.mina.core;bundle-version="2.0.0",org.fusesource.jansi;bundle-version="1.5.0",sshd-core;bundle-version="0.5.0"
Bundle-Name: Eclipse Integration for Apache Karaf
Bundle-ActivationPolicy: lazy
Manifest-Version: 1.0
Bundle-SymbolicName: info.evanchik.eclipse.karaf.core;singlet
on:=true
Bundle-Version: 0.5.3.201109050850
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
- </instruction>
+ <instruction key='manifest'><![CDATA[<![CDATA[<![CDATA[<![CDATA[<![CDATA[<![CDATA[<![CDATA[<![CDATA[
+ Bundle-Vendor: evanchik.info
Bundle-ManifestVersion: 2
Bundle-Activator: org.apache.karaf.eik.core.internal.KarafCorePluginActivator
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",org.eclipse.core.resources;bundle-version="[3.0.0,4.0.0)",org.eclipse.osgi.services;bundle-version="3.2.0",org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)",org.eclipse.pde.ui;bundle-version="[3.2.0,4.0.0)",org.apache.commons.collections;bundle-version="3.2.0",org.jdom;bundle-version="1.0.0",org.apache.mina.core;bundle-version="2.0.0",org.fusesource.jansi;bundle-version="1.5.0",sshd-core;bundle-version="0.5.0"
Bundle-Name: Eclipse Integration for Apache Karaf
Bundle-ActivationPolicy: lazy
Manifest-Version: 1.0
Bundle-SymbolicName: info.evanchik.eclipse.karaf.core;singleton:=tru
e
Bundle-Version: 0.5.3.2011org.aporg.apache.karaf.eik.corelipse.karaf.core,info.evanchik.ecorg.apache.karaf.eik.corenfo.evanchik.eclipse.korg.apache.karaf.eik.core,info.evanchik.eclipse.karaf.core.equinoorg.apache.karaf.eik.cororg.apache.karaf.eik.corese.karaf.core.moorg.apache.karaf.eik.corecore.shell
+ ]]>]]>]]>]]>]]>]]>]]>]]></instruction>
</instructions>
</touchpointData>
</unit>
@@ -211,14 +211,14 @@
<required namespace='org.eclipse.equinox.p2.iu' name='sshd-core' range='0.5.0'/>
<required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.text' range='3.6.0'/>
<required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.console' range='3.5.0'/>
- <required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.core' range='0.0.0'/>
+ <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.core' range='0.0.0'/>
<required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.osgi' range='0.0.0'/>
<required namespace='org.eclipse.equinox.p2.iu' name='org.apache.log4j' range='0.0.0'/>
<required namespace='org.eclipse.equinox.p2.iu' name='org.slf4j.api' range='0.0.0'/>
<required namespace='org.eclipse.equinox.p2.iu' name='org.apache.commons.logging' range='0.0.0'/>
- <required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.core' range='[0.5.3.201109050850,0.5.3.201109050850]'/>
+ <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.core' range='[0.5.3.201109050850,0.5.3.201109050850]'/>
<required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.ui' range='[0.5.3.201109050850,0.5.3.201109050850]'/>
- <required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.karaf.app' range='[0.5.0.201109050850,0.5.0.201109050850]'/>
+ <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.app' range='[0.5.0.201109050850,0.5.0.201109050850]'/>
<required namespace='org.eclipse.equinox.p2.iu' name='org.ops4j.pax.url.mvn' range='[1.3.2,1.3.2]'/>
<required namespace='org.eclipse.equinox.p2.iu' name='sshd-core' range='[0.5.0,0.5.0]'/>
<required namespace='org.eclipse.equinox.p2.iu' name='org.fusesource.jansi' range='[1.5.0,1.5.0]'/>
@@ -568,7 +568,7 @@
<required namespace='osgi.bundle' name='org.eclipse.wst.server.ui' range='[1.0.204,2.0.0)'/>
<required namespace='osgi.bundle' name='org.eclipse.wst.server.core' range='[1.0.204,2.0.0)'/>
<required namespace='osgi.bundle' name='org.eclipse.jdt.debug.ui' range='[3.2.0,4.0.0)'/>
- <required namespace='osgi.bundle' name='info.evanchik.eclipse.karaf.core' range='0.5.2'/>
+ <required namespace='osgi.bundle' name='org.apache.karaf.eik.core' range='0.5.2'/>
<required namespace='osgi.bundle' name='info.evanchik.eclipse.karaf.ui' range='0.5.2'/>
</requires>
<artifacts size='1'>
@@ -578,35 +578,35 @@
<touchpointData size='1'>
<instructions size='1'>
<instruction key='manifest'>
- Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.pde.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,2.0.0)",org.eclipse.wst.server.ui;bundle-version="[1.0.204,2.0.0)",org.eclipse.wst.server.core;bundle-version="[1.0.204,2.0.0)",org.eclipse.jdt.debug.ui;bundle-version="[3.2.0,4.0.0)",info.evanchik.eclipse.karaf.core;bundle-version="0.5.2",info.evanchik.eclipse.karaf.ui;bundle-version="0.5.2"
Bundle-Activator: info.evanchik.eclipse.karaf.wtp.ui.KarafWtpUIPluginActivator
Manifest-Version: 1.0
Bundle-Version: 0.5.2.201109050850
Export-Package: info.evanchik.eclipse.karaf.wtp.ui
Bundle-SymbolicName: info.evanchik.eclipse.karaf.wtp.ui;singleton:=true
Bundle-ActivationPolicy: lazy
Bundle-Name: Eclipse WT
P UI Integration
+ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.pde.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,2.0.0)",org.eclipse.wst.server.ui;bundle-version="[1.0.204,2.0.0)",org.eclipse.wst.server.core;bundle-version="[1.0.204,2.0.0)",org.eclipse.jdt.debug.ui;bundle-version="[3.2.0,4.0.0)",org.apache.karaf.eik.core;bundle-version="0.5.2",info.evanchik.eclipse.karaf.ui;bundle-version="0.5.2"
Bundle-Activator: info.evanchik.eclipse.karaf.wtp.ui.KarafWtpUIPluginActivator
Manifest-Version: 1.0
Bundle-Version: 0.5.2.201109050850
Export-Package: info.evanchik.eclipse.karaf.wtp.ui
Bundle-SymbolicName: info.evanchik.eclipse.karaf.wtp.ui;singleton:=true
Bundle-ActivationPolicy: lazy
Bundle-Name: Eclipse WTP UI In
tegration
</instruction>
</instructions>
</touchpointData>
</unit>
- <unit id='info.evanchik.karaf.app' version='0.5.0.201109050850'>
- <update id='info.evanchik.karaf.app' range='[0.0.0,0.5.0.201109050850)' severity='0'/>
+ <unit id='org.apache.karaf.eik.app' version='0.5.0.201109050850'>
+ <update id='org.apache.karaf.eik.app' range='[0.0.0,0.5.0.201109050850)' severity='0'/>
<properties size='2'>
<property name='org.eclipse.equinox.p2.name' value='Aplication definition for Apache Karaf'/>
<property name='org.eclipse.equinox.p2.provider' value='evanchik.info'/>
</properties>
<provides size='4'>
- <provided namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.karaf.app' version='0.5.0.201109050850'/>
- <provided namespace='osgi.bundle' name='info.evanchik.karaf.app' version='0.5.0.201109050850'/>
- <provided namespace='java.package' name='info.evanchik.karaf.app' version='0.0.0'/>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.app' version='0.5.0.201109050850'/>
+ <provided namespace='osgi.bundle' name='org.apache.karaf.eik.app' version='0.5.0.201109050850'/>
+ <provided namespace='java.package' name='org.apache.karaf.eik.app' version='0.0.0'/>
<provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
</provides>
<requires size='1'>
<required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='[3.1.0,4.0.0)'/>
</requires>
<artifacts size='1'>
- <artifact classifier='osgi.bundle' id='info.evanchik.karaf.app' version='0.5.0.201109050850'/>
+ <artifact classifier='osgi.bundle' id='org.apache.karaf.eik.app' version='0.5.0.201109050850'/>
</artifacts>
<touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
<touchpointData size='1'>
<instructions size='1'>
- <instruction key='manifest'>
- Bundle-Vendor: evanchik.info
Bundle-ManifestVersion: 2
Bundle-Activator: info.evanchik.karaf.app.Activator
Bundle-RequiredExecutionEnvironment: JavaSE-1.6,J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)"
Bundle-Name: Aplication definition for Apache Karaf
Bundle-ActivationPolicy: lazy
Manifest-Version: 1.0
Bundle-SymbolicName: info.evanchik.karaf.app;singleton:=true
Bundle-Version: 0.5.0.201109050850
Export-Package: info.evanchik.karaf.app
- </instruction>
+ <instruction key='manifest'><![CDATA[<![CDATA[
+ Bundle-Vendor: evanchik.info
Bundle-ManifestVersion: 2
Bundle-Activator: org.apache.karaf.eik.app.Activator
Bundle-RequiredExecutionEnvironment: JavaSE-1.6,J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)"
Bundle-Name: Aplication definition for Apache Karaf
Bundle-ActivationPolicy: lazy
Manifest-Version: 1.0
Bundle-SymbolicName: info.evanchik.karaf.app;singleton:=true
Bundle-Version: 0.5.0.201109050850
Exportorg.apache.karaf.eik.app.karaf.app
+ ]]>]]></instruction>
</instructions>
</touchpointData>
</unit>
@@ -635,7 +635,7 @@
<required namespace='osgi.bundle' name='org.eclipse.ui.forms' range='3.5.2'/>
<required namespace='osgi.bundle' name='org.eclipse.ui.navigator' range='3.5.0'/>
<required namespace='osgi.bundle' name='org.eclipse.ui.navigator.resources' range='3.4.202'/>
- <required namespace='osgi.bundle' name='info.evanchik.eclipse.karaf.core' range='0.5.3'/>
+ <required namespace='osgi.bundle' name='org.apache.karaf.eik.core' range='0.5.3'/>
<required namespace='osgi.bundle' name='info.evanchik.eclipse.karaf.jmx' range='0.5.0'/>
<required namespace='osgi.bundle' name='info.evanchik.eclipse.karaf.ui' range='0.5.3'/>
<required namespace='java.package' name='javax.management' range='0.0.0'/>
@@ -649,7 +649,7 @@
<touchpointData size='1'>
<instructions size='1'>
<instruction key='manifest'>
- Bundle-ManifestVersion: 2
Export-Package: info.evanchik.eclipse.karaf.workbench,info.evanchik.eclipse.karaf.workbench.factory,info.evanchik.eclipse.karaf.workbench.provider
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",org.eclipse.jface.databinding;bundle-version="1.4.0",org.eclipse.jface.text;bundle-version="3.6.1",org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.ui.editors;bundle-version="3.6.1",org.eclipse.ui.forms;bundle-version="3.5.2",org.eclipse.ui.navigator;bundle-version="3.5.0",org.eclipse.ui.navigator.resources;bundle-version="3.4.202",info.evanchik.eclipse.karaf.core;bundle-version="0.5.3",info.evanchik.eclipse.karaf.jmx;bundle-version="
;0.5.0",info.evanchik.eclipse.karaf.ui;bundle-version="0.5.3"
Bundle-Activator: info.evanchik.eclipse.karaf.workbench.KarafWorkbenchActivator
Bundle-Name: Eclipse Workbench Service Registry for Apache Karaf
Bundle-Version: 0.5.3.201109050850
Bundle-Vendor: evanchik.info
Bundle-SymbolicName: info.evanchik.eclipse.karaf.workbench;singleton:=true
Import-Package: javax.management,org.apache.aries.jmx.codec;version="0.2.0.incubating",org.osgi.jmx.framework;version="1.5.0"
Bundle-ActivationPolicy: lazy
Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
Export-Package: info.evanchik.eclipse.karaf.workbench,info.evanchik.eclipse.karaf.workbench.factory,info.evanchik.eclipse.karaf.workbench.provider
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",org.eclipse.jface.databinding;bundle-version="1.4.0",org.eclipse.jface.text;bundle-version="3.6.1",org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.ui.editors;bundle-version="3.6.1",org.eclipse.ui.forms;bundle-version="3.5.2",org.eclipse.ui.navigator;bundle-version="3.5.0",org.eclipse.ui.navigator.resources;bundle-version="3.4.202",org.apache.karaf.eik.core;bundle-version="0.5.3",info.evanchik.eclipse.karaf.jmx;bundle-version="0.5.0&
quot;,info.evanchik.eclipse.karaf.ui;bundle-version="0.5.3"
Bundle-Activator: info.evanchik.eclipse.karaf.workbench.KarafWorkbenchActivator
Bundle-Name: Eclipse Workbench Service Registry for Apache Karaf
Bundle-Version: 0.5.3.201109050850
Bundle-Vendor: evanchik.info
Bundle-SymbolicName: info.evanchik.eclipse.karaf.workbench;singleton:=true
Import-Package: javax.management,org.apache.aries.jmx.codec;version="0.2.0.incubating",org.osgi.jmx.framework;version="1.5.0"
Bundle-ActivationPolicy: lazy
Manifest-Version: 1.0
</instruction>
</instructions>
</touchpointData>
@@ -804,7 +804,7 @@
<required namespace='osgi.bundle' name='org.eclipse.debug.core' range='[3.2.0,4.0.0)'/>
<required namespace='osgi.bundle' name='org.eclipse.jst.common.project.facet.core' range='1.4.0'/>
<required namespace='osgi.bundle' name='org.osgi.jmx' range='1.0.0'/>
- <required namespace='osgi.bundle' name='info.evanchik.eclipse.karaf.core' range='0.5.2'/>
+ <required namespace='osgi.bundle' name='org.apache.karaf.eik.core' range='0.5.2'/>
<required namespace='osgi.bundle' name='info.evanchik.eclipse.karaf.ui' range='0.5.2'/>
<required namespace='osgi.bundle' name='info.evanchik.eclipse.karaf.workbench' range='0.5.2'/>
</requires>
@@ -815,7 +815,7 @@
<touchpointData size='1'>
<instructions size='1'>
<instruction key='manifest'>
- Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.jst.server.core;bundle-version="[1.1.3,2.0.0)",org.eclipse.pde.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",org.eclipse.wst.server.core;bundle-version="[1.0.204,2.0.0)",org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",org.eclipse.core.runtime,org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",org.eclipse.jst.common.project.facet.core;bundle-version="1.4.0",org.osgi.jmx;bundle-version="1.0.0",info.evanchik.eclipse.karaf.core;bundle-version="0.5.2",info.evanchik.eclipse.karaf.ui;bundle-version="0.5.2",info.evanchik.eclipse.karaf.workbench;bundle-version="0.5.2"
Bundle-Activator: info.evanchik.eclipse.karaf.wtp.co
re.KarafWtpPluginActivator
Manifest-Version: 1.0
Bundle-Version: 0.5.2.201109050850
Export-Package: info.evanchik.eclipse.karaf.wtp.core
Bundle-SymbolicName: info.evanchik.eclipse.karaf.wtp.core;singleton:=true
Bundle-ActivationPolicy: lazy
Bundle-Name: Eclipse WTP Core Integration
+ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.jst.server.core;bundle-version="[1.1.3,2.0.0)",org.eclipse.pde.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",org.eclipse.wst.server.core;bundle-version="[1.0.204,2.0.0)",org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",org.eclipse.core.runtime,org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",org.eclipse.jst.common.project.facet.core;bundle-version="1.4.0",org.osgi.jmx;bundle-version="1.0.0",org.apache.karaf.eik.core;bundle-version="0.5.2",info.evanchik.eclipse.karaf.ui;bundle-version="0.5.2",info.evanchik.eclipse.karaf.workbench;bundle-version="0.5.2"
Bundle-Activator: info.evanchik.eclipse.karaf.wtp.core.Kara
fWtpPluginActivator
Manifest-Version: 1.0
Bundle-Version: 0.5.2.201109050850
Export-Package: info.evanchik.eclipse.karaf.wtp.core
Bundle-SymbolicName: info.evanchik.eclipse.karaf.wtp.core;singleton:=true
Bundle-ActivationPolicy: lazy
Bundle-Name: Eclipse WTP Core Integration
</instruction>
</instructions>
</touchpointData>
@@ -850,7 +850,7 @@
<required namespace='osgi.bundle' name='org.eclipse.pde.ui' range='[3.6.0,4.0.0)'/>
<required namespace='osgi.bundle' name='org.apache.commons.collections' range='[3.2.0,3.2.1]'/>
<required namespace='osgi.bundle' name='org.ops4j.pax.url.mvn' range='1.3.0'/>
- <required namespace='osgi.bundle' name='info.evanchik.eclipse.karaf.core' range='[0.5.3,1.0.0)'/>
+ <required namespace='osgi.bundle' name='org.apache.karaf.eik.core' range='[0.5.3,1.0.0)'/>
</requires>
<artifacts size='1'>
<artifact classifier='osgi.bundle' id='info.evanchik.eclipse.karaf.ui' version='0.5.3.201109050850'/>
@@ -859,7 +859,7 @@
<touchpointData size='1'>
<instructions size='2'>
<instruction key='manifest'>
- Bundle-Vendor: evanchik.info
Bundle-ManifestVersion: 2
Bundle-Activator: info.evanchik.eclipse.karaf.ui.KarafUIPluginActivator
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.ant.core;bundle-version="3.2.201",org.eclipse.core.variables;bundle-version="3.2.400",org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.ui.console;bundle-version="[3.5.0,4.0.0)",org.eclipse.ui.ide;bundle-version="[3.6.0,4.0.0)",org.eclipse.ui.navigator;bundle-version="3.5.0",org.eclipse.ui.navigator.resources;bundle-version="3.4.202",org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",org.eclipse.core.expressions;bundle-version="[3.4.200,4.0.0)",org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",org.eclipse.jface.text;bundle-version="[3.6.0,4.0.0)",org.eclipse.p
de.ui;bundle-version="[3.6.0,4.0.0)",org.apache.commons.collections;bundle-version="[3.2.0,3.2.1]",org.ops4j.pax.url.mvn;bundle-version="1.3.0",info.evanchik.eclipse.karaf.core;bundle-version="[0.5.3,1.0.0)"
Bundle-Name: UI for Eclipse Integration for Apache Karaf
Bundle-ActivationPolicy: lazy
Manifest-Version: 1.0
Bundle-SymbolicName: info.evanchik.eclipse.karaf.ui;singleton:=true
Bundle-Version: 0.5.3.201109050850
Export-Package: info.evanchik.eclipse.karaf.ui,info.evanchik.eclipse.karaf.ui.wizards,info.evanchik.eclipse.karaf.ui.workbench
+ Bundle-Vendor: evanchik.info
Bundle-ManifestVersion: 2
Bundle-Activator: info.evanchik.eclipse.karaf.ui.KarafUIPluginActivator
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.ant.core;bundle-version="3.2.201",org.eclipse.core.variables;bundle-version="3.2.400",org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.ui.console;bundle-version="[3.5.0,4.0.0)",org.eclipse.ui.ide;bundle-version="[3.6.0,4.0.0)",org.eclipse.ui.navigator;bundle-version="3.5.0",org.eclipse.ui.navigator.resources;bundle-version="3.4.202",org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",org.eclipse.core.expressions;bundle-version="[3.4.200,4.0.0)",org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",org.eclipse.jface.text;bundle-version="[3.6.0,4.0.0)",org.eclipse.p
de.ui;bundle-version="[3.6.0,4.0.0)",org.apache.commons.collections;bundle-version="[3.2.0,3.2.1]",org.ops4j.pax.url.mvn;bundle-version="1.3.0",org.apache.karaf.eik.core;bundle-version="[0.5.3,1.0.0)"
Bundle-Name: UI for Eclipse Integration for Apache Karaf
Bundle-ActivationPolicy: lazy
Manifest-Version: 1.0
Bundle-SymbolicName: info.evanchik.eclipse.karaf.ui;singleton:=true
Bundle-Version: 0.5.3.201109050850
Export-Package: info.evanchik.eclipse.karaf.ui,info.evanchik.eclipse.karaf.ui.wizards,info.evanchik.eclipse.karaf.ui.workbench
</instruction>
<instruction key='zipped'>
true
@@ -929,7 +929,7 @@
<required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.text' range='3.6.1'/>
<required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.editors' range='3.6.1'/>
<required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.forms' range='3.5.2'/>
- <required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.core' range='0.5.2'/>
+ <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.core' range='0.5.2'/>
<required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.ui' range='0.5.2'/>
<required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.jmx' range='[0.5.0.201109050850,0.5.0.201109050850]'/>
<required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.workbench' range='[0.5.3.201109050850,0.5.3.201109050850]'/>
@@ -1022,7 +1022,7 @@
<required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.wst.common.project.facet.ui' range='[1.1.0,2.0.0)'/>
<required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.wst.server.ui' range='[1.0.204,2.0.0)'/>
<required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jdt.debug.ui' range='[3.2.0,4.0.0)'/>
- <required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.core' range='0.5.2'/>
+ <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.core' range='0.5.2'/>
<required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.ui' range='0.5.2'/>
<required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.workbench' range='0.5.2'/>
<required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.wtp.core' range='[0.5.2.201109050850,0.5.2.201109050850]'/>
@@ -1099,7 +1099,7 @@
<required namespace='osgi.bundle' name='org.eclipse.debug.ui' range='[3.2.0,4.0.0)'/>
<required namespace='osgi.bundle' name='org.eclipse.pde.core' range='[3.2.0,4.0.0)'/>
<required namespace='osgi.bundle' name='org.apache.servicemix.kernel.main' range='1.1.0'/>
- <required namespace='osgi.bundle' name='info.evanchik.eclipse.karaf.core' range='0.5.0'/>
+ <required namespace='osgi.bundle' name='org.apache.karaf.eik.core' range='0.5.0'/>
<required namespace='osgi.bundle' name='info.evanchik.eclipse.karaf.ui' range='0.5.0'/>
<required namespace='osgi.bundle' name='info.evanchik.eclipse.karaf.workbench' range='0.5.0'/>
<required namespace='osgi.bundle' name='info.evanchik.smk.app' range='0.5.0'/>
@@ -1111,7 +1111,7 @@
<touchpointData size='1'>
<instructions size='1'>
<instruction key='manifest'>
- Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.pde.core;bundle-version="[3.2.0,4.0.0)",org.apache.servicemix.kernel.main;bundle-version="1.1.0",info.evanchik.eclipse.karaf.core;bundle-version="0.5.0",info.evanchik.eclipse.karaf.ui;bundle-version="0.5.0",info.evanchik.eclipse.karaf.workbench;bundle-version="0.5.0",info.evanchik.smk.app;bundle-version="0.5.0"
Bundle-Activator: info.evanchik.eclipse.smk.internal.ServiceMixKernelActivator
Manifest-Version: 1.0
Bundle-Version: 0.5.0.201109050850
Bundle-SymbolicName: info.evanchik.eclipse.smk;singleton:=true
Bundle-ActivationPolicy: lazy
Bundle-Name: Eclipse Platform Model for Apache ServiceMix
Kernel
Bundle-Vendor: evanchik.info
+ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.pde.core;bundle-version="[3.2.0,4.0.0)",org.apache.servicemix.kernel.main;bundle-version="1.1.0",org.apache.karaf.eik.core;bundle-version="0.5.0",info.evanchik.eclipse.karaf.ui;bundle-version="0.5.0",info.evanchik.eclipse.karaf.workbench;bundle-version="0.5.0",info.evanchik.smk.app;bundle-version="0.5.0"
Bundle-Activator: info.evanchik.eclipse.smk.internal.ServiceMixKernelActivator
Manifest-Version: 1.0
Bundle-Version: 0.5.0.201109050850
Bundle-SymbolicName: info.evanchik.eclipse.smk;singleton:=true
Bundle-ActivationPolicy: lazy
Bundle-Name: Eclipse Platform Model for Apache ServiceMix Kernel

Bundle-Vendor: evanchik.info
</instruction>
</instructions>
</touchpointData>
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.app/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.app/META-INF/MANIFEST.MF?rev=1229068&r1=1229067&r2=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.app/META-INF/MANIFEST.MF Mon Jan 9 09:24:53 2012
@@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2
Bundle-Name: Apache Karaf :: EIK :: Plugins :: Aplication Definition
Bundle-SymbolicName: org.apache.karaf.eik.app;singleton:=true
Bundle-Version: 3.0.0.qualifier
-Bundle-Activator: info.evanchik.karaf.app.Activator
+Bundle-Activator: org.apache.karaf.eik.app.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6,
J2SE-1.5
Bundle-Vendor: Apache Software Foundation
-Export-Package: info.evanchik.karaf.app
+Export-Package: org.apache.karaf.eik.app
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.app/plugin.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.app/plugin.xml?rev=1229068&r1=1229067&r2=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/plugin.xml (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.app/plugin.xml Mon Jan 9 09:24:53 2012
@@ -10,7 +10,7 @@
thread="main"
visible="true">
<run
- class="info.evanchik.karaf.app.MainApplication">
+ class="org.apache.karaf.eik.app.MainApplication">
</run>
</application>
</extension>
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/Activator.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/eik/app/Activator.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/Activator.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/eik/app/Activator.java Mon Jan 9 09:24:53 2012
@@ -16,14 +16,47 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.eik.app;
-public interface Lock {
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
- boolean lock() throws Exception;
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.apache.karaf.eik.app";
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
- void release() throws Exception;
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
- boolean isAlive() throws Exception;
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/MainApplication.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/MainApplication.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/MainApplication.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/MainApplication.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/MainApplication.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/MainApplication.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/MainApplication.java Mon Jan 9 09:24:53 2012
@@ -1,30 +1,34 @@
-/**
- * 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.karaf.app;
+package org.apache.karaf.eik.app;
-import info.evanchik.karaf.app.internal.LockManager;
-import info.evanchik.karaf.app.internal.SystemPropertyLoader;
+import org.apache.karaf.eik.app.internal.LockManager;
+import org.apache.karaf.eik.app.internal.SystemPropertyLoader;
import java.util.Properties;
import java.util.logging.Logger;
-import org.apache.felix.karaf.main.BootstrapLogManager;
+import org.apache.karaf.main.BootstrapLogManager;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
import org.osgi.framework.BundleContext;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public class MainApplication implements IApplication {
private static final Logger LOG = Logger.getLogger(MainApplication.class.getName());
@@ -36,7 +40,7 @@ public class MainApplication implements
private BundleContext bundleContext;
public Object start(IApplicationContext context) throws Exception {
- System.out.println("Apache ServiceMix Kernel :: Starting main application");
+ System.out.println("Apache Karaf :: Starting main application");
this.bundleContext = Activator.getDefault().getBundle().getBundleContext();
@@ -58,7 +62,6 @@ public class MainApplication implements
}
public void stop() {
-
try {
LockManager.getInstance().stop();
} catch(Exception e) {
@@ -66,5 +69,4 @@ public class MainApplication implements
}
}
-
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/PropertyUtils.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/PropertyUtils.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/PropertyUtils.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/PropertyUtils.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/PropertyUtils.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/PropertyUtils.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/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.karaf.app;
+package org.apache.karaf.eik.app;
import java.io.File;
import java.io.IOException;
@@ -18,8 +26,7 @@ import java.util.Map;
import java.util.Properties;
/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
+ * Extracted from Karaf Main.
*/
public final class PropertyUtils {
@@ -27,10 +34,6 @@ public final class PropertyUtils {
private static final String DELIM_STOP = "}";
- /*
- * From Karaf Main.java
- */
-
/**
* Retrieves the canonicalized directory from the specified path.
*
@@ -59,6 +62,7 @@ public final class PropertyUtils {
}
return rc;
}
+
/**
* Interpolates variables found in the property string values. A variable is
* {@code $ name} and can be nested {@code $ outer-$ inner} .
@@ -66,8 +70,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) {
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/internal/LockManager.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/internal/LockManager.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/internal/LockManager.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/internal/LockManager.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/internal/LockManager.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/internal/LockManager.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/internal/LockManager.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.karaf.app.internal;
+package org.apache.karaf.eik.app.internal;
-import info.evanchik.karaf.app.Activator;
+import org.apache.karaf.eik.app.Activator;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -31,17 +39,13 @@ import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.felix.karaf.main.Lock;
-import org.apache.felix.karaf.main.SimpleFileLock;
+import org.apache.karaf.main.Lock;
+import org.apache.karaf.main.SimpleFileLock;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.startlevel.StartLevel;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public final class LockManager {
public static LockManager instance = new LockManager();
@@ -305,13 +309,10 @@ public final class LockManager {
}
}
- /**
- *
- * @throws Exception
- */
private void unlock() throws Exception {
if (lock != null) {
lock.release();
}
}
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/internal/SystemPropertyLoader.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/internal/SystemPropertyLoader.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/internal/SystemPropertyLoader.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/internal/SystemPropertyLoader.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/internal/SystemPropertyLoader.java&r1=1228814&r2=1229068&rev=1229068&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/info/evanchik/karaf/app/internal/SystemPropertyLoader.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/eik/app/internal/SystemPropertyLoader.java Mon Jan 9 09:24:53 2012
@@ -1,16 +1,24 @@
-/**
- * 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.karaf.app.internal;
+package org.apache.karaf.eik.app.internal;
-import info.evanchik.karaf.app.PropertyUtils;
+import org.apache.karaf.eik.app.PropertyUtils;
import java.io.File;
import java.io.FileNotFoundException;
@@ -21,10 +29,6 @@ import java.net.URL;
import java.util.Properties;
import java.util.StringTokenizer;
-/**
- * Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public final class SystemPropertyLoader {
public static final String INCLUDES_PROPERTY = "${includes}"; //$NON-NLS-1$
@@ -202,4 +206,5 @@ public final class SystemPropertyLoader
return retVal;
}
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/BootstrapLogManager.java (from r1228814, karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/BootstrapLogManager.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/BootstrapLogManager.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/BootstrapLogManager.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/felix/karaf/main/BootstrapLogManager.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/BootstrapLogManager.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.app/src/main/java/org/apache/karaf/main/BootstrapLogManager.java Mon Jan 9 09:24:53 2012
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.main;
+package org.apache.karaf.main;
-import info.evanchik.karaf.app.PropertyUtils;
+import org.apache.karaf.eik.app.PropertyUtils;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -42,7 +42,10 @@ public class BootstrapLogManager {
private static Properties configProps;
- public static Handler getDefaultHandler () {
+ public static synchronized Handler getDefaultHandler () {
+ if (handler != null) {
+ return handler;
+ }
String filename;
File log;
Properties props = new Properties();
@@ -54,10 +57,10 @@ public class BootstrapLogManager {
// Make a best effort to log to the default file appender configured for log4j
FileInputStream fis = null;
try {
- fis = new FileInputStream("../etc/org.ops4j.pax.logging.cfg");
+ fis = new FileInputStream(System.getProperty("karaf.base") + "../etc/org.ops4j.pax.logging.cfg");
props.load(fis);
} catch (IOException e) {
- props.setProperty("log4j.appender.out.file", "${karaf.base}/data/log/karaf.log");
+ props.setProperty("log4j.appender.out.file", "${karaf.data}/log/karaf.log");
} finally {
if (fis != null) {
try {
@@ -67,11 +70,16 @@ public class BootstrapLogManager {
}
}
}
+
+ if (props.getProperty("log4j.appender.out.file") == null) {
+ // manage if the log4j.appender.out.file property is not present in
+ // the etc/org.ops4j.pax.logging.cfg file
+ props.setProperty("log4j.appender.out.file", "${karaf.data}/log/karaf.log");
+ }
filename = PropertyUtils.substVars(props.getProperty("log4j.appender.out.file"),"log4j.appender.out.file", null, null);
log = new File(filename);
}
-
try {
handler = new BootstrapLogManager.SimpleFileHandler(log);
} catch (IOException e) {
@@ -85,7 +93,6 @@ public class BootstrapLogManager {
BootstrapLogManager.configProps = configProps;
}
-
/**
* Implementation of java.util.logging.Handler that does simple appending
* to a named file. Should be able to use this for bootstrap logging
@@ -120,5 +127,4 @@ public class BootstrapLogManager {
}
}
-
}