Return-Path: Delivered-To: apmail-incubator-felix-commits-archive@www.apache.org Received: (qmail 85521 invoked from network); 3 Mar 2006 03:47:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Mar 2006 03:47:46 -0000 Received: (qmail 46038 invoked by uid 500); 3 Mar 2006 03:48:33 -0000 Delivered-To: apmail-incubator-felix-commits-archive@incubator.apache.org Received: (qmail 46018 invoked by uid 500); 3 Mar 2006 03:48:33 -0000 Mailing-List: contact felix-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: felix-dev@incubator.apache.org Delivered-To: mailing list felix-commits@incubator.apache.org Received: (qmail 46007 invoked by uid 99); 3 Mar 2006 03:48:32 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Mar 2006 19:48:32 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 02 Mar 2006 19:48:32 -0800 Received: (qmail 85456 invoked by uid 65534); 3 Mar 2006 03:47:24 -0000 Message-ID: <20060303034724.85455.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r382640 - in /incubator/felix/sandbox/akarasulu/mavenized: ./ org.osgi/ org.osgi/src/main/java/org/osgi/framework/ org.osgi/src/main/java/org/osgi/service/condpermadmin/ Date: Fri, 03 Mar 2006 03:47:23 -0000 To: felix-commits@incubator.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Thu Mar 2 19:47:21 2006 New Revision: 382640 URL: http://svn.apache.org/viewcvs?rev=382640&view=rev Log: got osgi code separated and compiling ... o made the filter class load using a system property using a hack - will change this later using what is advised by OSGi alliance o modified top level pom to include OSGi framework build o ignoring some build byproducts in module dir Modified: incubator/felix/sandbox/akarasulu/mavenized/org.osgi/ (props changed) incubator/felix/sandbox/akarasulu/mavenized/org.osgi/pom.xml incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/AdminPermission.java incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/BundlePermission.java incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/FrameworkUtil.java incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/PackagePermission.java incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/ServicePermission.java incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/service/condpermadmin/BundleSignerCondition.java incubator/felix/sandbox/akarasulu/mavenized/pom.xml Propchange: incubator/felix/sandbox/akarasulu/mavenized/org.osgi/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 2 19:47:21 2006 @@ -0,0 +1,10 @@ +target +*.ipr +*.iws +*.iml +.classpath +.project +.settings +.deployables +.wtpmodules +*.log Modified: incubator/felix/sandbox/akarasulu/mavenized/org.osgi/pom.xml URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/org.osgi/pom.xml?rev=382640&r1=382639&r2=382640&view=diff ============================================================================== --- incubator/felix/sandbox/akarasulu/mavenized/org.osgi/pom.xml (original) +++ incubator/felix/sandbox/akarasulu/mavenized/org.osgi/pom.xml Thu Mar 2 19:47:21 2006 @@ -6,6 +6,6 @@ 4.0.0 jar - Apache Felix OSGi Packages + Apache Felix OSGi Framework felix-osgi Modified: incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/AdminPermission.java URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/AdminPermission.java?rev=382640&r1=382639&r2=382640&view=diff ============================================================================== --- incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/AdminPermission.java (original) +++ incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/AdminPermission.java Thu Mar 2 19:47:21 2006 @@ -10,11 +10,12 @@ package org.osgi.framework; + import java.io.IOException; import java.io.InputStream; import java.security.*; import java.util.*; -import org.apache.felix.framework.FilterImpl; + /** * Indicates the caller's authority to perform specific privileged administrative @@ -622,7 +623,7 @@ filter = filterBuf.toString(); } //end if (pos != -1) - filterImpl = new FilterImpl(filter); + filterImpl = FrameworkUtil.createFilter( filter ); } catch (InvalidSyntaxException e) { //we will return null } Modified: incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/BundlePermission.java URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/BundlePermission.java?rev=382640&r1=382639&r2=382640&view=diff ============================================================================== --- incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/BundlePermission.java (original) +++ incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/BundlePermission.java Thu Mar 2 19:47:21 2006 @@ -71,7 +71,8 @@ | ACTION_HOST | ACTION_FRAGMENT; private final static int ACTION_NONE = 0; - private final static int ACTION_ERROR = 0x80000000; +// NOT USED!!! +// private final static int ACTION_ERROR = 0x80000000; /** * The actions mask. Modified: incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/FrameworkUtil.java URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/FrameworkUtil.java?rev=382640&r1=382639&r2=382640&view=diff ============================================================================== --- incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/FrameworkUtil.java (original) +++ incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/FrameworkUtil.java Thu Mar 2 19:47:21 2006 @@ -10,7 +10,9 @@ package org.osgi.framework; -import org.apache.felix.framework.FilterImpl; + +import java.lang.reflect.Constructor; + /** * Framework Utility class. @@ -22,9 +24,15 @@ * @version $Revision: 1.1 $ * @since 1.3 */ -public class FrameworkUtil { +public class FrameworkUtil +{ + private static final Class[] CONST_ARGS = new Class[] { String.class }; + private static final String FILTER_IMPL_FQCN = "org.osgi.framework.filterImplFQCN"; + private static final String FILTER_IMPL_DEFAULT = "org.apache.felix.framework.FilterImpl"; + private static Class filterImplClass; + - /** + /** * Creates a Filter object. This Filter object * may be used to match a ServiceReference object or a * Dictionary object. @@ -41,8 +49,37 @@ * * @see Filter */ - public static Filter createFilter(String filter) - throws InvalidSyntaxException { - return new FilterImpl(filter); + public static Filter createFilter( String filter ) throws InvalidSyntaxException + { + if ( filterImplClass == null ) + { + String fqcn = System.getProperty( FILTER_IMPL_FQCN ); + if ( fqcn == null ) + { + fqcn = FILTER_IMPL_DEFAULT; + } + + try + { + filterImplClass = Class.forName( fqcn ); + } + catch ( ClassNotFoundException e ) + { + throw new RuntimeException( "Failed to load filter implementation class: " + fqcn ); + } + } + + Constructor constructor; + try + { + constructor = filterImplClass.getConstructor( CONST_ARGS ); + Filter instance = ( Filter ) constructor.newInstance( new Object[] { filter } ); + return instance; + } + catch ( Exception e ) + { + throw new RuntimeException( "Failed to instantiate filter using implementation class: " + + filterImplClass.getName() ); + } } } Modified: incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/PackagePermission.java URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/PackagePermission.java?rev=382640&r1=382639&r2=382640&view=diff ============================================================================== --- incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/PackagePermission.java (original) +++ incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/PackagePermission.java Thu Mar 2 19:47:21 2006 @@ -55,7 +55,8 @@ private final static int ACTION_ALL = ACTION_EXPORT | ACTION_IMPORT; private final static int ACTION_NONE = 0; - private final static int ACTION_ERROR = 0x80000000; +// NOT USED +// private final static int ACTION_ERROR = 0x80000000; /** * The actions mask. Modified: incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/ServicePermission.java URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/ServicePermission.java?rev=382640&r1=382639&r2=382640&view=diff ============================================================================== --- incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/ServicePermission.java (original) +++ incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/framework/ServicePermission.java Thu Mar 2 19:47:21 2006 @@ -47,7 +47,8 @@ private final static int ACTION_ALL = ACTION_GET | ACTION_REGISTER; private final static int ACTION_NONE = 0; - private final static int ACTION_ERROR = 0x80000000; +// NOT USED!! +// private final static int ACTION_ERROR = 0x80000000; /** * The actions mask. Modified: incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/service/condpermadmin/BundleSignerCondition.java URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/service/condpermadmin/BundleSignerCondition.java?rev=382640&r1=382639&r2=382640&view=diff ============================================================================== --- incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/service/condpermadmin/BundleSignerCondition.java (original) +++ incubator/felix/sandbox/akarasulu/mavenized/org.osgi/src/main/java/org/osgi/service/condpermadmin/BundleSignerCondition.java Thu Mar 2 19:47:21 2006 @@ -34,9 +34,12 @@ * * @version $Revision: 1.4 $ */ -public class BundleSignerCondition { - private static final String CONDITION_TYPE = "org.osgi.service.condpermadmin.BundleSignerCondition"; - /** +public class BundleSignerCondition +{ +// NOT USED!!! +// private static final String CONDITION_TYPE = "org.osgi.service.condpermadmin.BundleSignerCondition"; + + /** * Constructs a condition that tries to match the passed Bundle's location * to the location pattern. * Modified: incubator/felix/sandbox/akarasulu/mavenized/pom.xml URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/pom.xml?rev=382640&r1=382639&r2=382640&view=diff ============================================================================== --- incubator/felix/sandbox/akarasulu/mavenized/pom.xml (original) +++ incubator/felix/sandbox/akarasulu/mavenized/pom.xml Thu Mar 2 19:47:21 2006 @@ -7,5 +7,6 @@ 1.0-SNAPSHOT tools/maven2/maven-osgi-plugin + org.osgi