You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2009/07/23 18:17:45 UTC
svn commit: r797130 - in /felix/trunk: framework/
framework/src/main/java/org/apache/felix/framework/
framework/src/main/java/org/apache/felix/framework/util/ldap/
framework/src/main/java/org/apache/felix/framework/util/manifestparser/
framework/src/ma...
Author: rickhall
Date: Thu Jul 23 16:17:44 2009
New Revision: 797130
URL: http://svn.apache.org/viewvc?rev=797130&view=rev
Log:
Use OSGi R4.2 implementations of AdminPermission, FrameworkUtil, and
FilterImpl. (FELIX-1404)
Removed:
felix/trunk/framework/src/main/java/org/apache/felix/framework/FilterImpl.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/ldap/
felix/trunk/framework/src/main/java/org/osgi/
Modified:
felix/trunk/framework/pom.xml
felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/Requirement.java
felix/trunk/main/pom.xml
Modified: felix/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/framework/pom.xml?rev=797130&r1=797129&r2=797130&view=diff
==============================================================================
--- felix/trunk/framework/pom.xml (original)
+++ felix/trunk/framework/pom.xml Thu Jul 23 16:17:44 2009
@@ -65,7 +65,7 @@
<Export-Package>org.osgi.framework;-split-package:=merge-first,org.osgi.framework.launch,org.osgi.framework.hooks.service,org.osgi.service.packageadmin,org.osgi.service.url,org.osgi.service.startlevel,org.osgi.util.tracker</Export-Package>
<Private-Package>org.apache.felix.moduleloader.*,org.apache.felix.framework.*</Private-Package>
<Import-Package>!*</Import-Package>
- <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,{src/main/resources/},org/osgi/framework/=target/classes/org/osgi/framework/</Include-Resource>
+ <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,{src/main/resources/}</Include-Resource>
</instructions>
</configuration>
</plugin>
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java?rev=797130&r1=797129&r2=797130&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java Thu Jul 23 16:17:44 2009
@@ -99,7 +99,7 @@
{
checkValidity();
- return new FilterImpl(m_logger, expr);
+ return FrameworkUtil.createFilter(expr);
}
public Bundle installBundle(String location)
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=797130&r1=797129&r2=797130&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Thu Jul 23 16:17:44 2009
@@ -2623,7 +2623,7 @@
throws InvalidSyntaxException
{
m_dispatcher.addListener(
- bundle, ServiceListener.class, l, (f == null) ? null : new FilterImpl(m_logger, f));
+ bundle, ServiceListener.class, l, (f == null) ? null : FrameworkUtil.createFilter(f));
// Invoke the ListenerHook.added() on all hooks.
List listenerHooks = m_registry.getListenerHooks();
@@ -2795,7 +2795,7 @@
Filter filter = null;
if (expr != null)
{
- filter = new FilterImpl(m_logger, expr);
+ filter = FrameworkUtil.createFilter(expr);
}
// Ask the service registry for all matching service references.
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java?rev=797130&r1=797129&r2=797130&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java Thu Jul 23 16:17:44 2009
@@ -20,7 +20,6 @@
import java.util.*;
-import org.apache.felix.framework.FilterImpl;
import org.apache.felix.framework.Logger;
import org.apache.felix.framework.util.FelixConstants;
import org.apache.felix.framework.util.VersionRange;
@@ -214,7 +213,7 @@
// Compute expression
try
{
- FilterImpl filter = new FilterImpl(expr);
+ Filter filter = FrameworkUtil.createFilter(expr);
return filter.match(dict);
}
catch (Exception ex)
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/Requirement.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/Requirement.java?rev=797130&r1=797129&r2=797130&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/Requirement.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/Requirement.java Thu Jul 23 16:17:44 2009
@@ -18,7 +18,6 @@
*/
package org.apache.felix.framework.util.manifestparser;
-import org.apache.felix.framework.FilterImpl;
import org.apache.felix.framework.util.MapToDictionary;
import org.apache.felix.framework.util.VersionRange;
import org.apache.felix.moduleloader.ICapability;
@@ -39,7 +38,7 @@
public Requirement(String namespace, String filterStr) throws InvalidSyntaxException
{
m_namespace = namespace;
- m_filter = new FilterImpl(filterStr);
+ m_filter = FrameworkUtil.createFilter(filterStr);
m_directives = null;
m_attributes = null;
m_isOptional = false;
@@ -362,7 +361,7 @@
try
{
- return new FilterImpl(sb.toString());
+ return FrameworkUtil.createFilter(sb.toString());
}
catch (InvalidSyntaxException ex)
{
Modified: felix/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/main/pom.xml?rev=797130&r1=797129&r2=797130&view=diff
==============================================================================
--- felix/trunk/main/pom.xml (original)
+++ felix/trunk/main/pom.xml Thu Jul 23 16:17:44 2009
@@ -146,23 +146,6 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>unpack</id>
- <phase>validate</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.outputDirectory}</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>1.9.0-SNAPSHOT</version>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
<id>copy</id>
<phase>install</phase>
<goals>