Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2012-01-19 07:23:09 -0500
committerGlyn Normington2012-01-19 07:34:03 -0500
commita8718f868c68029b87a276bf77bc83adea605bba (patch)
tree9924c67def38e82775097f3f8202cd825a68ed8a
parentd0971cffda7a71792493a864230035d3c593f063 (diff)
downloadorg.eclipse.virgo.kernel-a8718f868c68029b87a276bf77bc83adea605bba.tar.gz
org.eclipse.virgo.kernel-a8718f868c68029b87a276bf77bc83adea605bba.tar.xz
org.eclipse.virgo.kernel-a8718f868c68029b87a276bf77bc83adea605bba.zip
Fix a few errors and warnings
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.artifact/.classpath58
-rw-r--r--org.eclipse.virgo.kernel.artifact/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/ArtifactSpecificationTests.java5
-rw-r--r--org.eclipse.virgo.kernel.artifact/template.mf2
-rw-r--r--org.eclipse.virgo.kernel.deployer.dm/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java30
-rw-r--r--org.eclipse.virgo.kernel.deployer.testbundle/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.deployer.testbundle/src/test/resources/suppresswarning/.gitignore (renamed from org.eclipse.virgo.kernel.deployer.testbundle/src/test/resources/.gitignore)0
-rw-r--r--org.eclipse.virgo.kernel.deployer/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.kerneldmfragment/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.kerneldmfragment/src/test/resources/suppresswarning/.gitignore (renamed from org.eclipse.virgo.kernel.kerneldmfragment/src/test/resources/.gitignore)0
-rw-r--r--org.eclipse.virgo.kernel.model/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.osgi/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.osgicommand/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.services/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.shell/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.smoketest/src/main/resources/suppresswarning/.gitignore (renamed from org.eclipse.virgo.kernel.smoketest/src/main/resources/.gitignore)0
-rw-r--r--org.eclipse.virgo.kernel.stubs/src/test/resources/suppresswarning/.gitignore (renamed from org.eclipse.virgo.kernel.stubs/src/test/resources/.gitignore)0
-rw-r--r--org.eclipse.virgo.kernel.test/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.test/src/main/resources/suppresswarning/.gitignore (renamed from org.eclipse.virgo.kernel.test/src/main/resources/.gitignore)0
-rw-r--r--org.eclipse.virgo.kernel.userregion/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ConsoleConfigurationConvertor.java6
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingRegistryHook.java46
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFramework.java12
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/TransformedManifestProvidingBundleFileWrapper.java2
-rw-r--r--org.eclipse.virgo.kernel.userregionfactory/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.userregionfactory/src/main/java/org/eclipse/virgo/kernel/userregionfactory/Activator.java6
30 files changed, 66 insertions, 133 deletions
diff --git a/org.eclipse.virgo.kernel.agent.dm/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.agent.dm/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856c..92aa2909 100644
--- a/org.eclipse.virgo.kernel.agent.dm/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.agent.dm/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.artifact/.classpath b/org.eclipse.virgo.kernel.artifact/.classpath
index 1d61b1c9..230ff34a 100644
--- a/org.eclipse.virgo.kernel.artifact/.classpath
+++ b/org.eclipse.virgo.kernel.artifact/.classpath
@@ -1,44 +1,3 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java">
- <attributes>
- <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="src/main/resources">
- <attributes>
- <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
- <attributes>
- <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="src/test/resources">
- <attributes>
- <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.M02/org.eclipse.virgo.repository-3.5.0.M02.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.M02/org.eclipse.virgo.repository-sources-3.5.0.M02.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M02/org.eclipse.virgo.util.io-3.5.0.M02.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M02/org.eclipse.virgo.util.io-sources-3.5.0.M02.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.M02/org.eclipse.virgo.util.osgi.manifest-3.5.0.M02.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.M02/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.M02.jar"></classpathentry>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.M02/org.eclipse.virgo.util.parser.manifest-3.5.0.M02.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.M02/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.M02.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.M02/org.eclipse.virgo.util.common-3.5.0.M02.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.M02/org.eclipse.virgo.util.common-sources-2.0019103807.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.M02/org.eclipse.virgo.medic-3.5.0.M02.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.0.CI-B20/org.eclipse.virgo.medic-sources-1.0.0.CI-B20.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.5.0.M02/org.eclipse.virgo.medic.core-3.5.0.M02.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.5.0.M02/org.eclipse.virgo.medic.core-sources-3.5.0.M02.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
-=======
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java">
@@ -63,20 +22,19 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.1.0.D-20111223114028/org.eclipse.virgo.repository-3.1.0.D-20111223114028.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.1.0.D-20111223114028/org.eclipse.virgo.repository-sources-3.1.0.D-20111223114028.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-3.1.0.D-20111205151812.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-sources-3.1.0.D-20111205151812.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.1.0.D-20111205151812/org.eclipse.virgo.util.osgi.manifest-3.1.0.D-20111205151812.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.1.0.D-20111205151812/org.eclipse.virgo.util.osgi.manifest-sources-3.1.0.D-20111205151812.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.1.0.D-20111205151812/org.eclipse.virgo.util.parser.manifest-3.1.0.D-20111205151812.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.1.0.D-20111205151812/org.eclipse.virgo.util.parser.manifest-sources-3.1.0.D-20111205151812.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.D-20111205151812/org.eclipse.virgo.util.common-3.1.0.D-20111205151812.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.D-20111205151812/org.eclipse.virgo.util.common-sources-2.0019103807.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.M02/org.eclipse.virgo.repository-3.5.0.M02.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.M02/org.eclipse.virgo.repository-sources-3.5.0.M02.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M02/org.eclipse.virgo.util.io-3.5.0.M02.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M02/org.eclipse.virgo.util.io-sources-3.5.0.M02.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.M02/org.eclipse.virgo.util.osgi.manifest-3.5.0.M02.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.M02/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.M02.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.M02/org.eclipse.virgo.util.parser.manifest-3.5.0.M02.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.M02/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.M02.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.M02/org.eclipse.virgo.util.common-3.5.0.M02.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.M02/org.eclipse.virgo.util.common-sources-2.0019103807.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111223113430/org.eclipse.virgo.medic-3.1.0.D-20111223113430.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.0.CI-B20/org.eclipse.virgo.medic-sources-1.0.0.CI-B20.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.1.0.D-20111223113430/org.eclipse.virgo.medic.core-3.1.0.D-20111223113430.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.1.0.D-20111223113430/org.eclipse.virgo.medic.core-sources-3.1.0.D-20111223113430.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.M02/org.eclipse.virgo.medic-3.5.0.M02.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.0.CI-B20/org.eclipse.virgo.medic-sources-1.0.0.CI-B20.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.5.0.M02/org.eclipse.virgo.medic.core-3.5.0.M02.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.5.0.M02/org.eclipse.virgo.medic.core-sources-3.5.0.M02.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="src" path="/org.eclipse.virgo.kernel.core"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.M02/org.eclipse.virgo.kernel.core-3.5.0.M02.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
->>>>>>> b9eb17c... Bug 327538 - Add URL to artefact specification
diff --git a/org.eclipse.virgo.kernel.artifact/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.artifact/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856c..92aa2909 100644
--- a/org.eclipse.virgo.kernel.artifact/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.artifact/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/ArtifactSpecificationTests.java b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/ArtifactSpecificationTests.java
index d4387ae4..65367bef 100644
--- a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/ArtifactSpecificationTests.java
+++ b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/ArtifactSpecificationTests.java
@@ -14,15 +14,12 @@ package org.eclipse.virgo.kernel.artifact;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import org.junit.Test;
-
-import org.eclipse.virgo.kernel.artifact.ArtifactSpecification;
import org.eclipse.virgo.util.osgi.manifest.VersionRange;
+import org.junit.Test;
public class ArtifactSpecificationTests {
diff --git a/org.eclipse.virgo.kernel.artifact/template.mf b/org.eclipse.virgo.kernel.artifact/template.mf
index 3ddd5043..218cb208 100644
--- a/org.eclipse.virgo.kernel.artifact/template.mf
+++ b/org.eclipse.virgo.kernel.artifact/template.mf
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Virgo Kernel Artifact Integration
Bundle-SymbolicName: org.eclipse.virgo.kernel.artifact
Bundle-Version: ${version}
-Import-Template:
+Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
org.eclipse.virgo.repository.*;version="${org.eclipse.virgo.repository:[=.=.=, =.+1)}",
diff --git a/org.eclipse.virgo.kernel.deployer.dm/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.deployer.dm/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856c..92aa2909 100644
--- a/org.eclipse.virgo.kernel.deployer.dm/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.deployer.dm/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.deployer.test/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.deployer.test/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856c..92aa2909 100644
--- a/org.eclipse.virgo.kernel.deployer.test/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.deployer.test/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java
index 4188f98e..4806476b 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java
@@ -16,12 +16,14 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
import java.io.IOException;
import java.util.Set;
+import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.util.io.JarUtils;
+import org.eclipse.virgo.util.io.PathReference;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -29,12 +31,6 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
-import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
-import org.eclipse.virgo.util.io.JarUtils;
-import org.eclipse.virgo.util.io.PathReference;
-
/**
* Test refreshing individual modules of a deployed application.
* <p />
@@ -46,8 +42,6 @@ public class RefreshTests extends AbstractDeployerIntegrationTest {
private static final String REFRESH_EXPORTER_VERSION = "1.0.0.BUILD-20100310081114";
- private static final File LOG_FILE = new File("target/serviceability/eventlog/eventlog.log");
-
private final String TEST_IMPORTER_BUNDLE_SYMBOLIC_NAME = "RefreshTest-1-RefreshImporter";
private final String TEST_IMPORT_BUNDLE_IMPORTER_BUNDLE_SYMBOLIC_NAME = "RefreshTest-Import-Bundle-1-RefreshImporter";
@@ -62,18 +56,6 @@ public class RefreshTests extends AbstractDeployerIntegrationTest {
private PathReference parImportBundle;
- private int existingLines;
-
- public void countExistingLogLines() throws IOException {
- BufferedReader reader = new BufferedReader(new FileReader(LOG_FILE));
- String line = reader.readLine();
- existingLines = 0;
- while (line != null) {
- existingLines++;
- line = reader.readLine();
- }
- }
-
@Before
public void setUp() throws Exception {
PathReference pr = new PathReference("./target/org.eclipse.virgo.kernel");
@@ -90,8 +72,6 @@ public class RefreshTests extends AbstractDeployerIntegrationTest {
JarUtils.unpackTo(par, explodedPar);
parImportBundle = new PathReference("src/test/resources/refresh-import-bundle.par");
-
- countExistingLogLines();
}
@After
diff --git a/org.eclipse.virgo.kernel.deployer.testbundle/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.deployer.testbundle/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856c..92aa2909 100644
--- a/org.eclipse.virgo.kernel.deployer.testbundle/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.deployer.testbundle/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.deployer.testbundle/src/test/resources/.gitignore b/org.eclipse.virgo.kernel.deployer.testbundle/src/test/resources/suppresswarning/.gitignore
index e69de29b..e69de29b 100644
--- a/org.eclipse.virgo.kernel.deployer.testbundle/src/test/resources/.gitignore
+++ b/org.eclipse.virgo.kernel.deployer.testbundle/src/test/resources/suppresswarning/.gitignore
diff --git a/org.eclipse.virgo.kernel.deployer/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.deployer/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856c..92aa2909 100644
--- a/org.eclipse.virgo.kernel.deployer/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.deployer/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.dmfragment/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.dmfragment/.settings/org.eclipse.wst.common.project.facet.core.xml
index c9a337a6..dae763dc 100644
--- a/org.eclipse.virgo.kernel.dmfragment/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.dmfragment/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.kerneldmfragment/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.kerneldmfragment/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856c..92aa2909 100644
--- a/org.eclipse.virgo.kernel.kerneldmfragment/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.kerneldmfragment/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.kerneldmfragment/src/test/resources/.gitignore b/org.eclipse.virgo.kernel.kerneldmfragment/src/test/resources/suppresswarning/.gitignore
index e69de29b..e69de29b 100644
--- a/org.eclipse.virgo.kernel.kerneldmfragment/src/test/resources/.gitignore
+++ b/org.eclipse.virgo.kernel.kerneldmfragment/src/test/resources/suppresswarning/.gitignore
diff --git a/org.eclipse.virgo.kernel.model/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.model/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856c..92aa2909 100644
--- a/org.eclipse.virgo.kernel.model/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.model/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.osgi/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.osgi/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856c..92aa2909 100644
--- a/org.eclipse.virgo.kernel.osgi/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.osgi/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.osgicommand/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.osgicommand/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856c..92aa2909 100644
--- a/org.eclipse.virgo.kernel.osgicommand/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.osgicommand/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.services/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.services/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856c..92aa2909 100644
--- a/org.eclipse.virgo.kernel.services/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.services/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.shell/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.shell/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856c..92aa2909 100644
--- a/org.eclipse.virgo.kernel.shell/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.shell/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.smoketest/src/main/resources/.gitignore b/org.eclipse.virgo.kernel.smoketest/src/main/resources/suppresswarning/.gitignore
index e69de29b..e69de29b 100644
--- a/org.eclipse.virgo.kernel.smoketest/src/main/resources/.gitignore
+++ b/org.eclipse.virgo.kernel.smoketest/src/main/resources/suppresswarning/.gitignore
diff --git a/org.eclipse.virgo.kernel.stubs/src/test/resources/.gitignore b/org.eclipse.virgo.kernel.stubs/src/test/resources/suppresswarning/.gitignore
index e69de29b..e69de29b 100644
--- a/org.eclipse.virgo.kernel.stubs/src/test/resources/.gitignore
+++ b/org.eclipse.virgo.kernel.stubs/src/test/resources/suppresswarning/.gitignore
diff --git a/org.eclipse.virgo.kernel.test/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.test/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856c..92aa2909 100644
--- a/org.eclipse.virgo.kernel.test/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.test/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.test/src/main/resources/.gitignore b/org.eclipse.virgo.kernel.test/src/main/resources/suppresswarning/.gitignore
index e69de29b..e69de29b 100644
--- a/org.eclipse.virgo.kernel.test/src/main/resources/.gitignore
+++ b/org.eclipse.virgo.kernel.test/src/main/resources/suppresswarning/.gitignore
diff --git a/org.eclipse.virgo.kernel.userregion/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.userregion/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856c..92aa2909 100644
--- a/org.eclipse.virgo.kernel.userregion/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.userregion/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ConsoleConfigurationConvertor.java b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ConsoleConfigurationConvertor.java
index df79dbf7..0409fd18 100644
--- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ConsoleConfigurationConvertor.java
+++ b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ConsoleConfigurationConvertor.java
@@ -91,9 +91,11 @@ public class ConsoleConfigurationConvertor {
class ConsoleConfigurator implements ManagedService {
- private Dictionary properties;
+ @SuppressWarnings("rawtypes")
+ private Dictionary properties;
- @Override
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ @Override
public void updated(Dictionary props) throws ConfigurationException {
if (props != null) {
this.properties = props;
diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingRegistryHook.java b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingRegistryHook.java
index 8d8df13a..b43ff156 100644
--- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingRegistryHook.java
+++ b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingRegistryHook.java
@@ -31,26 +31,30 @@ import org.osgi.framework.hooks.service.FindHook;
@SuppressWarnings("deprecation")
final class ServiceScopingRegistryHook implements FindHook, EventHook {
- private final ServiceScopingStrategy serviceScopingStrategy;
-
- public ServiceScopingRegistryHook(ServiceScopingStrategy serviceScopingStrategy) {
- this.serviceScopingStrategy = serviceScopingStrategy;
- }
-
- @SuppressWarnings("unchecked")
- public void find(BundleContext context, String name, String filter, boolean allServices, Collection references) {
- this.serviceScopingStrategy.scopeReferences(references, context, name, filter);
- }
-
- @SuppressWarnings("unchecked")
- public void event(ServiceEvent event, Collection contexts) {
- ServiceReference ref = event.getServiceReference();
- for (Iterator iterator = contexts.iterator(); iterator.hasNext();) {
- BundleContext context = (BundleContext) iterator.next();
- if (!this.serviceScopingStrategy.isPotentiallyVisible(ref, context)) {
- iterator.remove();
- }
- }
- }
+ private final ServiceScopingStrategy serviceScopingStrategy;
+
+ public ServiceScopingRegistryHook(
+ ServiceScopingStrategy serviceScopingStrategy) {
+ this.serviceScopingStrategy = serviceScopingStrategy;
+ }
+
+ @SuppressWarnings("unchecked")
+ public void find(BundleContext context, String name, String filter,
+ boolean allServices,
+ @SuppressWarnings("rawtypes") Collection references) {
+ this.serviceScopingStrategy.scopeReferences(references, context, name,
+ filter);
+ }
+
+ @SuppressWarnings("rawtypes")
+ public void event(ServiceEvent event, Collection contexts) {
+ ServiceReference ref = event.getServiceReference();
+ for (Iterator iterator = contexts.iterator(); iterator.hasNext();) {
+ BundleContext context = (BundleContext) iterator.next();
+ if (!this.serviceScopingStrategy.isPotentiallyVisible(ref, context)) {
+ iterator.remove();
+ }
+ }
+ }
}
diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFramework.java b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFramework.java
index be16c218..89e6df61 100644
--- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFramework.java
+++ b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFramework.java
@@ -14,21 +14,19 @@ package org.eclipse.virgo.kernel.userregion.internal.equinox;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.osgi.framework.internal.core.Constants;
import org.eclipse.osgi.framework.internal.core.FrameworkProperties;
import org.eclipse.osgi.service.resolver.PlatformAdmin;
import org.eclipse.osgi.service.resolver.State;
+import org.eclipse.virgo.kernel.osgi.framework.ManifestTransformer;
+import org.eclipse.virgo.kernel.osgi.framework.OsgiFrameworkUtils;
+import org.eclipse.virgo.kernel.osgi.framework.OsgiServiceHolder;
+import org.eclipse.virgo.kernel.osgi.framework.support.AbstractOsgiFramework;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.ServiceReference;
import org.osgi.service.packageadmin.PackageAdmin;
-import org.eclipse.virgo.kernel.osgi.framework.ManifestTransformer;
-import org.eclipse.virgo.kernel.osgi.framework.OsgiFrameworkUtils;
-import org.eclipse.virgo.kernel.osgi.framework.OsgiServiceHolder;
-import org.eclipse.virgo.kernel.osgi.framework.support.AbstractOsgiFramework;
-
/**
* Implementation of <code>OsgiFramework</code> using Equinox.
*
@@ -51,7 +49,7 @@ public class EquinoxOsgiFramework extends AbstractOsgiFramework {
*/
public EquinoxOsgiFramework(BundleContext context, PackageAdmin packageAdmin, TransformedManifestProvidingBundleFileWrapper bundleTransformationHandler) {
super(context, packageAdmin);
- this.bootDelegationHelper = new EquinoxBootDelegationHelper(FrameworkProperties.getProperty(Constants.FRAMEWORK_BOOTDELEGATION));
+ this.bootDelegationHelper = new EquinoxBootDelegationHelper(FrameworkProperties.getProperty(org.osgi.framework.Constants.FRAMEWORK_BOOTDELEGATION));
this.platformAdmin = OsgiFrameworkUtils.getService(context, PlatformAdmin.class);
this.bundleTransformationHandler = bundleTransformationHandler;
}
diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/TransformedManifestProvidingBundleFileWrapper.java b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/TransformedManifestProvidingBundleFileWrapper.java
index 52cf0f7d..811383d2 100644
--- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/TransformedManifestProvidingBundleFileWrapper.java
+++ b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/TransformedManifestProvidingBundleFileWrapper.java
@@ -179,7 +179,7 @@ public class TransformedManifestProvidingBundleFileWrapper implements BundleFile
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public Enumeration getEntryPaths(String path) {
return this.bundleFile.getEntryPaths(path);
diff --git a/org.eclipse.virgo.kernel.userregionfactory/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.userregionfactory/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856c..92aa2909 100644
--- a/org.eclipse.virgo.kernel.userregionfactory/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.userregionfactory/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.userregionfactory/src/main/java/org/eclipse/virgo/kernel/userregionfactory/Activator.java b/org.eclipse.virgo.kernel.userregionfactory/src/main/java/org/eclipse/virgo/kernel/userregionfactory/Activator.java
index 0da52b26..d167ab5a 100644
--- a/org.eclipse.virgo.kernel.userregionfactory/src/main/java/org/eclipse/virgo/kernel/userregionfactory/Activator.java
+++ b/org.eclipse.virgo.kernel.userregionfactory/src/main/java/org/eclipse/virgo/kernel/userregionfactory/Activator.java
@@ -110,9 +110,6 @@ public final class Activator {
private DumpGenerator dumpGenerator;
- /**
- * {@inheritDoc}
- */
public void activate(ComponentContext componentContext) throws Exception {
this.bundleContext = componentContext.getBundleContext();
this.dumpGenerator = getPotentiallyDelayedService(bundleContext, DumpGenerator.class);
@@ -357,9 +354,6 @@ public final class Activator {
this.bundleContext.registerService(BundleContext.class, userRegionBundleContext, properties);
}
- /**
- * {@inheritDoc}
- */
public void deactivate(ComponentContext context) throws Exception {
}

Back to the top