[jboss-cvs] JBossAS SVN: r94258 - in projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src: main/javacc and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 2 03:47:57 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-10-02 03:47:56 -0400 (Fri, 02 Oct 2009)
New Revision: 94258
Removed:
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/
Modified:
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/javacc/HeaderValue.jj
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/resources/META-INF/services/org.osgi.framework.launch.FrameworkFactory
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/HeaderValuesTestCase.java
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/VersionRangeTestCase.java
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/OSGiTestCase.java
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/OSGiTestDelegate.java
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/classloader/test/ClassLoaderDomainUnitTestCase.java
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTestCase.java
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/service/test/ServiceFactoryUnitTestCase.java
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/resources/bootstrap/bootstrap.xml
Log:
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/javacc/HeaderValue.jj
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/javacc/HeaderValue.jj 2009-10-02 07:46:17 UTC (rev 94257)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/javacc/HeaderValue.jj 2009-10-02 07:47:56 UTC (rev 94258)
@@ -7,7 +7,7 @@
}
PARSER_BEGIN(HeaderValue)
-package org.jboss.osgi.plugins.metadata.impl;
+package org.jboss.osgi.framework.metadata.impl;
import java.io.StringReader;
import java.util.ArrayList;
@@ -15,7 +15,7 @@
import java.util.List;
import java.util.Map;
-import org.jboss.osgi.plugins.metadata.*;
+import org.jboss.osgi.framework.metadata.*;
/**
* A JavaCC 3.2 grammar for the OSGi R4 bundle headers
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/resources/META-INF/services/org.osgi.framework.launch.FrameworkFactory
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/resources/META-INF/services/org.osgi.framework.launch.FrameworkFactory 2009-10-02 07:46:17 UTC (rev 94257)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/resources/META-INF/services/org.osgi.framework.launch.FrameworkFactory 2009-10-02 07:47:56 UTC (rev 94258)
@@ -1 +1 @@
-org.jboss.osgi.plugins.facade.launch.OSGiFrameworkFactory
\ No newline at end of file
+org.jboss.osgi.framework.launch.OSGiFrameworkFactory
\ No newline at end of file
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/HeaderValuesTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/HeaderValuesTestCase.java 2009-10-02 07:46:17 UTC (rev 94257)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/HeaderValuesTestCase.java 2009-10-02 07:47:56 UTC (rev 94258)
@@ -32,17 +32,17 @@
import junit.framework.Test;
-import org.jboss.osgi.plugins.metadata.ActivationPolicyMetaData;
-import org.jboss.osgi.plugins.metadata.OSGiMetaData;
-import org.jboss.osgi.plugins.metadata.PackageAttribute;
-import org.jboss.osgi.plugins.metadata.Parameter;
-import org.jboss.osgi.plugins.metadata.ParameterizedAttribute;
-import org.jboss.osgi.plugins.metadata.VersionRange;
-import org.jboss.osgi.plugins.metadata.impl.AbstractOSGiMetaData;
-import org.jboss.osgi.plugins.metadata.impl.AbstractPackageAttribute;
-import org.jboss.osgi.plugins.metadata.impl.AbstractParameter;
-import org.jboss.osgi.plugins.metadata.impl.AbstractParameterizedAttribute;
-import org.jboss.osgi.plugins.metadata.impl.OSGiParameters;
+import org.jboss.osgi.framework.metadata.ActivationPolicyMetaData;
+import org.jboss.osgi.framework.metadata.OSGiMetaData;
+import org.jboss.osgi.framework.metadata.PackageAttribute;
+import org.jboss.osgi.framework.metadata.Parameter;
+import org.jboss.osgi.framework.metadata.ParameterizedAttribute;
+import org.jboss.osgi.framework.metadata.VersionRange;
+import org.jboss.osgi.framework.metadata.impl.AbstractOSGiMetaData;
+import org.jboss.osgi.framework.metadata.impl.AbstractPackageAttribute;
+import org.jboss.osgi.framework.metadata.impl.AbstractParameter;
+import org.jboss.osgi.framework.metadata.impl.AbstractParameterizedAttribute;
+import org.jboss.osgi.framework.metadata.impl.OSGiParameters;
import org.osgi.framework.Version;
/**
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/VersionRangeTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/VersionRangeTestCase.java 2009-10-02 07:46:17 UTC (rev 94257)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/VersionRangeTestCase.java 2009-10-02 07:47:56 UTC (rev 94258)
@@ -6,8 +6,8 @@
import junit.framework.Test;
import org.jboss.logging.Logger;
-import org.jboss.osgi.plugins.metadata.VersionRange;
-import org.jboss.osgi.plugins.metadata.impl.AbstractVersionRange;
+import org.jboss.osgi.framework.metadata.VersionRange;
+import org.jboss.osgi.framework.metadata.impl.AbstractVersionRange;
import org.jboss.test.BaseTestCase;
import org.osgi.framework.Version;
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/OSGiTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/OSGiTestCase.java 2009-10-02 07:46:17 UTC (rev 94257)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/OSGiTestCase.java 2009-10-02 07:47:56 UTC (rev 94258)
@@ -34,7 +34,7 @@
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
-import org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager;
+import org.jboss.osgi.framework.bundle.OSGiBundleManager;
import org.jboss.test.AbstractTestDelegate;
import org.jboss.test.kernel.junit.MicrocontainerTest;
import org.jboss.virtual.AssembledDirectory;
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/OSGiTestDelegate.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/OSGiTestDelegate.java 2009-10-02 07:46:17 UTC (rev 94257)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/OSGiTestDelegate.java 2009-10-02 07:47:56 UTC (rev 94258)
@@ -32,8 +32,8 @@
import org.jboss.dependency.spi.ControllerState;
import org.jboss.deployers.plugins.main.MainDeployerImpl;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager;
-import org.jboss.osgi.plugins.facade.bundle.AbstractBundleState;
+import org.jboss.osgi.framework.bundle.AbstractBundleState;
+import org.jboss.osgi.framework.bundle.OSGiBundleManager;
import org.jboss.test.kernel.junit.MicrocontainerTestDelegate;
import org.jboss.virtual.AssembledDirectory;
import org.jboss.virtual.VFS;
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/classloader/test/ClassLoaderDomainUnitTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/classloader/test/ClassLoaderDomainUnitTestCase.java 2009-10-02 07:46:17 UTC (rev 94257)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/classloader/test/ClassLoaderDomainUnitTestCase.java 2009-10-02 07:47:56 UTC (rev 94258)
@@ -37,7 +37,7 @@
import org.jboss.classloader.spi.filter.PackageClassFilter;
import org.jboss.classloading.spi.vfs.policy.VFSClassLoaderPolicy;
import org.jboss.logging.Logger;
-import org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager;
+import org.jboss.osgi.framework.bundle.OSGiBundleManager;
import org.jboss.osgi.spi.testing.OSGiTestHelper;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTestCase.java 2009-10-02 07:46:17 UTC (rev 94257)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTestCase.java 2009-10-02 07:47:56 UTC (rev 94258)
@@ -30,8 +30,8 @@
import java.util.Collections;
import java.util.List;
-import org.jboss.osgi.plugins.facade.bundle.OSGiBundleState;
-import org.jboss.osgi.plugins.resolver.BundleResolver;
+import org.jboss.osgi.framework.bundle.OSGiBundleState;
+import org.jboss.osgi.framework.resolver.BundleResolver;
import org.jboss.osgi.spi.testing.OSGiTest;
import org.jboss.osgi.spi.util.ServiceLoader;
import org.junit.Test;
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/service/test/ServiceFactoryUnitTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/service/test/ServiceFactoryUnitTestCase.java 2009-10-02 07:46:17 UTC (rev 94257)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/osgi/service/test/ServiceFactoryUnitTestCase.java 2009-10-02 07:47:56 UTC (rev 94258)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.osgi.service.test;
-import org.jboss.osgi.plugins.facade.bundle.OSGiBundleWrapper;
+import org.jboss.osgi.framework.bundle.OSGiBundleWrapper;
import org.jboss.test.osgi.OSGiTestCase;
import org.jboss.test.osgi.service.support.SimpleServiceFactory;
import org.osgi.framework.Bundle;
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-10-02 07:46:17 UTC (rev 94257)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-10-02 07:47:56 UTC (rev 94258)
@@ -1 +1 @@
-org.jboss.osgi.plugins.facade.launch.OSGiFrameworkBootstrapProvider
\ No newline at end of file
+org.jboss.osgi.framework.launch.OSGiFrameworkBootstrapProvider
\ No newline at end of file
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/resources/bootstrap/bootstrap.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/resources/bootstrap/bootstrap.xml 2009-10-02 07:46:17 UTC (rev 94257)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/resources/bootstrap/bootstrap.xml 2009-10-02 07:47:56 UTC (rev 94258)
@@ -8,7 +8,7 @@
********************************
-->
- <bean name="OSGiBundleManager" class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager">
+ <bean name="OSGiBundleManager" class="org.jboss.osgi.framework.bundle.OSGiBundleManager">
<constructor>
<parameter><inject bean="jboss.kernel:service=Kernel" /></parameter>
<parameter><inject bean="MainDeployer" /></parameter>
@@ -45,13 +45,13 @@
********************************
-->
- <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.plugins.facade.plugins.FrameworkEventsPluginImpl">
+ <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.impl.FrameworkEventsPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="OSGiStoragePlugin" class="org.jboss.osgi.plugins.facade.plugins.BundleStoragePluginImpl">
+ <bean name="OSGiStoragePlugin" class="org.jboss.osgi.framework.plugins.impl.BundleStoragePluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="OSGiSystemPackages" class="org.jboss.osgi.plugins.facade.plugins.SystemPackagesPluginImpl">
+ <bean name="OSGiSystemPackages" class="org.jboss.osgi.framework.plugins.impl.SystemPackagesPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
@@ -63,13 +63,13 @@
********************************
-->
- <bean name="MicrocontainerService" class="org.jboss.osgi.plugins.facade.service.MicrocontainerServiceImpl">
+ <bean name="MicrocontainerService" class="org.jboss.osgi.framework.service.MicrocontainerServiceImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="StartLevelService" class="org.jboss.osgi.plugins.facade.service.StartLevelImpl">
+ <bean name="StartLevelService" class="org.jboss.osgi.framework.service.StartLevelImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="PackageAdminService" class="org.jboss.osgi.plugins.facade.service.PackageAdminImpl">
+ <bean name="PackageAdminService" class="org.jboss.osgi.framework.service.PackageAdminImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
@@ -123,11 +123,11 @@
</bean>
<!-- OSGI Deployment -->
- <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiManifestParsingDeployer" />
- <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleStateDeployer">
+ <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" />
+ <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateDeployer">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" />
+ <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleActivatorDeployer" />
<!--
********************************
@@ -137,16 +137,16 @@
********************************
-->
- <bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" />
- <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderDomain" >
+ <bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderSystem" />
+ <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderDomain" >
<constructor><parameter>OSGiClassLoaderDomain</parameter></constructor>
<property name="classLoaderSystem"><inject bean="OSGiClassLoaderSystem"/></property>
<property name="bundleManager"><inject bean="OSGiBundleManager" /></property>
</bean>
- <bean name="OSGiClassLoaderFactory" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderFactory" >
+ <bean name="OSGiClassLoaderFactory" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderFactory" >
<property name="system"><inject bean="OSGiClassLoaderSystem"/></property>
</bean>
- <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer">
+ <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.framework.classloading.OSGiBundleClassLoadingDeployer">
<property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
<property name="factory"><inject bean="OSGiClassLoaderFactory"/></property>
</bean>
More information about the jboss-cvs-commits
mailing list