Modified: felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstance.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstance.java?rev=770981&r1=770975&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstance.java (original) +++ felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstance.java Sat May 2 19:57:13 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.servicemix.kernel.jaas.config.impl; +package org.apache.felix.karaf.jaas.config.impl; import java.io.BufferedInputStream; import java.io.File; @@ -41,8 +41,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.servicemix.kernel.jaas.config.KeystoreInstance; -import org.apache.servicemix.kernel.jaas.config.KeystoreIsLocked; +import org.apache.felix.karaf.jaas.config.KeystoreInstance; +import org.apache.felix.karaf.jaas.config.KeystoreIsLocked; import org.springframework.core.io.Resource; /**
Modified: felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstanceParser.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstanceParser.java?rev=770981&r1=770975&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstanceParser.java (original) +++ felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstanceParser.java Sat May 2 19:57:13 2009 @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.servicemix.kernel.jaas.config.impl; +package org.apache.felix.karaf.jaas.config.impl; import org.w3c.dom.Element; -import org.apache.servicemix.kernel.jaas.config.KeystoreInstance; +import org.apache.felix.karaf.jaas.config.KeystoreInstance; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.beans.factory.parsing.BeanComponentDefinition; Modified: felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.handlers URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.handlers?rev=770981&r1=770980&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.handlers (original) +++ felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.handlers Sat May 2 19:57:13 2009 @@ -16,5 +16,5 @@ # limitations under the License. # ################################################################################ -http\://servicemix.apache.org/jaas = org.apache.servicemix.kernel.jaas.config.impl.NamespaceHandler - \ No newline at end of file +http\://servicemix.apache.org/jaas = org.apache.felix.karaf.jaas.config.impl.NamespaceHandler + Modified: felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.schemas URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.schemas?rev=770981&r1=770980&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.schemas (original) +++ felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.schemas Sat May 2 19:57:13 2009 @@ -16,4 +16,4 @@ # limitations under the License. # ################################################################################ -http\://servicemix.apache.org/schema/servicemix-jaas.xsd = org/apache/servicemix/kernel/jaas/config/servicemix-jaas.xsd +http\://servicemix.apache.org/schema/servicemix-jaas.xsd = org/apache/felix/karaf/jaas/config/servicemix-jaas.xsd Modified: felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring/servicemix-jaas.xml URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring/servicemix-jaas.xml?rev=770981&r1=770980&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring/servicemix-jaas.xml (original) +++ felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring/servicemix-jaas.xml Sat May 2 19:57:13 2009 @@ -30,30 +30,30 @@ http://www.springframework.org/schema/osgi/spring-osgi.xsd";> <bean id="config" - class="org.apache.servicemix.kernel.jaas.config.impl.OsgiConfiguration" + class="org.apache.felix.karaf.jaas.config.impl.OsgiConfiguration" init-method="init" destroy-method="close"/> <osgi:list id="realms" - interface="org.apache.servicemix.kernel.jaas.config.JaasRealm" + interface="org.apache.felix.karaf.jaas.config.JaasRealm" cardinality="0..N"> <osgi:listener ref="config" bind-method="register" unbind-method="unregister" /> </osgi:list> <bean id="proxyLoginModuleInitializer" - class="org.apache.servicemix.kernel.jaas.config.impl.ProxyLoginModuleInitializer" + class="org.apache.felix.karaf.jaas.config.impl.ProxyLoginModuleInitializer" init-method="init"/> <!-- Register the Straight-Through flow --> - <bean id="keystoreManager" class="org.apache.servicemix.kernel.jaas.config.impl.OsgiKeystoreManager" /> + <bean id="keystoreManager" class="org.apache.felix.karaf.jaas.config.impl.OsgiKeystoreManager" /> <osgi:service ref="keystoreManager"> <osgi:interfaces> - <value>org.apache.servicemix.kernel.jaas.config.KeystoreManager</value> + <value>org.apache.felix.karaf.jaas.config.KeystoreManager</value> </osgi:interfaces> </osgi:service> <osgi:list id="keystores" - interface="org.apache.servicemix.kernel.jaas.config.KeystoreInstance" + interface="org.apache.felix.karaf.jaas.config.KeystoreInstance" cardinality="0..N"> <osgi:listener ref="keystoreManager" bind-method="register" unbind-method="unregister" /> </osgi:list> Propchange: felix/trunk/karaf/jaas/jaas-config/src/main/resources/org/apache/felix/karaf/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: felix/trunk/karaf/jaas/jaas-config/src/test/java/org/apache/felix/karaf/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: felix/trunk/karaf/jaas/jaas-config/src/test/java/org/apache/felix/karaf/jaas/config/NamespaceHandlerTest.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-config/src/test/java/org/apache/felix/karaf/jaas/config/NamespaceHandlerTest.java?rev=770981&r1=770975&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/jaas/jaas-config/src/test/java/org/apache/felix/karaf/jaas/config/NamespaceHandlerTest.java (original) +++ felix/trunk/karaf/jaas/jaas-config/src/test/java/org/apache/felix/karaf/jaas/config/NamespaceHandlerTest.java Sat May 2 19:57:13 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.servicemix.kernel.jaas.config; +package org.apache.felix.karaf.jaas.config; import java.util.Dictionary; import java.util.Hashtable; @@ -23,8 +23,8 @@ import javax.security.auth.login.AppConfigurationEntry; import junit.framework.TestCase; -import org.apache.servicemix.kernel.jaas.boot.ProxyLoginModule; -import org.apache.servicemix.kernel.jaas.config.impl.Config; +import org.apache.felix.karaf.jaas.boot.ProxyLoginModule; +import org.apache.felix.karaf.jaas.config.impl.Config; import org.easymock.EasyMock; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.aryEq; @@ -82,7 +82,7 @@ assertNotNull(cfg.getModules()); assertEquals(1, cfg.getModules().length); assertNotNull(cfg.getModules()[0]); - assertEquals("org.apache.servicemix.kernel.jaas.config.SimpleLoginModule", cfg.getModules()[0].getClassName()); + assertEquals("org.apache.felix.karaf.jaas.config.SimpleLoginModule", cfg.getModules()[0].getClassName()); assertEquals("required", cfg.getModules()[0].getFlags()); assertNotNull(cfg.getModules()[0].getOptions()); assertEquals(1, cfg.getModules()[0].getOptions().size()); @@ -97,7 +97,7 @@ assertNotNull(options); assertEquals(3, options.size()); assertEquals("value", options.get("key")); - assertEquals("org.apache.servicemix.kernel.jaas.config.SimpleLoginModule", options.get(ProxyLoginModule.PROPERTY_MODULE)); + assertEquals("org.apache.felix.karaf.jaas.config.SimpleLoginModule", options.get(ProxyLoginModule.PROPERTY_MODULE)); assertEquals("32", options.get(ProxyLoginModule.PROPERTY_BUNDLE)); // Test keystore Modified: felix/trunk/karaf/jaas/jaas-config/src/test/resources/config.xml URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-config/src/test/resources/config.xml?rev=770981&r1=770980&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/jaas/jaas-config/src/test/resources/config.xml (original) +++ felix/trunk/karaf/jaas/jaas-config/src/test/resources/config.xml Sat May 2 19:57:13 2009 @@ -33,7 +33,7 @@ http://servicemix.apache.org/schema/servicemix-jaas.xsd";> <jaas:config id="realm"> - <jaas:module className="org.apache.servicemix.kernel.jaas.config.SimpleLoginModule" flags="required"> + <jaas:module className="org.apache.felix.karaf.jaas.config.SimpleLoginModule" flags="required"> key=value </jaas:module> </jaas:config> Modified: felix/trunk/karaf/jaas/jaas-config/src/test/resources/privatestore.jks URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-config/src/test/resources/privatestore.jks?rev=770981&r1=770980&r2=770981&view=diff ============================================================================== Binary files - no diff available. Modified: felix/trunk/karaf/jaas/jaas-modules/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-modules/pom.xml?rev=770981&r1=770980&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/jaas/jaas-modules/pom.xml (original) +++ felix/trunk/karaf/jaas/jaas-modules/pom.xml Sat May 2 19:57:13 2009 @@ -22,16 +22,16 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.servicemix.kernel.jaas</groupId> + <groupId>org.apache.felix.karaf.jaas</groupId> <artifactId>jaas</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> - <groupId>org.apache.servicemix.kernel.jaas</groupId> - <artifactId>org.apache.servicemix.kernel.jaas.modules</artifactId> + <groupId>org.apache.felix.karaf.jaas</groupId> + <artifactId>org.apache.felix.karaf.jaas.modules</artifactId> <packaging>bundle</packaging> <version>1.2.0-SNAPSHOT</version> - <name>Apache ServiceMix Kernel :: JAAS Modules</name> + <name>Apache Felix Karaf :: JAAS Modules</name> <description> Provides the JAAS Config @@ -39,8 +39,8 @@ <dependencies> <dependency> - <groupId>org.apache.servicemix.kernel.jaas</groupId> - <artifactId>org.apache.servicemix.kernel.jaas.config</artifactId> + <groupId>org.apache.felix.karaf.jaas</groupId> + <artifactId>org.apache.felix.karaf.jaas.config</artifactId> </dependency> <dependency> @@ -75,10 +75,10 @@ <instructions> <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> <Export-Package> - org.apache.servicemix.kernel.jaas.modules*;version=${project.version};-split-package:=merge-first + org.apache.felix.karaf.jaas.modules*;version=${project.version};-split-package:=merge-first </Export-Package> <Import-Package> - org.apache.servicemix.kernel.jaas.config, + org.apache.felix.karaf.jaas.config, org.springframework.beans.factory.config, * </Import-Package> @@ -89,4 +89,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> Propchange: felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/RolePrincipal.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/RolePrincipal.java?rev=770981&r1=770975&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/RolePrincipal.java (original) +++ felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/RolePrincipal.java Sat May 2 19:57:13 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.servicemix.kernel.jaas.modules; +package org.apache.felix.karaf.jaas.modules; import java.security.Principal; Modified: felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/UserPrincipal.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/UserPrincipal.java?rev=770981&r1=770975&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/UserPrincipal.java (original) +++ felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/UserPrincipal.java Sat May 2 19:57:13 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.servicemix.kernel.jaas.modules; +package org.apache.felix.karaf.jaas.modules; import java.security.Principal; Modified: felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/ConfigAdminHolder.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/ConfigAdminHolder.java?rev=770981&r1=770975&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/ConfigAdminHolder.java (original) +++ felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/ConfigAdminHolder.java Sat May 2 19:57:13 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.servicemix.kernel.jaas.modules.osgi; +package org.apache.felix.karaf.jaas.modules.osgi; import org.osgi.service.cm.ConfigurationAdmin; Modified: felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java?rev=770981&r1=770975&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java (original) +++ felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java Sat May 2 19:57:13 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.servicemix.kernel.jaas.modules.osgi; +package org.apache.felix.karaf.jaas.modules.osgi; import java.io.IOException; import java.security.Principal; @@ -33,8 +33,8 @@ import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; -import org.apache.servicemix.kernel.jaas.modules.RolePrincipal; -import org.apache.servicemix.kernel.jaas.modules.UserPrincipal; +import org.apache.felix.karaf.jaas.modules.RolePrincipal; +import org.apache.felix.karaf.jaas.modules.UserPrincipal; import org.osgi.service.cm.Configuration; public class OsgiConfigLoginModule implements LoginModule { Modified: felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/properties/PropertiesLoginModule.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/properties/PropertiesLoginModule.java?rev=770981&r1=770975&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/properties/PropertiesLoginModule.java (original) +++ felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/properties/PropertiesLoginModule.java Sat May 2 19:57:13 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.servicemix.kernel.jaas.modules.properties; +package org.apache.felix.karaf.jaas.modules.properties; import java.io.File; import java.io.IOException; @@ -36,8 +36,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.servicemix.kernel.jaas.modules.RolePrincipal; -import org.apache.servicemix.kernel.jaas.modules.UserPrincipal; +import org.apache.felix.karaf.jaas.modules.RolePrincipal; +import org.apache.felix.karaf.jaas.modules.UserPrincipal; /** * JAAS Login module for user / password, based on two properties files. Modified: felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml?rev=770981&r1=770980&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml (original) +++ felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml Sat May 2 19:57:13 2009 @@ -35,14 +35,14 @@ - on this service, which means any bundle could access all the passwords. --> <!-- - <bean id="configAdminHolder" class="org.apache.servicemix.kernel.jaas.modules.osgi.ConfigAdminHolder"> + <bean id="configAdminHolder" class="org.apache.felix.karaf.jaas.modules.osgi.ConfigAdminHolder"> <property name="service" ref="configAdmin" /> </bean> <osgi:reference id="configAdmin" interface="org.osgi.service.cm.ConfigurationAdmin" /> <jaas:config id="servicemix"> - <jaas:module className="org.apache.servicemix.kernel.jaas.modules.osgi.OsgiConfigLoginModule" flags="required"> + <jaas:module className="org.apache.felix.karaf.jaas.modules.osgi.OsgiConfigLoginModule" flags="required"> pid = org.apache.servicemix.users </jaas:module> </jaas:config> @@ -52,9 +52,9 @@ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" /> <jaas:config id="servicemix"> - <jaas:module className="org.apache.servicemix.kernel.jaas.modules.properties.PropertiesLoginModule" flags="required"> + <jaas:module className="org.apache.felix.karaf.jaas.modules.properties.PropertiesLoginModule" flags="required"> users = ${servicemix.base}/etc/users.properties </jaas:module> </jaas:config> -</beans> \ No newline at end of file +</beans> Modified: felix/trunk/karaf/jaas/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/pom.xml?rev=770981&r1=770980&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/jaas/pom.xml (original) +++ felix/trunk/karaf/jaas/pom.xml Sat May 2 19:57:13 2009 @@ -22,16 +22,16 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.servicemix.kernel</groupId> + <groupId>org.apache.felix.karaf</groupId> <artifactId>kernel</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> - <groupId>org.apache.servicemix.kernel.jaas</groupId> + <groupId>org.apache.felix.karaf.jaas</groupId> <artifactId>jaas</artifactId> <packaging>pom</packaging> <version>1.2.0-SNAPSHOT</version> - <name>Apache ServiceMix Kernel :: JAAS</name> + <name>Apache Felix Karaf :: JAAS</name> <modules> <module>jaas-boot</module> @@ -39,4 +39,4 @@ <module>jaas-modules</module> </modules> -</project> \ No newline at end of file +</project> Modified: felix/trunk/karaf/main/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/pom.xml?rev=770981&r1=770980&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/main/pom.xml (original) +++ felix/trunk/karaf/main/pom.xml Sat May 2 19:57:13 2009 @@ -22,16 +22,16 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.servicemix.kernel</groupId> + <groupId>org.apache.felix.karaf</groupId> <artifactId>kernel</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> - <groupId>org.apache.servicemix.kernel</groupId> - <artifactId>org.apache.servicemix.kernel.main</artifactId> + <groupId>org.apache.felix.karaf</groupId> + <artifactId>org.apache.felix.karaf.main</artifactId> <packaging>bundle</packaging> <version>1.2.0-SNAPSHOT</version> - <name>Apache ServiceMix Kernel :: Main</name> + <name>Apache Felix Karaf :: Main</name> <dependencies> <dependency> @@ -56,13 +56,13 @@ <configuration> <instructions> <_donotcopy>(CVS|.svn|config.properties)</_donotcopy> - <Main-Class>org.apache.servicemix.kernel.main.Main</Main-Class> + <Main-Class>org.apache.felix.karaf.main.Main</Main-Class> <Bundle-Name>Apache ServiceMix</Bundle-Name> <Bundle-Description>OSGi R4 framework.</Bundle-Description> <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName> - <Export-Package>org.apache.servicemix.kernel.main.spi.*;version=${pom.version}</Export-Package> + <Export-Package>org.apache.felix.karaf.main.spi.*;version=${pom.version}</Export-Package> <Private-Package> - org.apache.servicemix.kernel.main;-split-package:=merge-first, + org.apache.felix.karaf.main;-split-package:=merge-first, org.apache.felix.moduleloader.*;-split-package:=merge-first, org.apache.felix.framework.*;-split-package:=merge-first, org.osgi.framework.launch*, Propchange: felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java?rev=770981&r1=770975&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java (original) +++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java Sat May 2 19:57:13 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.servicemix.kernel.main; +package org.apache.felix.karaf.main; import java.sql.Connection; import java.sql.DriverManager; Modified: felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Lock.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Lock.java?rev=770981&r1=770975&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Lock.java (original) +++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Lock.java Sat May 2 19:57:13 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.servicemix.kernel.main; +package org.apache.felix.karaf.main; public interface Lock { Modified: felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java?rev=770981&r1=770975&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java (original) +++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java Sat May 2 19:57:13 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.servicemix.kernel.main; +package org.apache.felix.karaf.main; import java.io.File; import java.io.FileNotFoundException; @@ -42,7 +42,7 @@ import org.apache.felix.framework.cache.BundleCache; import org.apache.felix.framework.util.FelixConstants; import org.apache.felix.framework.util.StringMap; -import org.apache.servicemix.kernel.main.spi.MainService; +import org.apache.felix.karaf.main.spi.MainService; import org.osgi.framework.Bundle; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; Modified: felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java?rev=770981&r1=770975&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java (original) +++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java Sat May 2 19:57:13 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.servicemix.kernel.main; +package org.apache.felix.karaf.main; import java.io.File; import java.io.IOException; Modified: felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java?rev=770981&r1=770975&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java (original) +++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java Sat May 2 19:57:13 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.servicemix.kernel.main; +package org.apache.felix.karaf.main; import java.sql.Connection; import java.sql.ResultSet; Modified: felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/spi/MainService.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/spi/MainService.java?rev=770981&r1=770975&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/spi/MainService.java (original) +++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/spi/MainService.java Sat May 2 19:57:13 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.servicemix.kernel.main.spi; +package org.apache.felix.karaf.main.spi; public interface MainService { @@ -24,4 +24,4 @@ public int getExitCode(); public void setExitCode(int exitCode); -} \ No newline at end of file +} Modified: felix/trunk/karaf/management/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/karaf/management/pom.xml?rev=770981&r1=770980&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/management/pom.xml (original) +++ felix/trunk/karaf/management/pom.xml Sat May 2 19:57:13 2009 @@ -22,16 +22,16 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.servicemix.kernel</groupId> + <groupId>org.apache.felix.karaf</groupId> <artifactId>kernel</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> - <groupId>org.apache.servicemix.kernel</groupId> - <artifactId>org.apache.servicemix.kernel.management</artifactId> + <groupId>org.apache.felix.karaf</groupId> + <artifactId>org.apache.felix.karaf.management</artifactId> <packaging>bundle</packaging> <version>1.2.0-SNAPSHOT</version> - <name>Apache ServiceMix Kernel :: Management</name> + <name>Apache Felix Karaf :: Management</name> <dependencies> <dependency> Modified: felix/trunk/karaf/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/karaf/pom.xml?rev=770981&r1=770980&r2=770981&view=diff ============================================================================== --- felix/trunk/karaf/pom.xml (original) +++ felix/trunk/karaf/pom.xml Sat May 2 19:57:13 2009 @@ -27,11 +27,11 @@ <version>2</version> </parent> - <groupId>org.apache.servicemix.kernel</groupId> + <groupId>org.apache.felix.karaf</groupId> <artifactId>kernel</artifactId> <packaging>pom</packaging> <version>1.2.0-SNAPSHOT</version> - <name>Apache ServiceMix Kernel</name> + <name>Apache Felix Karaf</name> <inceptionYear>2007</inceptionYear> <modules> @@ -181,119 +181,119 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.apache.servicemix.kernel</groupId> - <artifactId>org.apache.servicemix.kernel.main</artifactId> + <groupId>org.apache.felix.karaf</groupId> + <artifactId>org.apache.felix.karaf.main</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel</groupId> - <artifactId>org.apache.servicemix.kernel.client</artifactId> + <groupId>org.apache.felix.karaf</groupId> + <artifactId>org.apache.felix.karaf.client</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel.deployer</groupId> - <artifactId>org.apache.servicemix.kernel.deployer.filemonitor</artifactId> + <groupId>org.apache.felix.karaf.deployer</groupId> + <artifactId>org.apache.felix.karaf.deployer.filemonitor</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel.deployer</groupId> - <artifactId>org.apache.servicemix.kernel.deployer.spring</artifactId> + <groupId>org.apache.felix.karaf.deployer</groupId> + <artifactId>org.apache.felix.karaf.deployer.spring</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel.deployer</groupId> - <artifactId>org.apache.servicemix.kernel.deployer.blueprint</artifactId> + <groupId>org.apache.felix.karaf.deployer</groupId> + <artifactId>org.apache.felix.karaf.deployer.blueprint</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel.deployer</groupId> - <artifactId>org.apache.servicemix.kernel.deployer.features</artifactId> + <groupId>org.apache.felix.karaf.deployer</groupId> + <artifactId>org.apache.felix.karaf.deployer.features</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel</groupId> - <artifactId>org.apache.servicemix.kernel.management</artifactId> + <groupId>org.apache.felix.karaf</groupId> + <artifactId>org.apache.felix.karaf.management</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel</groupId> - <artifactId>org.apache.servicemix.kernel.demos</artifactId> + <groupId>org.apache.felix.karaf</groupId> + <artifactId>org.apache.felix.karaf.demos</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel.gshell</groupId> - <artifactId>org.apache.servicemix.kernel.gshell.core</artifactId> + <groupId>org.apache.felix.karaf.gshell</groupId> + <artifactId>org.apache.felix.karaf.gshell.core</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel.gshell</groupId> - <artifactId>org.apache.servicemix.kernel.gshell.admin</artifactId> + <groupId>org.apache.felix.karaf.gshell</groupId> + <artifactId>org.apache.felix.karaf.gshell.admin</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel.gshell</groupId> - <artifactId>org.apache.servicemix.kernel.gshell.obr</artifactId> + <groupId>org.apache.felix.karaf.gshell</groupId> + <artifactId>org.apache.felix.karaf.gshell.obr</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel.gshell</groupId> - <artifactId>org.apache.servicemix.kernel.gshell.osgi</artifactId> + <groupId>org.apache.felix.karaf.gshell</groupId> + <artifactId>org.apache.felix.karaf.gshell.osgi</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel.gshell</groupId> - <artifactId>org.apache.servicemix.kernel.gshell.log</artifactId> + <groupId>org.apache.felix.karaf.gshell</groupId> + <artifactId>org.apache.felix.karaf.gshell.log</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel.gshell</groupId> - <artifactId>org.apache.servicemix.kernel.gshell.features</artifactId> + <groupId>org.apache.felix.karaf.gshell</groupId> + <artifactId>org.apache.felix.karaf.gshell.features</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel.gshell</groupId> - <artifactId>org.apache.servicemix.kernel.gshell.config</artifactId> + <groupId>org.apache.felix.karaf.gshell</groupId> + <artifactId>org.apache.felix.karaf.gshell.config</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel.gshell</groupId> - <artifactId>org.apache.servicemix.kernel.gshell.packages</artifactId> + <groupId>org.apache.felix.karaf.gshell</groupId> + <artifactId>org.apache.felix.karaf.gshell.packages</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel.jaas</groupId> - <artifactId>org.apache.servicemix.kernel.jaas.boot</artifactId> + <groupId>org.apache.felix.karaf.jaas</groupId> + <artifactId>org.apache.felix.karaf.jaas.boot</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel.jaas</groupId> - <artifactId>org.apache.servicemix.kernel.jaas.config</artifactId> + <groupId>org.apache.felix.karaf.jaas</groupId> + <artifactId>org.apache.felix.karaf.jaas.config</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel.jaas</groupId> - <artifactId>org.apache.servicemix.kernel.jaas.modules</artifactId> + <groupId>org.apache.felix.karaf.jaas</groupId> + <artifactId>org.apache.felix.karaf.jaas.modules</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel.demos</groupId> + <groupId>org.apache.felix.karaf.demos</groupId> <artifactId>smx4web</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel</groupId> - <artifactId>apache-servicemix-kernel</artifactId> + <groupId>org.apache.felix.karaf</groupId> + <artifactId>apache-felix-karaf</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel</groupId> - <artifactId>apache-servicemix-kernel</artifactId> + <groupId>org.apache.felix.karaf</groupId> + <artifactId>apache-felix-karaf</artifactId> <type>zip</type> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.kernel</groupId> - <artifactId>apache-servicemix-kernel</artifactId> + <groupId>org.apache.felix.karaf</groupId> + <artifactId>apache-felix-karaf</artifactId> <classifier>features</classifier> <type>xml</type> <version>${pom.version}</version>
