[jboss-osgi-commits] JBoss-OSGI SVN: r101768 - in projects/jboss-osgi/projects/runtime/framework/trunk: core and 8 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Wed Mar 3 05:23:00 EST 2010
Author: thomas.diesler at jboss.com
Date: 2010-03-03 05:22:49 -0500 (Wed, 03 Mar 2010)
New Revision: 101768
Added:
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/
Removed:
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ActivationPolicyMetaData.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/AttributeAware.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/AttributeMetaData.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/DependencyMetaData.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/HolderMetaData.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ListenerMetaData.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ManifestParser.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/NativeLibrary.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/NativeLibraryMetaData.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/OSGiMetaData.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/PackageAttribute.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/Parameter.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ParameterizedAttribute.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ReferenceMetaData.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceControllerContext.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceDeployment.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceMetaData.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceMetaDataVisitor.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceMetaDataVisitorNode.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceValueMetaData.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/VersionRange.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/VersionRangeAttribute.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/internal/
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/util/CaseInsensitiveDictionary.java
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/scripts/
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/etc/
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/bundle/
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/classloading/
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/deployers/
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/launch/
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/packageadmin/
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/plugins/
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/resolver/
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/service/
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/util/
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/vfs/
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/resources/
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/test/
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/AbstractBundleState.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/.classpath
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractOSGiMetaData.java
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
Log:
Externalize framework metadata
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,39 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- ====================================================================== -->
- <!-- -->
- <!-- JBoss, the OpenSource J2EE webOS -->
- <!-- -->
- <!-- Distributable under LGPL license. -->
- <!-- See terms of license at http://www.gnu.org. -->
- <!-- -->
- <!-- ====================================================================== -->
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
- <!-- $Id$ -->
+<!-- $Id$ -->
- <!--
- Set these VM properties in your IDE debugger
-
- -Dlog4j.output.dir=${workspace_loc:jboss-osgi-framework/target}
- -Dlog4j.configuration=log4j-console.xml
- -->
+<!-- Set these VM properties in your IDE debugger -Dlog4j.output.dir=${workspace_loc:jboss-osgi-framework/target} -Dlog4j.configuration=log4j-console.xml -->
<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">
<modelVersion>4.0.0</modelVersion>
<name>JBossOSGi Framework - Core</name>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
<packaging>bundle</packaging>
<parent>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework-parent</artifactId>
<version>1.0.0.Alpha4-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-metadata</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
<groupId>biz.aQute</groupId>
<artifactId>bnd</artifactId>
</dependency>
@@ -362,9 +362,7 @@
</property>
</systemProperties>
<excludes>
- <!-- excludes listed here need to have a jira issue associated
- <exclude>org/jboss/test/osgi/service/ServiceMixUnitTestCase.class</exclude>
- -->
+ <!-- excludes listed here need to have a jira issue associated <exclude>org/jboss/test/osgi/service/ServiceMixUnitTestCase.class</exclude> -->
</excludes>
</configuration>
</plugin>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/AbstractBundleState.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/AbstractBundleState.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/AbstractBundleState.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -43,12 +43,12 @@
import org.jboss.dependency.plugins.tracker.AbstractContextTracker;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.tracker.ContextTracking;
+import org.jboss.osgi.framework.metadata.CaseInsensitiveDictionary;
import org.jboss.osgi.framework.metadata.OSGiMetaData;
import org.jboss.osgi.framework.plugins.BundleStoragePlugin;
import org.jboss.osgi.framework.plugins.FrameworkEventsPlugin;
import org.jboss.osgi.framework.plugins.LifecycleInterceptorServicePlugin;
import org.jboss.osgi.framework.plugins.ServiceManagerPlugin;
-import org.jboss.osgi.framework.util.CaseInsensitiveDictionary;
import org.jboss.osgi.spi.NotImplementedException;
import org.jboss.osgi.spi.util.ConstantsHelper;
import org.jboss.virtual.VirtualFile;
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -45,9 +45,9 @@
import org.jboss.metadata.spi.scope.CommonLevels;
import org.jboss.metadata.spi.scope.Scope;
import org.jboss.metadata.spi.scope.ScopeKey;
+import org.jboss.osgi.framework.metadata.CaseInsensitiveDictionary;
import org.jboss.osgi.framework.plugins.ControllerContextPlugin;
import org.jboss.osgi.framework.plugins.FrameworkEventsPlugin;
-import org.jboss.osgi.framework.util.CaseInsensitiveDictionary;
import org.jboss.osgi.spi.util.BundleClassLoader;
import org.jboss.util.collection.CollectionsFactory;
import org.jboss.util.id.GUID;
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ActivationPolicyMetaData.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ActivationPolicyMetaData.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ActivationPolicyMetaData.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,53 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-import java.util.List;
-
-/**
- * OSGi activation policy metadata.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface ActivationPolicyMetaData
-{
- /**
- * Get the type.
- *
- * @return the type
- */
- String getType();
-
- /**
- * Get include packages.
- *
- * @return the include packages
- */
- List<String> getIncludes();
-
- /**
- * Get the exclude packages.
- *
- * @return the exclude packages
- */
- List<String> getExcludes();
-}
\ No newline at end of file
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/AttributeAware.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/AttributeAware.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/AttributeAware.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,37 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-/**
- * Attribute string value holder.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface AttributeAware
-{
- /**
- * Get the attribute.
- *
- * @return string attribute value
- */
- String getAttribute();
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/AttributeMetaData.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/AttributeMetaData.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/AttributeMetaData.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,44 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-/**
- * ServiceAttributeMetaData.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface AttributeMetaData
-{
- /**
- * Get the name.
- *
- * @return the name.
- */
- String getName();
-
- /**
- * Get the value.
- *
- * @return the value.
- */
- ServiceValueMetaData getValue();
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/DependencyMetaData.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/DependencyMetaData.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/DependencyMetaData.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,37 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-/**
- * Metadata about what a osgi service's dependency.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface DependencyMetaData
-{
- /**
- * What is the dependency
- *
- * @return the dependency
- */
- Object getDependency();
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/HolderMetaData.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/HolderMetaData.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/HolderMetaData.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,62 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-import java.util.Set;
-
-import org.jboss.beans.metadata.spi.ClassLoaderMetaData;
-
-/**
- * Common OSGi meta data mainAttributes.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface HolderMetaData
-{
- /**
- * Get the element id.
- *
- * @return unique string id
- */
- String getId();
-
- /**
- * Get the exposed interface.
- *
- * @return qualified interface name.
- */
- String getInterface();
-
- /**
- * Get the dependencies.
- *
- * @return set of dependencies.
- */
- Set<DependencyMetaData> getDepends();
-
- /**
- * Get the classloader metadata.
- *
- * @return classloader metadata
- */
- ClassLoaderMetaData getContextClassLoader();
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ListenerMetaData.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ListenerMetaData.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ListenerMetaData.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-/**
- * Simple listener meta data - referencing bean as listener.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface ListenerMetaData
-{
- String getRef();
-
- String getBindMethod();
-
- String getUnbindMethod();
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ManifestParser.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ManifestParser.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ManifestParser.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,266 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2009, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-
-// This class is based on some original classes from
-// Apache Felix which is licensed as below
-
-/*
- * 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.
- */
-package org.jboss.osgi.framework.metadata;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.jboss.osgi.framework.metadata.internal.AbstractPackageAttribute;
-import org.jboss.osgi.framework.metadata.internal.AbstractParameter;
-import org.jboss.osgi.framework.metadata.internal.AbstractParameterizedAttribute;
-
-/**
- * ManifestParser.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public class ManifestParser
-{
- /**
- * Parse packages
- *
- * @param header the header
- * @param list the list of packages to create
- */
- public static void parsePackages(String header, List<PackageAttribute> list)
- {
- parse(header, list, true);
- }
-
- /**
- * Parse parameters
- *
- * @param header the header
- * @param list the list of parameters to create
- */
- public static void parseParameters(String header, List<ParameterizedAttribute> list)
- {
- parse(header, list, false);
- }
-
- /**
- * Parse paths
- *
- * @param header the header
- * @param list the list of paths to create
- */
- public static void parsePaths(String header, List<ParameterizedAttribute> list)
- {
- parse(header, list, false);
- }
-
- /**
- * Parse a header
- *
- * @param header the header
- * @param list the list to create
- * @param packages whether to create packages
- */
- @SuppressWarnings({ "rawtypes", "unchecked" })
- public static void parse(String header, List list, boolean packages)
- {
- if (header == null)
- return;
- if (header.length() == 0)
- throw new IllegalArgumentException("Empty header");
-
- // Split the header into clauses using which are seperated by commas
- // Like this: path; path; dir1:=dirval1; dir2:=dirval2; attr1=attrval1; attr2=attrval2,
- // path; path; dir1:=dirval1; dir2:=dirval2; attr1=attrval1; attr2=attrval2
- List<String> clauses = parseDelimitedString(header, ",");
-
- // Now parse each clause
- for (String clause : clauses)
- {
- // Split the cause into paths, directives and attributes using the semi-colon
- // Like this: path; path; dir1:=dirval1; dir2:=dirval2; attr1=attrval1; attr2=attrval2
- List<String> pieces = parseDelimitedString(clause, ";");
-
- // Collect the paths they should be first
- List<String> paths = new ArrayList<String>();
- for (String piece : pieces)
- {
- if (piece.indexOf('=') >= 0)
- break;
- paths.add(unquote(piece));
- }
- if (paths.isEmpty())
- throw new IllegalArgumentException("No paths for " + clause);
-
- Map<String, Parameter> directives = null;
- Map<String, Parameter> attributes = null;
-
- for (int i = paths.size(); i < pieces.size(); ++i)
- {
- String piece = pieces.get(i);
- int seperator = piece.indexOf(":=");
- if (seperator >= 0)
- {
- String name = piece.substring(0, seperator);
- String value = piece.substring(seperator + 2);
- if (directives == null)
- directives = new HashMap<String, Parameter>();
- String unquoted = unquote(name);
- if (directives.containsKey(unquoted))
- throw new IllegalStateException("Dupicate directive: " + unquoted);
- directives.put(unquoted, new AbstractParameter(unquote(value)));
- }
- else
- {
- seperator = piece.indexOf("=");
- if (seperator >= 0)
- {
- String name = piece.substring(0, seperator);
- String value = piece.substring(seperator + 1);
- if (attributes == null)
- attributes = new HashMap<String, Parameter>();
- String unquoted = unquote(name);
- if (attributes.containsKey(unquoted))
- throw new IllegalStateException("Dupicate attribute: " + unquoted);
- attributes.put(unquoted, new AbstractParameter(unquote(value)));
- }
- else
- {
- throw new IllegalArgumentException("Path " + piece + " should appear before attributes and directives in " + clause);
- }
- }
- }
-
- for (String path : paths)
- {
- ParameterizedAttribute metadata = null;
- if (packages)
- metadata = new AbstractPackageAttribute(path, attributes, directives);
- else
- metadata = new AbstractParameterizedAttribute(path, attributes, directives);
-
- list.add(metadata);
- }
-
- }
- }
-
- /**
- * Remove around quotes around a string
- *
- * @param string the string
- * @return the unquoted string
- */
- private static String unquote(String string)
- {
- if (string.length() < 2)
- return string;
- if (string.charAt(0) == '\"' && string.charAt(string.length()-1) == '\"')
- return string.substring(1, string.length()-1);
- return string;
- }
-
- /**
- * Parses delimited string and returns an array containing the tokens. This
- * parser obeys quotes, so the delimiter character will be ignored if it is
- * inside of a quote. This method assumes that the quote character is not
- * included in the set of delimiter characters.
- * @param value the delimited string to parse.
- * @param delim the characters delimiting the tokens.
- * @return an array of string tokens or null if there were no tokens.
- **/
- private static List<String> parseDelimitedString(String value, String delim)
- {
- if (value == null)
- value = "";
-
- List<String> list = new ArrayList<String>();
-
- int CHAR = 1;
- int DELIMITER = 2;
- int STARTQUOTE = 4;
- int ENDQUOTE = 8;
-
- StringBuilder sb = new StringBuilder();
-
- int expecting = (CHAR | DELIMITER | STARTQUOTE);
-
- for (int i = 0; i < value.length(); i++)
- {
- char c = value.charAt(i);
-
- boolean isDelimiter = (delim.indexOf(c) >= 0);
- boolean isQuote = (c == '"');
-
- if (isDelimiter && ((expecting & DELIMITER) > 0))
- {
- list.add(sb.toString().trim());
- sb.delete(0, sb.length());
- expecting = (CHAR | DELIMITER | STARTQUOTE);
- }
- else if (isQuote && ((expecting & STARTQUOTE) > 0))
- {
- sb.append(c);
- expecting = CHAR | ENDQUOTE;
- }
- else if (isQuote && ((expecting & ENDQUOTE) > 0))
- {
- sb.append(c);
- expecting = (CHAR | STARTQUOTE | DELIMITER);
- }
- else if ((expecting & CHAR) > 0)
- {
- sb.append(c);
- }
- else
- {
- throw new IllegalArgumentException("Invalid delimited string: '" + value + "' delimiter=" + delim);
- }
- }
-
- if (sb.length() > 0)
- list.add(sb.toString().trim());
-
- return list;
- }
-
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/NativeLibrary.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/NativeLibrary.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/NativeLibrary.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,141 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-// $Id$
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.jboss.classloading.spi.version.VersionRange;
-
-/**
- * Meta data for native code libraries as defined by OSGi R4V42.
- *
- * 3.9 Loading Native Code Libraries
- * http://www.osgi.org/Download/File?url=/download/r4v42/r4.core.pdf
- *
- * @author thomas.diesler at jboss.com
- * @version $Revision$
- * @since 21-Jan-2010
- */
-public class NativeLibrary implements Serializable
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = -1637806718398794304L;
-
- private List<String> osNames = new ArrayList<String>();
- private String librarySource;
- private String libraryPath;
- private List<String> processors = new ArrayList<String>();
- private List<VersionRange> osVersions = new ArrayList<VersionRange>();
- private List<String> languages = new ArrayList<String>();
- private String selectionFilter;
- private boolean optional;
-
- /**
- * Create a NativeCode instance with mandatory properties.
- * @param osNames The set of OS names
- * @param libraryPath The library path
- * @param librarySource An interface from which to retrieve the actual library location
- */
- public NativeLibrary(List<String> osNames, String libraryPath, String librarySource)
- {
- if (libraryPath == null)
- throw new IllegalArgumentException("Null library path: " + libraryPath);
- if (osNames == null || osNames.isEmpty())
- throw new IllegalArgumentException("Illegal OS names: " + osNames);
- if (librarySource == null)
- throw new IllegalArgumentException("Null file privider: " + librarySource);
-
- this.osNames = osNames;
- this.libraryPath = libraryPath;
- this.librarySource = librarySource;
- }
-
- public String getLibrarySource()
- {
- return librarySource;
- }
-
- public String getLibraryPath()
- {
- return libraryPath;
- }
-
- public List<String> getOsNames()
- {
- return Collections.unmodifiableList(osNames);
- }
-
- public List<VersionRange> getOsVersions()
- {
- return Collections.unmodifiableList(osVersions);
- }
-
- public void setOsVersions(List<VersionRange> osVersions)
- {
- this.osVersions = osVersions;
- }
-
- public List<String> getProcessors()
- {
- return Collections.unmodifiableList(processors);
- }
-
- public void setProcessors(List<String> processors)
- {
- this.processors = processors;
- }
-
- public void setLanguages(List<String> languages)
- {
- this.languages = languages;
- }
-
- public List<String> getLanguages()
- {
- return Collections.unmodifiableList(languages);
- }
-
- public String getSelectionFilter()
- {
- return selectionFilter;
- }
-
- public void setSelectionFilter(String selectionFilter)
- {
- this.selectionFilter = selectionFilter;
- }
-
- public boolean isOptional()
- {
- return optional;
- }
-
- public void setOptional(boolean optional)
- {
- this.optional = optional;
- }
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/NativeLibraryMetaData.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/NativeLibraryMetaData.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/NativeLibraryMetaData.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,81 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-// $Id$
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-
-
-/**
- * Meta data for native code libraries as defined by OSGi R4V42.
- *
- * 3.9 Loading Native Code Libraries
- * http://www.osgi.org/Download/File?url=/download/r4v42/r4.core.pdf
- *
- * @author thomas.diesler at jboss.com
- * @version $Revision$
- * @since 21-Jan-2010
- */
-public class NativeLibraryMetaData implements Serializable
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 7650641261993316609L;
-
- /** The nativeLibraries */
- private List<NativeLibrary> nativeLibraries;
-
- public List<NativeLibrary> getNativeLibraries()
- {
- return nativeLibraries;
- }
-
- public void setNativeLibraries(List<NativeLibrary> nativeLibraries)
- {
- this.nativeLibraries = nativeLibraries;
- }
-
- public void addNativeLibrary(NativeLibrary nativeLibrary)
- {
- if (nativeLibrary == null)
- throw new IllegalArgumentException("Null library");
-
- if (nativeLibraries == null)
- nativeLibraries = new CopyOnWriteArrayList<NativeLibrary>();
-
- nativeLibraries.add(nativeLibrary);
- }
-
- public void removeNativeLibrary(NativeLibrary nativeLibrary)
- {
- if (nativeLibrary == null)
- throw new IllegalArgumentException("Null library");
-
- if (nativeLibraries == null)
- return;
-
- nativeLibraries.remove(nativeLibrary);
- }
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/OSGiMetaData.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/OSGiMetaData.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/OSGiMetaData.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,201 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-import java.net.URL;
-import java.util.Dictionary;
-import java.util.List;
-
-import org.jboss.deployers.vfs.spi.deployer.ManifestMetaData;
-
-/**
- * OSGi specific manifest meta data.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- * @author Thomas.Diesler at jboss.com
- */
-public interface OSGiMetaData extends ManifestMetaData
-{
- /**
- * Get the headers in raw unlocalized format.
- *
- * @return the headers
- */
- Dictionary<String, String> getHeaders();
-
- /**
- * Extension point to read custom manifest headers.
- *
- * @param key the header key
- * @return value or null of no such header
- */
- String getHeader(String key);
-
- /**
- * Get bundle activation policy.
- *
- * @return bundle activation policy
- */
- ActivationPolicyMetaData getBundleActivationPolicy();
-
- /**
- * Get bundle activator class name.
- *
- * @return bundle activator classname or null if no such attribute
- */
- String getBundleActivator();
-
- /**
- * Get the bundle category
- *
- * @return list of category names
- */
- List<String> getBundleCategory();
-
- /**
- * Get the bundle classpath
- *
- * @return list of JAR file path names or directories inside bundle
- */
- List<String> getBundleClassPath();
-
- /**
- * Get the description
- *
- * @return a description
- */
- String getBundleDescription();
-
- /**
- * Get the localization's location
- *
- * @return location in the bundle for localization files
- */
- String getBundleLocalization();
-
- /**
- * Get the bundle manifest version
- *
- * @return bundle's specification number
- */
- int getBundleManifestVersion();
-
- /**
- * Get the name
- *
- * @return readable name
- */
- String getBundleName();
-
- /**
- * Get native code libs
- * @return native libs contained in the bundle
- */
- List<ParameterizedAttribute> getBundleNativeCode();
-
- /**
- * Get required exectuion envs
- *
- * @return list of execution envs that must be present on the Service Platform
- */
- List<String> getRequiredExecutionEnvironment();
-
- /**
- * Get bundle symbolic name.
- *
- * @return bundle's symbolic name
- */
- String getBundleSymbolicName();
-
- /**
- * Get the bundle parameters
- *
- * @return the bundle parameters
- */
- ParameterizedAttribute getBundleParameters();
-
- /**
- * Get the update url.
- *
- * @return URL of an update bundle location
- */
- URL getBundleUpdateLocation();
-
- /**
- * Get bundle's version.
- *
- * Note, R3 does not define a specific syntax for Bundle-Version.
- *
- * @return version of this bundle
- */
- String getBundleVersion();
-
- /**
- * Get dynamic imports.
- *
- * @return package names that should be dynamically imported when needed
- */
- List<PackageAttribute> getDynamicImports();
-
- /**
- * Get the export packages.
- *
- * @return exported packages
- */
- List<PackageAttribute> getExportPackages();
-
- /**
- * Get the fragment host.
- *
- * @return host bundle for this fragment
- */
- ParameterizedAttribute getFragmentHost();
-
- /**
- * Get the import packages.
- *
- * @return imported packages.
- */
- List<PackageAttribute> getImportPackages();
-
- /**
- * Get the required exports
- *
- * @return required exports from anoter bundle
- */
- List<ParameterizedAttribute> getRequireBundles();
-
- /**
- * Whether the bundle is a singleton
- *
- * @return true when it is a singleton
- */
- boolean isSingleton();
-
- /**
- * Get the fragment attrachment
- *
- * todo fragments
- * @return the fragment attachment
- */
- String getFragmentAttachment();
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/PackageAttribute.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/PackageAttribute.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/PackageAttribute.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,42 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-import org.jboss.reflect.spi.PackageInfo;
-
-/**
- * A package info.
- * Includes version and properties.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface PackageAttribute extends VersionRangeAttribute, ParameterizedAttribute
-{
- /**
- * Get the package info.
- * Must 'match' getAttribute method
- * from AttributeAware interface.
- *
- * @return package info
- */
- PackageInfo getPackageInfo();
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/Parameter.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/Parameter.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/Parameter.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,54 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-/**
- * Parameter interface - single value or set of values.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface Parameter
-{
- /**
- * Get value.
- * Simple string value or collection of string values.
- *
- * @return value
- */
- Object getValue();
-
- /**
- * Add value.
- *
- * @param value string to add
- */
- void addValue(String value);
-
- /**
- * Has multiple values.
- * Used when same name is used for multiple parameter values.
- * Value _can_ be casted into Collection<String>.
- *
- * @return true is returned type is Collection, otherwise false
- */
- boolean isCollection();
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ParameterizedAttribute.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ParameterizedAttribute.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ParameterizedAttribute.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,105 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-import java.util.Map;
-
-/**
- * Attribute with parameters.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- */
-public interface ParameterizedAttribute extends AttributeAware
-{
- /**
- * Get the attributes.
- *
- * @return the attributes or an empty map
- */
- Map<String, Parameter> getAttributes();
-
- /**
- * Get an attribute by name.
- *
- * @param name attributes's name
- * @return the attribute
- */
- Parameter getAttribute(String name);
-
- /**
- * Get an attribute value
- *
- * @param <T> the expected type
- * @param name the name of the attribute
- * @param type the expected type
- * @return the attribute value
- */
- <T> T getAttributeValue(String name, Class<T> type);
-
- /**
- * Get a directive value
- *
- * @param <T> the expected type
- * @param name the name of the directive
- * @param defaultValue the default value when no attribute is specified
- * @param type the expected type
- * @return the attribute value
- */
- <T> T getAttributeValue(String name, T defaultValue, Class<T> type);
-
- /**
- * Get the declerations
- *
- * @return the directives or an empty map
- */
- Map<String, Parameter> getDirectives();
-
- /**
- * Get a directive by name.
- *
- * @param name directive's name
- * @return the directive
- */
- Parameter getDirective(String name);
-
- /**
- * Get a directive value
- *
- * @param <T> the expected type
- * @param name the name of the directive
- * @param type the expected type
- * @return the directive value
- */
- <T> T getDirectiveValue(String name, Class<T> type);
-
- /**
- * Get a directive value
- *
- * @param <T> the expected type
- * @param name the name of the directive
- * @param defaultValue the default value when no directive is specified
- * @param type the expected type
- * @return the directive value
- */
- <T> T getDirectiveValue(String name, T defaultValue, Class<T> type);
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ReferenceMetaData.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ReferenceMetaData.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ReferenceMetaData.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,46 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-import java.util.List;
-import java.util.Set;
-
-import org.jboss.beans.metadata.spi.PropertyMetaData;
-
-/**
- * OSGi reference meta data.
- * Extends ValueMetaData - can be used as a value via proxy.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface ReferenceMetaData extends HolderMetaData, ServiceValueMetaData
-{
- String getFilter();
-
-// Cardinality getCardinality();
-
- Integer getTimeout();
-
- List<ListenerMetaData> getListeners();
-
- Set<PropertyMetaData> getProperties();
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceControllerContext.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceControllerContext.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceControllerContext.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,48 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.dispatch.InvokeDispatchContext;
-import org.osgi.framework.BundleContext;
-
-/**
- * Information about Bundle[Context] and ServiceMetaData.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface ServiceControllerContext extends ControllerContext, InvokeDispatchContext
-{
- /**
- * Get the metadata
- *
- * @return the service metadata
- */
- ServiceMetaData getServiceMetaData();
-
- /**
- * Get the BundleContext
- *
- * @return underlying bundle context
- */
- BundleContext getBundleContext();
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceDeployment.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceDeployment.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceDeployment.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,52 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-import java.util.List;
-
-/**
- * An osgi service deployment
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface ServiceDeployment
-{
- /**
- * Get the name of the deployment
- *
- * @return the name
- */
- String getName();
-
- /**
- * Set the name of the deployment
- *
- * @param name the name
- */
- void setName(String name);
-
- /**
- * Get the services in the deployment
- * @return List<ServiceMetaData>
- */
- List<ServiceMetaData> getServices();
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceMetaData.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceMetaData.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceMetaData.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,44 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * OSGi service meta data.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface ServiceMetaData extends HolderMetaData, ServiceMetaDataVisitorNode
-{
- List<AttributeMetaData> getAttributes();
-
- Set<String> getInterfaces();
-
- Map<String, String> getServiceProperties();
-
- String getRef();
-
- boolean getLazyInit();
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceMetaDataVisitor.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceMetaDataVisitor.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceMetaDataVisitor.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,68 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.dependency.spi.DependencyItem;
-
-/**
- * ServiceMetaDataVisitor.
- *
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- */
-public interface ServiceMetaDataVisitor
-{
- /**
- * Get the controller context
- *
- * @return the context
- */
- ServiceControllerContext getControllerContext();
-
- /**
- * Get the context state
- *
- * @return the context state
- */
- ControllerState getContextState();
-
- /**
- * Set the context state
- *
- * @param contextState the context state
- */
- void setContextState(ControllerState contextState);
-
- /**
- * Add a dependency
- *
- * @param dependency the dependency
- */
- void addDependency(DependencyItem dependency);
-
- /**
- * Visit the node
- *
- * @param node the node
- */
- void visit(ServiceMetaDataVisitorNode node);
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceMetaDataVisitorNode.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceMetaDataVisitorNode.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceMetaDataVisitorNode.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,46 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-import java.util.Iterator;
-
-/**
- * ServiceMetaDataVisitorNode.
- *
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- */
-public interface ServiceMetaDataVisitorNode
-{
- /**
- * Visit the node
- *
- * @param vistor the visitor
- */
- public void visit(ServiceMetaDataVisitor vistor);
-
- /**
- * Return the child nodes
- *
- * @return Iterator<MetaDataVisitorNode> or null if there aren't any
- */
- public Iterator<? extends ServiceMetaDataVisitorNode> getChildren();
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceValueMetaData.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceValueMetaData.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/ServiceValueMetaData.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,41 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-import org.osgi.framework.BundleContext;
-
-/**
- * ServiceValueMetaData.
- *
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- */
-public interface ServiceValueMetaData extends ServiceMetaDataVisitorNode
-{
- /**
- * Get the value
- *
- * @param bundleContext the bundle context
- * @return the value
- * @throws Throwable for any error
- */
- Object getValue(BundleContext bundleContext) throws Throwable;
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/VersionRange.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/VersionRange.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/VersionRange.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,61 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-import org.jboss.osgi.framework.metadata.internal.AbstractVersionRange;
-import org.osgi.framework.Version;
-
-/**
- * Version range.
- * [floor, ceiling]
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface VersionRange
-{
- /**
- * The version range that matches all versions
- */
- static VersionRange allVersions = AbstractVersionRange.valueOf("0.0.0");
-
- /**
- * Get the floor version.
- *
- * @return floor version
- */
- Version getFloor();
-
- /**
- * Get the ceiling version.
- *
- * @return ceiling version
- */
- Version getCeiling();
-
- /**
- * Is param verision between (including) floor and ceiling.
- *
- * @param version version parameter to compare
- * @return true if version param in version range interval
- */
- boolean isInRange(Version version);
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/VersionRangeAttribute.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/VersionRangeAttribute.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/VersionRangeAttribute.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,37 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.metadata;
-
-/**
- * Attribute with VersionRange attribute.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface VersionRangeAttribute extends AttributeAware
-{
- /**
- * Get the version range.
- *
- * @return version range for this attribute
- */
- VersionRange getVersion();
-}
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/util/CaseInsensitiveDictionary.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/util/CaseInsensitiveDictionary.java 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/util/CaseInsensitiveDictionary.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,145 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2009, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.osgi.framework.util;
-
-import java.util.Collections;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Set;
-
-import org.jboss.util.collection.Iterators;
-
-/**
- * CaseInsensitiveDictionary.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
- at SuppressWarnings("rawtypes")
-public class CaseInsensitiveDictionary extends Hashtable
-{
- private static final long serialVersionUID = 5802491129524016545L;
-
- /** The delegate dictionary */
- private Dictionary<String, Object> delegate;
-
- /** The original keys */
- private Set<String> originalKeys;
-
- /**
- * Create a new CaseInsensitiveDictionary.
- *
- * @param delegate the delegate
- */
- @SuppressWarnings("unchecked")
- public CaseInsensitiveDictionary(Dictionary delegate)
- {
- if (delegate == null)
- throw new IllegalArgumentException("Null delegaqte");
-
- this.delegate = new Hashtable<String, Object>(delegate.size());
- this.originalKeys = Collections.synchronizedSet(new HashSet<String>());
- Enumeration<String> e = delegate.keys();
- while (e.hasMoreElements())
- {
- String key = e.nextElement();
- if (get(key) != null)
- throw new IllegalArgumentException("Properties contain duplicates with varying case for key=" + key + " : " + delegate);
-
- this.delegate.put(key.toLowerCase(), delegate.get(key));
- originalKeys.add(key);
- }
- }
-
- public Enumeration<Object> elements()
- {
- return delegate.elements();
- }
-
- @SuppressWarnings("unchecked")
- public synchronized boolean equals(Object obj)
- {
- if (obj == this)
- return true;
- if (obj == null || obj instanceof Dictionary == false)
- return false;
-
- Dictionary<String, Object> other = (Dictionary)obj;
-
- if (size() != other.size())
- return false;
- if (isEmpty())
- return true;
-
- for (String key : originalKeys)
- {
- if (get(key).equals(other.get(key)))
- return false;
- }
- return true;
- }
-
- public Object get(Object key)
- {
- if (key instanceof String)
- key = ((String)key).toLowerCase();
- return delegate.get(key);
- }
-
- public int hashCode()
- {
- return delegate.hashCode();
- }
-
- public boolean isEmpty()
- {
- return delegate.isEmpty();
- }
-
- @SuppressWarnings("unchecked")
- public Enumeration<String> keys()
- {
- return Iterators.toEnumeration(originalKeys.iterator());
- }
-
- public Object put(Object key, Object value)
- {
- throw new UnsupportedOperationException("immutable");
- }
-
- public Object remove(Object key)
- {
- throw new UnsupportedOperationException("immutable");
- }
-
- public int size()
- {
- return delegate.size();
- }
-
- public String toString()
- {
- return delegate.toString();
- }
-}
Copied: projects/jboss-osgi/projects/runtime/framework/trunk/metadata (from rev 101767, projects/jboss-osgi/projects/runtime/framework/trunk/core)
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/metadata/.classpath
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/.classpath 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/metadata/.classpath 2010-03-03 10:22:49 UTC (rev 101768)
@@ -4,7 +4,7 @@
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/metadata/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/metadata/pom.xml 2010-03-03 10:22:49 UTC (rev 101768)
@@ -1,373 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
- <!-- ====================================================================== -->
- <!-- -->
- <!-- JBoss, the OpenSource J2EE webOS -->
- <!-- -->
- <!-- Distributable under LGPL license. -->
- <!-- See terms of license at http://www.gnu.org. -->
- <!-- -->
- <!-- ====================================================================== -->
-
- <!-- $Id$ -->
-
- <!--
- Set these VM properties in your IDE debugger
-
- -Dlog4j.output.dir=${workspace_loc:jboss-osgi-framework/target}
- -Dlog4j.configuration=log4j-console.xml
- -->
-
-<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">
- <modelVersion>4.0.0</modelVersion>
-
- <name>JBossOSGi Framework - Core</name>
- <groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-framework</artifactId>
- <packaging>bundle</packaging>
-
- <parent>
- <groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-framework-parent</artifactId>
- <version>1.0.0.Alpha4-SNAPSHOT</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bnd</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloader</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-jmx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-jmx-aop-mc-int</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-jmx-mc-int</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-deployers</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-deployment</artifactId>
- </dependency>
-
- <!-- OSGi Dependencies -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
-
- <!-- Test bundles dependencies -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.metatype</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-apache-xerces</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-husky</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jaxb</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.jmx</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.jndi</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-reflect</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-xml-binding</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-jetty-bundle</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- Test Dependencies -->
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testing</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>bundles</id>
- <phase>test-compile</phase>
- <goals>
- <goal>directory-single</goal>
- </goals>
- <configuration>
- <finalName>test-libs</finalName>
- <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>scripts/assembly-bundles.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- <execution>
- <id>all</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>scripts/assembly-all.xml</descriptor>
- </descriptors>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>build-test-jars</id>
- <phase>test-compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
- <property name="tests.output.dir" value="${project.build.directory}" />
- <ant antfile="scripts/antrun-test-jars.xml" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.jboss.osgi.framework</Bundle-SymbolicName>
- <Bundle-Name>JBossOSGi Framework</Bundle-Name>
- <Bundle-Version>${version}</Bundle-Version>
- <Export-Package>
- org.osgi.framework;version="1.5",
- org.osgi.framework.launch;version="1.0",
- org.osgi.framework.hooks.service;version="1.0",
- org.osgi.service.packageadmin;version="1.2",
- org.osgi.service.startlevel;version="1.1",
- org.osgi.util.tracker;version="1.4"
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-Xmx512m</argLine>
- <systemProperties>
- <property>
- <name>log4j.output.dir</name>
- <value>${project.build.directory}</value>
- </property>
- <property>
- <name>org.jboss.osgi.framework.launch.bootstrapPath</name>
- <value>bootstrap/jboss-osgi-bootstrap.xml</value>
- </property>
- <property>
- <name>org.jboss.osgi.husky.Invoker</name>
- <value>org.jboss.osgi.husky.internal.AbstractInvoker</value>
- </property>
- <property>
- <name>test.archive.directory</name>
- <value>${project.build.directory}/test-libs</value>
- </property>
- </systemProperties>
- <excludes>
- <!-- excludes listed here need to have a jira issue associated
- <exclude>org/jboss/test/osgi/service/ServiceMixUnitTestCase.class</exclude>
- -->
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: projects/jboss-osgi/projects/runtime/framework/trunk/metadata/pom.xml (from rev 101766, projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml)
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/metadata/pom.xml (rev 0)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/metadata/pom.xml 2010-03-03 10:22:49 UTC (rev 101768)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
+
+ <!-- $Id$ -->
+
+ <!--
+ Set these VM properties in your IDE debugger
+
+ -Dlog4j.output.dir=${workspace_loc:jboss-osgi-framework/target}
+ -Dlog4j.configuration=log4j-console.xml
+ -->
+
+<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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBossOSGi Framework - Metadata</name>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-metadata</artifactId>
+ <packaging>jar</packaging>
+
+ <parent>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-parent</artifactId>
+ <version>1.0.0.Alpha4-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
+
+ <!-- OSGi Dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ </plugins>
+ </build>
+</project>
Copied: projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src (from rev 101766, projects/jboss-osgi/projects/runtime/framework/trunk/core/src)
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractOSGiMetaData.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractOSGiMetaData.java 2010-03-03 09:56:16 UTC (rev 101766)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractOSGiMetaData.java 2010-03-03 10:22:49 UTC (rev 101768)
@@ -64,13 +64,13 @@
import org.jboss.classloading.spi.version.VersionComparatorRegistry;
import org.jboss.deployers.vfs.spi.deployer.helpers.AbstractManifestMetaData;
import org.jboss.osgi.framework.metadata.ActivationPolicyMetaData;
+import org.jboss.osgi.framework.metadata.CaseInsensitiveDictionary;
import org.jboss.osgi.framework.metadata.OSGiMetaData;
import org.jboss.osgi.framework.metadata.PackageAttribute;
import org.jboss.osgi.framework.metadata.ParameterizedAttribute;
import org.jboss.osgi.framework.metadata.internal.AbstractVersionRange.OSGiVersionToOSGiVersionComparator;
import org.jboss.osgi.framework.metadata.internal.AbstractVersionRange.OSGiVersionToStringComparator;
import org.jboss.osgi.framework.metadata.internal.AbstractVersionRange.OSGiVersionToVersionComparator;
-import org.jboss.osgi.framework.util.CaseInsensitiveDictionary;
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-03 10:03:50 UTC (rev 101767)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-03 10:22:49 UTC (rev 101768)
@@ -17,7 +17,7 @@
<modelVersion>4.0.0</modelVersion>
<name>JBossOSGi Framework</name>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework-parent</artifactId>
<packaging>pom</packaging>
@@ -67,6 +67,7 @@
<!-- Modules -->
<modules>
<module>core</module>
+ <module>metadata</module>
</modules>
<!-- Dependency Management -->
More information about the jboss-osgi-commits
mailing list