Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2012-05-30 05:50:20 -0400
committerChristopher Frost2012-05-30 05:50:20 -0400
commitf1ff381779a77bec2c982195f2f988fa09e3e428 (patch)
tree1f5e20e5733fe29939b7c3409a74a754ec1f8c9a
parentac361c708cf722a43afbddd76a969f50f1426941 (diff)
downloadorg.eclipse.virgo.kernel-f1ff381779a77bec2c982195f2f988fa09e3e428.tar.gz
org.eclipse.virgo.kernel-f1ff381779a77bec2c982195f2f988fa09e3e428.tar.xz
org.eclipse.virgo.kernel-f1ff381779a77bec2c982195f2f988fa09e3e428.zip
Updating to new version of Gemini Management
-rwxr-xr-xbuild-kernel/config/osgi.console.properties6
-rw-r--r--build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties2
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.virgo.management/feature.xml2
-rw-r--r--build.versions2
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/management/StubQuasiResolutionFailure.java (renamed from org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/management/StubQuasiResolutionFailure.java)0
-rw-r--r--org.eclipse.virgo.management.fragment/.classpath2
-rw-r--r--org.eclipse.virgo.management.fragment/src/main/java/org/eclipse/virgo/management/fragment/VirgoObjectNameTranslator.java2
-rw-r--r--org.eclipse.virgo.management.fragment/template.mf4
8 files changed, 7 insertions, 13 deletions
diff --git a/build-kernel/config/osgi.console.properties b/build-kernel/config/osgi.console.properties
deleted file mode 100755
index 34292ecd..00000000
--- a/build-kernel/config/osgi.console.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-telnet.enabled=false
-telnet.port=2401
-telnet.host=localhost
-ssh.enabled=false
-ssh.port=2402
-ssh.host=localhost \ No newline at end of file
diff --git a/build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties b/build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties
index 5f2dde9b..31fdc42b 100644
--- a/build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties
+++ b/build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties
@@ -4,7 +4,7 @@ baseBundles = \
file:plugins/org.eclipse.virgo.kernel.osgicommand_@KERNEL.VERSION@.jar@start,\
file:plugins/org.eclipse.osgi.services_@OSGI.SERVICES.VERSION@.jar@start,\
file:plugins/osgi.enterprise_@OSGI.ENTERPRISE.VERSION@.jar,\
- file:plugins/org.eclipse.gemini.mgmt_@GEMINI.MANAGEMENT.VERSION@.jar@start,\
+ file:plugins/org.eclipse.gemini.management_@GEMINI.MANAGEMENT.VERSION@.jar@start,\
file:plugins/org.eclipse.virgo.management.fragment_@KERNEL.VERSION@.jar,\
file:plugins/com.springsource.org.apache.mina.core_@MINA.CORE.VERSION@.jar@start,\
file:plugins/org.apache.felix.gogo.command_@FELIX.GOGO.COMMAND.VERSION@.jar@start,\
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.management/feature.xml b/build-kernel/publish_resources/features/org.eclipse.virgo.management/feature.xml
index a63db7db..92e8d74c 100755
--- a/build-kernel/publish_resources/features/org.eclipse.virgo.management/feature.xml
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.management/feature.xml
@@ -27,7 +27,7 @@
autostart="true"/>
<plugin
- id="org.eclipse.gemini.mgmt"
+ id="org.eclipse.gemini.management"
download-size="0"
install-size="0"
version="@GEMINI.MANAGEMENT.VERSION@"
diff --git a/build.versions b/build.versions
index 0a53ddf8..60fbdfe8 100644
--- a/build.versions
+++ b/build.versions
@@ -7,7 +7,7 @@ org.eclipse.equinox.cm=1.0.300.v20101204
org.eclipse.equinox.region=1.0.0.v20110503
org.eclipse.equinox.console.supportability=1.0.0.N20110815-2000
org.osgi.enterprise=4.2.0.v201108120515
-org.eclipse.gemini.management=1.0.1.RELEASE
+org.eclipse.gemini.management=1.0.2.RELEASE
org.aspectj=1.6.12.RELEASE
org.eclipse.osgi=3.7.1.R37x_v20110808-1106
ch.qos.logback=0.9.28
diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/management/StubQuasiResolutionFailure.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/management/StubQuasiResolutionFailure.java
index 40ed9cf6..40ed9cf6 100644
--- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/management/StubQuasiResolutionFailure.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/management/StubQuasiResolutionFailure.java
diff --git a/org.eclipse.virgo.management.fragment/.classpath b/org.eclipse.virgo.management.fragment/.classpath
index c2935091..5409bdde 100644
--- a/org.eclipse.virgo.management.fragment/.classpath
+++ b/org.eclipse.virgo.management.fragment/.classpath
@@ -22,7 +22,7 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<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.5.0.200809221524/org.eclipse.osgi-3.5.0.200809221524.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.management/1.0.1.RELEASE/org.eclipse.gemini.management-1.0.1.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.management/1.0.2.RELEASE/org.eclipse.gemini.management-1.0.2.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.region/1.0.0.v20110503/org.eclipse.equinox.region-1.0.0.v20110503.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.region/1.0.0.v20110503/org.eclipse.equinox.region-1.0.0.v20110503.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<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"/>
diff --git a/org.eclipse.virgo.management.fragment/src/main/java/org/eclipse/virgo/management/fragment/VirgoObjectNameTranslator.java b/org.eclipse.virgo.management.fragment/src/main/java/org/eclipse/virgo/management/fragment/VirgoObjectNameTranslator.java
index 3ceb9c0b..c69c293d 100644
--- a/org.eclipse.virgo.management.fragment/src/main/java/org/eclipse/virgo/management/fragment/VirgoObjectNameTranslator.java
+++ b/org.eclipse.virgo.management.fragment/src/main/java/org/eclipse/virgo/management/fragment/VirgoObjectNameTranslator.java
@@ -17,7 +17,7 @@ import javax.management.ObjectName;
import org.eclipse.equinox.region.Region;
import org.eclipse.equinox.region.RegionDigraph;
-import org.eclipse.gemini.mgmt.ObjectNameTranslator;
+import org.eclipse.gemini.management.ObjectNameTranslator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
diff --git a/org.eclipse.virgo.management.fragment/template.mf b/org.eclipse.virgo.management.fragment/template.mf
index 368361bf..28fdd20a 100644
--- a/org.eclipse.virgo.management.fragment/template.mf
+++ b/org.eclipse.virgo.management.fragment/template.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Virgo Management Fragment
-Fragment-Host: org.eclipse.gemini.mgmt;bundle-version="${org.eclipse.gemini.management:[=.=.=, =.+1)}"
+Fragment-Host: org.eclipse.gemini.management;bundle-version="${org.eclipse.gemini.management:[=.=.=, =.+1)}"
Bundle-SymbolicName: org.eclipse.virgo.management.fragment
Bundle-Version: ${version}
GeminiManagement-ObjectNameTranslator: org.eclipse.virgo.management.fragment.VirgoObjectNameTranslator
@@ -9,5 +9,5 @@ Import-Package:
org.eclipse.equinox.region;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}",
javax.management;version="0",
org.osgi.framework;version="0"
-Excluded-Imports: org.eclipse.gemini.mgmt
+Excluded-Imports: org.eclipse.gemini.management
Excluded-Exports: *

Back to the top