You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2014/03/31 18:39:01 UTC
svn commit: r1583372 - in /felix/trunk: connect/ connect/src/
connect/src/main/ connect/src/main/java/ connect/src/main/java/org/
connect/src/main/java/org/apache/ connect/src/main/java/org/apache/felix/
connect/src/main/java/org/apache/felix/connect/ ...
Author: gnodet
Date: Mon Mar 31 16:38:59 2014
New Revision: 1583372
URL: http://svn.apache.org/r1583372
Log:
[FELIX-4445] Switch pojosr to Apache Felix Connect
Added:
felix/trunk/connect/
felix/trunk/connect/DEPENDENCIES
- copied, changed from r1583367, felix/trunk/pojosr/DEPENDENCIES
felix/trunk/connect/LICENSE
- copied, changed from r1583367, felix/trunk/pojosr/LICENSE
felix/trunk/connect/NOTICE
- copied, changed from r1583367, felix/trunk/pojosr/NOTICE
felix/trunk/connect/pom.xml
felix/trunk/connect/src/
felix/trunk/connect/src/main/
felix/trunk/connect/src/main/java/
felix/trunk/connect/src/main/java/org/
felix/trunk/connect/src/main/java/org/apache/
felix/trunk/connect/src/main/java/org/apache/felix/
felix/trunk/connect/src/main/java/org/apache/felix/connect/
felix/trunk/connect/src/main/java/org/apache/felix/connect/DirRevision.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/DirRevision.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/EntriesEnumeration.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/EntriesEnumeration.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/EntryFilterEnumeration.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/EntryFilterEnumeration.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/FileEntriesEnumeration.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/FileEntriesEnumeration.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/JarRevision.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/JarRevision.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSR.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoSR.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSRBundle.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoSRBundle.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSRBundleContext.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoSRBundleContext.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoServiceRegistryFactoryImpl.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoServiceRegistryFactoryImpl.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/Revision.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/Revision.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/URLRevision.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/URLRevision.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistrationImpl.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/ServiceRegistrationImpl.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistry.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/ServiceRegistry.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Attribute.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Attribute.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Capability.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Capability.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/CapabilitySet.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/CapabilitySet.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Directive.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Directive.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Requirement.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Requirement.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/SimpleFilter.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/SimpleFilter.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/EventDispatcher.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/EventDispatcher.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ListenerHookInfoImpl.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ListenerHookInfoImpl.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ListenerInfo.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ListenerInfo.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/MapToDictionary.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/MapToDictionary.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ShrinkableCollection.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ShrinkableCollection.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ShrinkableMap.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ShrinkableMap.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/StringComparator.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/StringComparator.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/StringMap.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/StringMap.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/Util.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/Util.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/VersionRange.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/VersionRange.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/
felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/BundleDescriptor.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/BundleDescriptor.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/ClasspathScanner.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/ClasspathScanner.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/PojoServiceRegistry.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/PojoServiceRegistry.java
felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/PojoServiceRegistryFactory.java
- copied, changed from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/PojoServiceRegistryFactory.java
felix/trunk/connect/src/main/resources/
felix/trunk/connect/src/main/resources/META-INF/
felix/trunk/connect/src/main/resources/META-INF/services/
felix/trunk/connect/src/main/resources/META-INF/services/org.apache.felix.connect.launch.PojoServiceRegistryFactory
felix/trunk/connect/src/main/resources/META-INF/services/org.osgi.framework.launch.FrameworkFactory
Removed:
felix/trunk/pojosr/DEPENDENCIES
felix/trunk/pojosr/LICENSE
felix/trunk/pojosr/NOTICE
felix/trunk/pojosr/pom.xml
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/DirRevision.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/EntriesEnumeration.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/EntryFilterEnumeration.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/FileEntriesEnumeration.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/JarRevision.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoSR.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoSRBundle.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoSRBundleContext.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoServiceRegistryFactoryImpl.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/Revision.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/URLRevision.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/ServiceRegistrationImpl.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/ServiceRegistry.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Attribute.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Capability.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/CapabilitySet.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Directive.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Requirement.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/SimpleFilter.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/EventDispatcher.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ListenerHookInfoImpl.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ListenerInfo.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/MapToDictionary.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ShrinkableCollection.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ShrinkableMap.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/StringComparator.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/StringMap.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/Util.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/VersionRange.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/BundleDescriptor.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/ClasspathScanner.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/PojoServiceRegistry.java
felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/PojoServiceRegistryFactory.java
felix/trunk/pojosr/src/main/resources/META-INF/services/de.kalpatec.pojosr.framework.launch.PojoServiceRegistryFactory
felix/trunk/pojosr/src/main/resources/META-INF/services/org.osgi.framework.launch.FrameworkFactory
Copied: felix/trunk/connect/DEPENDENCIES (from r1583367, felix/trunk/pojosr/DEPENDENCIES)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/DEPENDENCIES?p2=felix/trunk/connect/DEPENDENCIES&p1=felix/trunk/pojosr/DEPENDENCIES&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
(empty)
Copied: felix/trunk/connect/LICENSE (from r1583367, felix/trunk/pojosr/LICENSE)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/LICENSE?p2=felix/trunk/connect/LICENSE&p1=felix/trunk/pojosr/LICENSE&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
(empty)
Copied: felix/trunk/connect/NOTICE (from r1583367, felix/trunk/pojosr/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/NOTICE?p2=felix/trunk/connect/NOTICE&p1=felix/trunk/pojosr/NOTICE&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
(empty)
Added: felix/trunk/connect/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/connect/pom.xml?rev=1583372&view=auto
==============================================================================
--- felix/trunk/connect/pom.xml (added)
+++ felix/trunk/connect/pom.xml Mon Mar 31 16:38:59 2014
@@ -0,0 +1,164 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix-parent</artifactId>
+ <version>2.1</version>
+ <relativePath>../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>bundle</packaging>
+ <name>Apache Felix Connect</name>
+ <artifactId>org.apache.felix.connect</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <description>A service registry that enables OSGi style service registry programs without using an OSGi framework.
+ </description>
+ <url>http://felix.apache.org/</url>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/connect</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/connect</developerConnection>
+ <url>http://svn.apache.org/repos/asf/felix/connect</url>
+ </scm>
+ <developers>
+ <developer>
+ <id>karlpauls</id>
+ <name>Karl Pauls</name>
+ <email>karlpauls@gmail.com</email>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.2.0</version>
+ </dependency>
+ </dependencies>
+ <repositories/>
+ <pluginRepositories/>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includes>
+ <include>src/**</include>
+ </includes>
+ <excludes>
+ <exclude>src/main/resources/META-INF/services/org.apache.felix.connect.launch.PojoServiceRegistryFactory</exclude>
+ <exclude>src/main/resources/META-INF/services/org.osgi.framework.launch.FrameworkFactory</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <target>1.5</target>
+ <source>1.5</source>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <executions>
+ <execution>
+ <id>attach-javadoc</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.4</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.felix.connect</Bundle-SymbolicName>
+ <Bundle-Name>Pojo Service Registry</Bundle-Name>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Private-Package>org.osgi.framework.*, org.osgi.service.url, org.osgi.service.packageadmin,
+ org.osgi.service.startlevel, org.osgi.util.tracker, org.apache.felix.connect.*
+ </Private-Package>
+ <Import-Package>!*</Import-Package>
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES,{src/main/resources/}
+ </Include-Resource>
+ <Main-Class>org.apache.felix.connect.PojoSR</Main-Class>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+</project>
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/DirRevision.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/DirRevision.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/DirRevision.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/DirRevision.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/DirRevision.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/DirRevision.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/DirRevision.java Mon Mar 31 16:38:59 2014
@@ -16,16 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework;
+package org.apache.felix.connect;
import java.io.File;
-import java.io.FileInputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
-import java.util.Map;
-
-import de.kalpatec.pojosr.framework.felix.framework.util.StringMap;
class DirRevision extends Revision
{
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/EntriesEnumeration.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/EntriesEnumeration.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/EntriesEnumeration.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/EntriesEnumeration.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/EntriesEnumeration.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/EntriesEnumeration.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/EntriesEnumeration.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework;
+package org.apache.felix.connect;
import java.util.Enumeration;
import java.util.zip.ZipEntry;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/EntryFilterEnumeration.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/EntryFilterEnumeration.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/EntryFilterEnumeration.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/EntryFilterEnumeration.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/EntryFilterEnumeration.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/EntryFilterEnumeration.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/EntryFilterEnumeration.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework;
+package org.apache.felix.connect;
import java.net.MalformedURLException;
import java.net.URL;
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Set;
-import de.kalpatec.pojosr.framework.felix.framework.capabilityset.SimpleFilter;
+import org.apache.felix.connect.felix.framework.capabilityset.SimpleFilter;
class EntryFilterEnumeration<T> implements Enumeration<T>
{
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/FileEntriesEnumeration.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/FileEntriesEnumeration.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/FileEntriesEnumeration.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/FileEntriesEnumeration.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/FileEntriesEnumeration.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/FileEntriesEnumeration.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/FileEntriesEnumeration.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework;
+package org.apache.felix.connect;
import java.io.File;
import java.util.Enumeration;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/JarRevision.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/JarRevision.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/JarRevision.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/JarRevision.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/JarRevision.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/JarRevision.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/JarRevision.java Mon Mar 31 16:38:59 2014
@@ -16,19 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework;
+package org.apache.felix.connect;
import java.io.*;
import java.net.URLStreamHandler;
import java.net.URLConnection;
import java.net.URL;
import java.util.Enumeration;
-import java.util.Map;
import java.util.jar.JarFile;
import java.util.jar.JarEntry;
-import java.util.zip.ZipEntry;
-
-import de.kalpatec.pojosr.framework.felix.framework.util.StringMap;
class JarRevision extends Revision
{
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSR.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoSR.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSR.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSR.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoSR.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoSR.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSR.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework;
+package org.apache.felix.connect;
import java.io.File;
import java.net.JarURLConnection;
@@ -49,12 +49,12 @@ import org.osgi.service.packageadmin.Pac
import org.osgi.service.packageadmin.RequiredBundle;
import org.osgi.service.startlevel.StartLevel;
-import de.kalpatec.pojosr.framework.felix.framework.ServiceRegistry;
-import de.kalpatec.pojosr.framework.felix.framework.util.EventDispatcher;
-import de.kalpatec.pojosr.framework.launch.BundleDescriptor;
-import de.kalpatec.pojosr.framework.launch.ClasspathScanner;
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistry;
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistryFactory;
+import org.apache.felix.connect.felix.framework.ServiceRegistry;
+import org.apache.felix.connect.felix.framework.util.EventDispatcher;
+import org.apache.felix.connect.launch.BundleDescriptor;
+import org.apache.felix.connect.launch.ClasspathScanner;
+import org.apache.felix.connect.launch.PojoServiceRegistry;
+import org.apache.felix.connect.launch.PojoServiceRegistryFactory;
public class PojoSR implements PojoServiceRegistry
{
@@ -78,11 +78,11 @@ public class PojoSR implements PojoServi
{
final Map<String, String> headers = new HashMap<String, String>();
headers.put(Constants.BUNDLE_SYMBOLICNAME,
- "de.kalpatec.pojosr.framework");
- headers.put(Constants.BUNDLE_VERSION, "0.3.0-SNAPSHOT");
+ "org.apache.felix.connect");
+ headers.put(Constants.BUNDLE_VERSION, "0.1.0-SNAPSHOT");
headers.put(Constants.BUNDLE_NAME, "System Bundle");
headers.put(Constants.BUNDLE_MANIFESTVERSION, "2");
- headers.put(Constants.BUNDLE_VENDOR, "kalpatec");
+ headers.put(Constants.BUNDLE_VENDOR, "Apache Software Foundation");
bundleConfig = new HashMap(config);
final Bundle b = new PojoSRBundle(new Revision()
{
@@ -106,7 +106,7 @@ public class PojoSR implements PojoServi
return getClass().getClassLoader().getResource(entryName);
}
}, headers, new Version(0, 0, 1), "file:pojosr", m_reg, m_dispatcher,
- null, 0, "de.kalpatec.pojosr.framework", m_bundles, getClass()
+ null, 0, "org.apache.felix.connect", m_bundles, getClass()
.getClassLoader(), bundleConfig)
{
@Override
@@ -181,7 +181,7 @@ public class PojoSR implements PojoServi
}
};
m_state = Bundle.STOPPING;
- if ("true".equalsIgnoreCase(System.getProperty("de.kalpatec.pojosr.framework.events.sync"))) {
+ if ("true".equalsIgnoreCase(System.getProperty("org.apache.felix.connect.events.sync"))) {
r.run();
}
else {
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSRBundle.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoSRBundle.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSRBundle.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSRBundle.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoSRBundle.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoSRBundle.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSRBundle.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework;
+package org.apache.felix.connect;
import java.io.File;
import java.io.IOException;
@@ -53,10 +53,10 @@ import org.osgi.framework.wiring.BundleW
import org.osgi.framework.wiring.BundleWiring;
-import de.kalpatec.pojosr.framework.felix.framework.ServiceRegistry;
-import de.kalpatec.pojosr.framework.felix.framework.util.EventDispatcher;
-import de.kalpatec.pojosr.framework.felix.framework.util.MapToDictionary;
-import de.kalpatec.pojosr.framework.felix.framework.util.StringMap;
+import org.apache.felix.connect.felix.framework.ServiceRegistry;
+import org.apache.felix.connect.felix.framework.util.EventDispatcher;
+import org.apache.felix.connect.felix.framework.util.MapToDictionary;
+import org.apache.felix.connect.felix.framework.util.StringMap;
class PojoSRBundle implements Bundle, BundleRevisions, BundleRevision
{
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSRBundleContext.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoSRBundleContext.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSRBundleContext.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSRBundleContext.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoSRBundleContext.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoSRBundleContext.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSRBundleContext.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework;
+package org.apache.felix.connect;
import java.io.File;
import java.io.InputStream;
@@ -25,11 +25,9 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Dictionary;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.osgi.framework.AllServiceListener;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
@@ -38,14 +36,13 @@ import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkListener;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
-import de.kalpatec.pojosr.framework.felix.framework.ServiceRegistry;
-import de.kalpatec.pojosr.framework.felix.framework.capabilityset.SimpleFilter;
-import de.kalpatec.pojosr.framework.felix.framework.util.EventDispatcher;
+import org.apache.felix.connect.felix.framework.ServiceRegistry;
+import org.apache.felix.connect.felix.framework.capabilityset.SimpleFilter;
+import org.apache.felix.connect.felix.framework.util.EventDispatcher;
class PojoSRBundleContext implements BundleContext
{
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoServiceRegistryFactoryImpl.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoServiceRegistryFactoryImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoServiceRegistryFactoryImpl.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoServiceRegistryFactoryImpl.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoServiceRegistryFactoryImpl.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/PojoServiceRegistryFactoryImpl.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoServiceRegistryFactoryImpl.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework;
+package org.apache.felix.connect;
import java.io.File;
import java.io.IOException;
@@ -31,20 +31,16 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.BundleException;
-import org.osgi.framework.BundleListener;
import org.osgi.framework.FrameworkEvent;
-import org.osgi.framework.FrameworkListener;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.SynchronousBundleListener;
import org.osgi.framework.Version;
import org.osgi.framework.launch.Framework;
import org.osgi.framework.launch.FrameworkFactory;
-import de.kalpatec.pojosr.framework.launch.ClasspathScanner;
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistry;
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistryFactory;
+import org.apache.felix.connect.launch.ClasspathScanner;
+import org.apache.felix.connect.launch.PojoServiceRegistry;
+import org.apache.felix.connect.launch.PojoServiceRegistryFactory;
public class PojoServiceRegistryFactoryImpl implements
PojoServiceRegistryFactory, FrameworkFactory {
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/Revision.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/Revision.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/Revision.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/Revision.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/Revision.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/Revision.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/Revision.java Mon Mar 31 16:38:59 2014
@@ -16,13 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework;
+package org.apache.felix.connect;
import java.net.URL;
import java.util.Enumeration;
-import org.osgi.framework.wiring.BundleRevision;
-
abstract class Revision
{
public abstract long getLastModified();
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/URLRevision.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/URLRevision.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/URLRevision.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/URLRevision.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/URLRevision.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/URLRevision.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/URLRevision.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework;
+package org.apache.felix.connect;
import java.net.MalformedURLException;
import java.net.URL;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistrationImpl.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/ServiceRegistrationImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistrationImpl.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistrationImpl.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/ServiceRegistrationImpl.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/ServiceRegistrationImpl.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistrationImpl.java Mon Mar 31 16:38:59 2014
@@ -16,18 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework;
+package org.apache.felix.connect.felix.framework;
import java.util.*;
import org.osgi.framework.*;
-import de.kalpatec.pojosr.framework.felix.framework.capabilityset.Attribute;
-import de.kalpatec.pojosr.framework.felix.framework.capabilityset.Capability;
-import de.kalpatec.pojosr.framework.felix.framework.capabilityset.Directive;
-import de.kalpatec.pojosr.framework.felix.framework.util.MapToDictionary;
-import de.kalpatec.pojosr.framework.felix.framework.util.StringMap;
-import de.kalpatec.pojosr.framework.felix.framework.util.Util;
+import org.apache.felix.connect.felix.framework.util.MapToDictionary;
+import org.apache.felix.connect.felix.framework.util.StringMap;
+import org.apache.felix.connect.felix.framework.util.Util;
import org.osgi.framework.wiring.BundleCapability;
import org.osgi.framework.wiring.BundleRevision;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistry.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/ServiceRegistry.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistry.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistry.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/ServiceRegistry.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/ServiceRegistry.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistry.java Mon Mar 31 16:38:59 2014
@@ -16,17 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework;
+package org.apache.felix.connect.felix.framework;
import java.util.*;
import org.osgi.framework.*;
-import org.osgi.framework.hooks.service.*;
-import org.osgi.framework.launch.Framework;
-import de.kalpatec.pojosr.framework.felix.framework.capabilityset.Capability;
-import de.kalpatec.pojosr.framework.felix.framework.capabilityset.CapabilitySet;
-import de.kalpatec.pojosr.framework.felix.framework.capabilityset.SimpleFilter;
+import org.apache.felix.connect.felix.framework.capabilityset.CapabilitySet;
+import org.apache.felix.connect.felix.framework.capabilityset.SimpleFilter;
import org.osgi.framework.wiring.BundleCapability;
public class ServiceRegistry
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Attribute.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Attribute.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Attribute.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Attribute.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Attribute.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Attribute.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Attribute.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework.capabilityset;
+package org.apache.felix.connect.felix.framework.capabilityset;
public class Attribute
{
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Capability.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Capability.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Capability.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Capability.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Capability.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Capability.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Capability.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework.capabilityset;
+package org.apache.felix.connect.felix.framework.capabilityset;
import java.util.List;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/CapabilitySet.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/CapabilitySet.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/CapabilitySet.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/CapabilitySet.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/CapabilitySet.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/CapabilitySet.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/CapabilitySet.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework.capabilityset;
+package org.apache.felix.connect.felix.framework.capabilityset;
import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
@@ -31,7 +31,7 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
-import de.kalpatec.pojosr.framework.felix.framework.util.StringComparator;
+import org.apache.felix.connect.felix.framework.util.StringComparator;
import org.osgi.framework.wiring.BundleCapability;
public class CapabilitySet
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Directive.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Directive.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Directive.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Directive.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Directive.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Directive.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Directive.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework.capabilityset;
+package org.apache.felix.connect.felix.framework.capabilityset;
public class Directive
{
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Requirement.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Requirement.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Requirement.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Requirement.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Requirement.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/Requirement.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/Requirement.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework.capabilityset;
+package org.apache.felix.connect.felix.framework.capabilityset;
import java.util.List;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/SimpleFilter.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/SimpleFilter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/SimpleFilter.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/SimpleFilter.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/SimpleFilter.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/capabilityset/SimpleFilter.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/capabilityset/SimpleFilter.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework.capabilityset;
+package org.apache.felix.connect.felix.framework.capabilityset;
import java.util.ArrayList;
import java.util.List;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/EventDispatcher.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/EventDispatcher.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/EventDispatcher.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/EventDispatcher.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/EventDispatcher.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/EventDispatcher.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/EventDispatcher.java Mon Mar 31 16:38:59 2014
@@ -16,18 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework.util;
+package org.apache.felix.connect.felix.framework.util;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Dictionary;
import java.util.EventListener;
import java.util.EventObject;
-import java.util.Iterator;
import java.util.List;
-import java.util.NoSuchElementException;
-import org.osgi.framework.AllServiceListener;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
@@ -37,13 +34,12 @@ import org.osgi.framework.FrameworkEvent
import org.osgi.framework.FrameworkListener;
import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServicePermission;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.SynchronousBundleListener;
import org.osgi.framework.hooks.service.ListenerHook;
import org.osgi.framework.launch.Framework;
-import de.kalpatec.pojosr.framework.felix.framework.ServiceRegistry;
+import org.apache.felix.connect.felix.framework.ServiceRegistry;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -69,7 +65,7 @@ public class EventDispatcher
private static final List<Request> m_requestPool = new ArrayList<Request>();
private static final boolean m_sync = "true".equalsIgnoreCase(System
- .getProperty("de.kalpatec.pojosr.framework.events.sync"));
+ .getProperty("org.apache.felix.connect.events.sync"));
public EventDispatcher(ServiceRegistry registry)
{
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ListenerHookInfoImpl.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ListenerHookInfoImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ListenerHookInfoImpl.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ListenerHookInfoImpl.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ListenerHookInfoImpl.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ListenerHookInfoImpl.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ListenerHookInfoImpl.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework.util;
+package org.apache.felix.connect.felix.framework.util;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceListener;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ListenerInfo.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ListenerInfo.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ListenerInfo.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ListenerInfo.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ListenerInfo.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ListenerInfo.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ListenerInfo.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework.util;
+package org.apache.felix.connect.felix.framework.util;
import java.util.EventListener;
import org.osgi.framework.Bundle;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/MapToDictionary.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/MapToDictionary.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/MapToDictionary.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/MapToDictionary.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/MapToDictionary.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/MapToDictionary.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/MapToDictionary.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework.util;
+package org.apache.felix.connect.felix.framework.util;
import java.util.*;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ShrinkableCollection.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ShrinkableCollection.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ShrinkableCollection.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ShrinkableCollection.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ShrinkableCollection.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ShrinkableCollection.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ShrinkableCollection.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework.util;
+package org.apache.felix.connect.felix.framework.util;
import java.util.Collection;
import java.util.Iterator;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ShrinkableMap.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ShrinkableMap.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ShrinkableMap.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ShrinkableMap.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ShrinkableMap.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/ShrinkableMap.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/ShrinkableMap.java Mon Mar 31 16:38:59 2014
@@ -16,11 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework.util;
+package org.apache.felix.connect.felix.framework.util;
import java.util.Collection;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
public class ShrinkableMap<K, V> implements Map<K, V>
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/StringComparator.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/StringComparator.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/StringComparator.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/StringComparator.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/StringComparator.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/StringComparator.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/StringComparator.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework.util;
+package org.apache.felix.connect.felix.framework.util;
import java.util.Comparator;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/StringMap.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/StringMap.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/StringMap.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/StringMap.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/StringMap.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/StringMap.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/StringMap.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework.util;
+package org.apache.felix.connect.felix.framework.util;
import java.util.*;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/Util.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/Util.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/Util.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/Util.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/Util.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/Util.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/Util.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework.util;
+package org.apache.felix.connect.felix.framework.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/VersionRange.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/VersionRange.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/VersionRange.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/VersionRange.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/VersionRange.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/felix/framework/util/VersionRange.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/util/VersionRange.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.felix.framework.util;
+package org.apache.felix.connect.felix.framework.util;
import org.osgi.framework.Version;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/BundleDescriptor.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/BundleDescriptor.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/BundleDescriptor.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/BundleDescriptor.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/BundleDescriptor.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/BundleDescriptor.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/BundleDescriptor.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.launch;
+package org.apache.felix.connect.launch;
import java.net.URL;
import java.util.Map;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/ClasspathScanner.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/ClasspathScanner.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/ClasspathScanner.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/ClasspathScanner.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/ClasspathScanner.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/ClasspathScanner.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/ClasspathScanner.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.launch;
+package org.apache.felix.connect.launch;
import java.io.InputStream;
import java.net.URL;
@@ -25,14 +25,11 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-import org.osgi.framework.Constants;
import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkUtil;
-import de.kalpatec.pojosr.framework.felix.framework.util.MapToDictionary;
+import org.apache.felix.connect.felix.framework.util.MapToDictionary;
public class ClasspathScanner
{
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/PojoServiceRegistry.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/PojoServiceRegistry.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/PojoServiceRegistry.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/PojoServiceRegistry.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/PojoServiceRegistry.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/PojoServiceRegistry.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/PojoServiceRegistry.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.launch;
+package org.apache.felix.connect.launch;
import java.util.Dictionary;
import java.util.List;
Copied: felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/PojoServiceRegistryFactory.java (from r1583367, felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/PojoServiceRegistryFactory.java)
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/PojoServiceRegistryFactory.java?p2=felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/PojoServiceRegistryFactory.java&p1=felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/PojoServiceRegistryFactory.java&r1=1583367&r2=1583372&rev=1583372&view=diff
==============================================================================
--- felix/trunk/pojosr/src/main/java/de/kalpatec/pojosr/framework/launch/PojoServiceRegistryFactory.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/launch/PojoServiceRegistryFactory.java Mon Mar 31 16:38:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.kalpatec.pojosr.framework.launch;
+package org.apache.felix.connect.launch;
import java.util.Map;
Added: felix/trunk/connect/src/main/resources/META-INF/services/org.apache.felix.connect.launch.PojoServiceRegistryFactory
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/resources/META-INF/services/org.apache.felix.connect.launch.PojoServiceRegistryFactory?rev=1583372&view=auto
==============================================================================
--- felix/trunk/connect/src/main/resources/META-INF/services/org.apache.felix.connect.launch.PojoServiceRegistryFactory (added)
+++ felix/trunk/connect/src/main/resources/META-INF/services/org.apache.felix.connect.launch.PojoServiceRegistryFactory Mon Mar 31 16:38:59 2014
@@ -0,0 +1 @@
+org.apache.felix.connect.PojoServiceRegistryFactoryImpl
\ No newline at end of file
Added: felix/trunk/connect/src/main/resources/META-INF/services/org.osgi.framework.launch.FrameworkFactory
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/resources/META-INF/services/org.osgi.framework.launch.FrameworkFactory?rev=1583372&view=auto
==============================================================================
--- felix/trunk/connect/src/main/resources/META-INF/services/org.osgi.framework.launch.FrameworkFactory (added)
+++ felix/trunk/connect/src/main/resources/META-INF/services/org.osgi.framework.launch.FrameworkFactory Mon Mar 31 16:38:59 2014
@@ -0,0 +1 @@
+org.apache.felix.connect.PojoServiceRegistryFactoryImpl
\ No newline at end of file