Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2012-02-23 12:47:57 -0500
committerChristopher Frost2012-02-23 12:47:57 -0500
commit4bc0e1c36ba87e8d3f6f907fc0dafceb3beebde8 (patch)
treea0dcdcc922096741a87eac1a0c9cbd99472fc44b
parentc1aac7031c065704d2cbba34aba898b072452db6 (diff)
downloadorg.eclipse.virgo.kernel-4bc0e1c36ba87e8d3f6f907fc0dafceb3beebde8.tar.gz
org.eclipse.virgo.kernel-4bc0e1c36ba87e8d3f6f907fc0dafceb3beebde8.tar.xz
org.eclipse.virgo.kernel-4bc0e1c36ba87e8d3f6f907fc0dafceb3beebde8.zip
368157 Fixes for the build to apply the fragments to both regions
-rw-r--r--build-kernel/build.xml224
-rw-r--r--build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties1
-rw-r--r--build-kernel/plugins-ivy.xml4
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.gemini.management/feature.xml37
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.xml172
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.virgo.management/.project (renamed from build-kernel/publish_resources/features/org.eclipse.gemini.management/.project)0
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.virgo.management/build.properties (renamed from build-kernel/publish_resources/features/org.eclipse.gemini.management/build.properties)0
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.virgo.management/eclipse_update_120.jpg (renamed from build-kernel/publish_resources/features/org.eclipse.gemini.management/eclipse_update_120.jpg)bin21695 -> 21695 bytes
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.virgo.management/epl-v10.html (renamed from build-kernel/publish_resources/features/org.eclipse.gemini.management/epl-v10.html)0
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.virgo.management/feature.properties (renamed from build-kernel/publish_resources/features/org.eclipse.gemini.management/feature.properties)4
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.virgo.management/feature.xml45
-rwxr-xr-xbuild-kernel/publish_resources/products/kernel/kernel.product2
-rw-r--r--build-kernel/repository/ext/osgi.console.properties2
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/.classpath2
-rw-r--r--org.eclipse.virgo.management.fragment/.classpath29
-rw-r--r--org.eclipse.virgo.management.fragment/.project41
-rw-r--r--org.eclipse.virgo.management.fragment/.settings/com.springsource.server.ide.bundlor.core.prefs3
-rw-r--r--org.eclipse.virgo.management.fragment/.settings/org.eclipse.wst.common.project.facet.core.xml4
-rw-r--r--org.eclipse.virgo.management.fragment/.settings/org.springframework.ide.eclipse.beans.core.prefs3
-rw-r--r--org.eclipse.virgo.management.fragment/build.xml9
-rw-r--r--org.eclipse.virgo.management.fragment/ivy.xml21
-rw-r--r--org.eclipse.virgo.management.fragment/src/main/java/org/eclipse/virgo/management/fragment/VirgoObjectNameTranslator.java44
-rw-r--r--org.eclipse.virgo.management.fragment/src/test/java/.gitignore0
-rw-r--r--org.eclipse.virgo.management.fragment/src/test/resources/.gitignore0
-rw-r--r--org.eclipse.virgo.management.fragment/template.mf12
25 files changed, 417 insertions, 242 deletions
diff --git a/build-kernel/build.xml b/build-kernel/build.xml
index 70b7b250..3c4226d3 100644
--- a/build-kernel/build.xml
+++ b/build-kernel/build.xml
@@ -6,10 +6,11 @@
<pathelement location="../org.eclipse.virgo.kernel.services"/>
<pathelement location="../org.eclipse.virgo.kernel.osgi"/>
<pathelement location="../org.eclipse.virgo.kernel.deployer"/>
- <pathelement location="../org.eclipse.virgo.kernel.userregionfactory"/>
+ <pathelement location="../org.eclipse.virgo.kernel.userregionfactory"/>
<pathelement location="../org.eclipse.virgo.kernel.userregion"/>
<pathelement location="../org.eclipse.virgo.kernel.agent.dm"/>
<pathelement location="../org.eclipse.virgo.kernel.kerneldmfragment"/>
+ <pathelement location="../org.eclipse.virgo.management.fragment"/>
<pathelement location="../org.eclipse.virgo.kernel.dmfragment"/>
<pathelement location="../org.eclipse.virgo.kernel.deployer.dm"/>
<pathelement location="../org.eclipse.virgo.kernel.model"/>
@@ -32,23 +33,23 @@
<target name="precommit" depends="clean, clean-integration, test, findbugs, package, smoke-test"
description="Performs a CI server-like build, should be run prior to performing a Git push"/>
-
- <target name="fetch-nano-updatesite">
+
+ <target name="fetch-nano-updatesite">
<mkdir dir="${target.dir}"/>
-
+
<condition property="dependancy.folder" value="milestone" else="${adjusted.release.type}">
<or>
<contains string="${org.eclipse.virgo.nano}" substring=".M"/>
<contains string="${org.eclipse.virgo.nano}" substring=".RC"/>
</or>
</condition>
-
+
<condition property="dependancy.folder" value="release" else="${adjusted.release.type}">
<contains string="${org.eclipse.virgo.nano}" substring=".RELEASE"/>
</condition>
-
+
<get src="http://build.eclipse.org/rt/virgo/zips/${dependancy.folder}/VN/${org.eclipse.virgo.nano}/virgo-nano-updatesite-${org.eclipse.virgo.nano}.zip"
- dest="${target.dir}/virgo-nano-updatesite-${org.eclipse.virgo.nano}.zip"
+ dest="${target.dir}/virgo-nano-updatesite-${org.eclipse.virgo.nano}.zip"
usetimestamp="true" />
<echo message="Fetched the Nano zip to ${target.dir}/virgo-nano-updatesite-${org.eclipse.virgo.nano}.zip"/>
@@ -57,32 +58,32 @@
<target name="package" depends="ivy.init, fetch-nano-updatesite">
<delete dir="${package.output.dir}" quiet="true"/>
<mkdir dir="${package.output.dir}"/>
-
- <unzip src="${target.dir}/virgo-nano-updatesite-${org.eclipse.virgo.nano}.zip" dest="${p2.repository.dir}">
+
+ <unzip src="${target.dir}/virgo-nano-updatesite-${org.eclipse.virgo.nano}.zip" dest="${p2.repository.dir}">
<globmapper from="virgo-nano-updatesite-${org.eclipse.virgo.nano}/*" to="*"/>
</unzip>
- <delete file="${target.dir}/virgo-nano-updatesite-${org.eclipse.virgo.nano}.zip" quiet="true"/>
+ <delete file="${target.dir}/virgo-nano-updatesite-${org.eclipse.virgo.nano}.zip" quiet="true"/>
<echo message="Fetched the Nano update site zip to ${target.dir}/virgo-nano-updatesite-${org.eclipse.virgo.nano}.zip"/>
-
- <!-- Assemble the kernel bundles for publishing -->
- <ivy:resolve resolveId="copy.path" file="${basedir}/plugins-ivy.xml" transitive="true"/>
+
+ <!-- Assemble the kernel bundles for publishing -->
+ <ivy:resolve resolveId="copy.path" file="${basedir}/plugins-ivy.xml" transitive="true"/>
<ivy:retrieve resolveId="copy.path" pattern="${target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="plugins" type="jar"/>
- <!-- Prepare the features for publishing -->
- <copy todir="${target.dir}/assembly/features" failonerror="false">
+ <!-- Prepare the features for publishing -->
+ <copy todir="${target.dir}/assembly/features" failonerror="false">
<fileset dir="${basedir}/publish_resources/features" excludes="keystore"/>
- <filterset>
+ <filterset>
<filter token="REGION.VERSION" value="${org.eclipse.equinox.region}"/>
<filter token="KERNEL.VERSION" value="${bundle.version}"/>
<filter token="REPOSITORY.VERSION" value="${org.eclipse.virgo.repository}"/>
- <filter token="SPRING.VERSION" value="${org.springframework}"/>
+ <filter token="SPRING.VERSION" value="${org.springframework}"/>
<filter token="GEMINI.MANAGEMENT.VERSION" value="${org.eclipse.gemini.management}"/>
- </filterset>
+ </filterset>
</copy>
-
- <!-- prepare Kernel's resources - configurations and bundles that are not installed initially -->
- <property name="kernel.resources" value="${target.dir}/kernel_resources"/>
-
+
+ <!-- prepare Kernel's resources - configurations and bundles that are not installed initially -->
+ <property name="kernel.resources" value="${target.dir}/kernel_resources"/>
+
<ivy:resolve resolveId="copy.path" file="${basedir}/lib-ivy.xml" transitive="true"/>
<ivy:retrieve resolveId="copy.path" pattern="${kernel.resources}/lib/[artifact]_[revision].[ext]" conf="lib" type="jar"/>
@@ -94,53 +95,53 @@
<copy todir="${kernel.resources}/configuration" failonerror="false">
<fileset dir="${basedir}/configuration" excludes="org.eclipse.virgo.kernel.userregion.properties"/>
</copy>
-
- <copy todir="${kernel.resources}" failonerror="false">
+
+ <copy todir="${kernel.resources}" failonerror="false">
<fileset dir="${basedir}/resources"/>
</copy>
-
+
<copy todir="${kernel.resources}/repository/ext" failonerror="false">
<fileset dir="${basedir}/repository/ext"/>
</copy>
-
+
<copy todir="${kernel.resources}/repository/ext" failonerror="false">
<fileset dir="${target.dir}/assembly/plugins">
<include name="org.eclipse.virgo.kernel.agent.dm_*.jar"/>
</fileset>
</copy>
- <!-- Prepare these two as part of the resources. They need a later installation, not with the other initial kernel region bundles. -->
- <copy todir="${kernel.resources}/plugins" failonerror="false">
+ <!-- Prepare these two as part of the resources. They need a later installation, not with the other initial kernel region bundles. -->
+ <copy todir="${kernel.resources}/plugins" failonerror="false">
<fileset dir="${target.dir}/assembly/plugins">
<include name="org.eclipse.virgo.kernel.userregion_*.jar"/>
- <include name="org.eclipse.virgo.kernel.osgicommand_*.jar"/>
+ <include name="org.eclipse.virgo.kernel.osgicommand_*.jar"/>
</fileset>
</copy>
-
+
<move todir="${kernel.resources}/repository/ext" failonerror="false">
<fileset dir="${target.dir}/assembly/plugins">
<include name="org.eclipse.virgo.kernel.dmfragment_*.jar"/>
<include name="org.eclipse.virgo.kernel.deployer.dm_*.jar"/>
</fileset>
</move>
-
+
<mkdir dir="${kernel.resources}/repository/usr"/>
-
- <property name="kernel.resources.location" value="${target.dir}/kernel_resources_zipped"/>
+
+ <property name="kernel.resources.location" value="${target.dir}/kernel_resources_zipped"/>
<zip destfile="${kernel.resources.location}/binary/kernel_resources">
<zipfileset dir="${kernel.resources}"/>
</zip>
- <delete dir="${kernel.resources}" quiet="true"/>
-
- <!-- Assemble and prepare for publishing the Kernel's specific resources -->
- <property name="specific.resources" value="${target.dir}/specific_resources"/>
- <mkdir dir="${specific.resources}/lib"/>
- <mkdir dir="${specific.resources}/configuration"/>
-
- <copy todir="${specific.resources}/configuration" failonerror="false">
+ <delete dir="${kernel.resources}" quiet="true"/>
+
+ <!-- Assemble and prepare for publishing the Kernel's specific resources -->
+ <property name="specific.resources" value="${target.dir}/specific_resources"/>
+ <mkdir dir="${specific.resources}/lib"/>
+ <mkdir dir="${specific.resources}/configuration"/>
+
+ <copy todir="${specific.resources}/configuration" failonerror="false">
<fileset dir="${basedir}/configuration">
<include name="org.eclipse.virgo.kernel.userregion.properties"/>
</fileset>
- <filterset>
+ <filterset>
<filter token="ASPECTJ.VERSION" value="${org.aspectj}"/>
<filter token="OSGI.SERVICES.VERSION" value="${org.eclipse.osgi.services}"/>
<filter token="EQUINOX.EVENT.VERSION" value="${org.eclipse.equinox.event}"/>
@@ -153,83 +154,82 @@
<filter token="MEDIC.VERSION" value="${org.eclipse.virgo.medic}"/>
<filter token="REPOSITORY.VERSION" value="${org.eclipse.virgo.repository}"/>
<filter token="SLF4J.VERSION" value="${org.slf4j}"/>
- <filter token="SPRING.DM.VERSION" value="${org.springframework.osgi}"/>
+ <filter token="SPRING.DM.VERSION" value="${org.springframework.osgi}"/>
<filter token="SPRING.VERSION" value="${org.springframework}"/>
<filter token="UTIL.VERSION" value="${org.eclipse.virgo.util}"/>
<filter token="FELIX.GOGO.RUNTIME.VERSION" value="${org.apache.felix.gogo.runtime}"/>
- <filter token="FELIX.GOGO.COMMAND.VERSION" value="${org.apache.felix.gogo.command}"/>
- <filter token="FELIX.GOGO.SHELL.VERSION" value="${org.apache.felix.gogo.shell}"/>
+ <filter token="FELIX.GOGO.COMMAND.VERSION" value="${org.apache.felix.gogo.command}"/>
+ <filter token="FELIX.GOGO.SHELL.VERSION" value="${org.apache.felix.gogo.shell}"/>
<filter token="MINA.CORE.VERSION" value="${com.springsource.org.apache.mina.core}"/>
<filter token="SSHD.CORE.VERSION" value="${com.springsource.org.apache.sshd.core}"/>
<filter token="EQUINOX.CONSOLE.VERSION" value="${org.eclipse.equinox.console.supportability}"/>
</filterset>
</copy>
-
- <!-- get and reconfigure the serviceability.xml and .version -->
- <unzip src="${p2.repository.dir}/binary/nano_specific_resources_1.0.0" dest="${specific.resources}">
+
+ <!-- get and reconfigure the serviceability.xml and .version -->
+ <unzip src="${p2.repository.dir}/binary/nano_specific_resources_1.0.0" dest="${specific.resources}">
<globmapper from="nano_specific_resources/*" to="*"/>
</unzip>
- <echo file="${specific.resources}/lib/.version" append="true" message="virgo.kernel.version=${bundle.version}&#xa;"/>
-
- <replaceregexp match="virgo-nano" replace="virgo-kernel" flags="g"
- file="${specific.resources}/configuration/serviceability.xml"/>
-
- <property name="specific.resources.location" value="${target.dir}/specific_resources_zipped"/>
- <zip destfile="${specific.resources.location}/binary/kernel_specific_resources">
+ <echo file="${specific.resources}/lib/.version" append="true" message="virgo.kernel.version=${bundle.version}&#xa;"/>
+
+ <replaceregexp match="virgo-nano" replace="virgo-kernel" flags="g" file="${specific.resources}/configuration/serviceability.xml"/>
+
+ <property name="specific.resources.location" value="${target.dir}/specific_resources_zipped"/>
+ <zip destfile="${specific.resources.location}/binary/kernel_specific_resources">
<zipfileset dir="${specific.resources}"/>
</zip>
- <delete dir="${specific.resources}" quiet="true"/>
-
- <!-- Publish -->
+ <delete dir="${specific.resources}" quiet="true"/>
+
+ <!-- Publish -->
<mkdir dir="${artifacts.dir}"/>
-
- <antcall target="fetch-unzipped-virgo-build-tools"/>
-
- <antcall target="p2.generate-inf">
- <param name="source" value="${target.dir}/assembly/features"/>
- </antcall>
-
- <property name="p2.products.location" value="${basedir}/publish_resources/products"/>
-
- <antcall target="p2.publish-binary">
- <param name="repository" value="${p2.repository.dir}"/>
- <param name="source" value="${kernel.resources.location}"/>
- </antcall>
- <echo message="Published the kernel resources to ${p2.repository.dir}."/>
-
- <antcall target="p2.publish-binary">
- <param name="repository" value="${p2.repository.dir}"/>
- <param name="source" value="${specific.resources.location}"/>
- </antcall>
- <echo message="Published the kernel specific resources to ${p2.repository.dir}."/>
-
- <antcall target="p2.publish-bundles-features">
- <param name="repository" value="${p2.repository.dir}"/>
- <param name="source" value="${target.dir}/assembly"/>
- </antcall>
- <echo message="Published bundles and features to ${p2.repository.dir}."/>
-
- <antcall target="p2.publish-product">
- <param name="repository" value="${p2.repository.dir}"/>
- <param name="product.file.location" value="${p2.products.location}/kernel-base/kernel-base.product"/>
- </antcall>
- <echo message="Published kernel base product to ${p2.repository.dir}."/>
-
- <antcall target="p2.publish-product">
- <param name="repository" value="${p2.repository.dir}"/>
- <param name="product.file.location" value="${p2.products.location}/kernel/kernel.product"/>
- </antcall>
- <echo message="Published kernel product to ${p2.repository.dir}."/>
-
- <antcall target="p2.install-virgo-product">
- <param name="repository" value="${p2.repository.dir}"/>
- <param name="destination" value="${package.output.dir}"/>
- <param name="product.iu" value="kernel.product"/>
- </antcall>
- <echo message="Installed Virgo Kernel for distribution purposes."/>
-
- <delete dir="${package.output.dir}/Eclipse.app" quiet="true"/>
-
+
+ <antcall target="fetch-unzipped-virgo-build-tools"/>
+
+ <antcall target="p2.generate-inf">
+ <param name="source" value="${target.dir}/assembly/features"/>
+ </antcall>
+
+ <property name="p2.products.location" value="${basedir}/publish_resources/products"/>
+
+ <antcall target="p2.publish-binary">
+ <param name="repository" value="${p2.repository.dir}"/>
+ <param name="source" value="${kernel.resources.location}"/>
+ </antcall>
+ <echo message="Published the kernel resources to ${p2.repository.dir}."/>
+
+ <antcall target="p2.publish-binary">
+ <param name="repository" value="${p2.repository.dir}"/>
+ <param name="source" value="${specific.resources.location}"/>
+ </antcall>
+ <echo message="Published the kernel specific resources to ${p2.repository.dir}."/>
+
+ <antcall target="p2.publish-bundles-features">
+ <param name="repository" value="${p2.repository.dir}"/>
+ <param name="source" value="${target.dir}/assembly"/>
+ </antcall>
+ <echo message="Published bundles and features to ${p2.repository.dir}."/>
+
+ <antcall target="p2.publish-product">
+ <param name="repository" value="${p2.repository.dir}"/>
+ <param name="product.file.location" value="${p2.products.location}/kernel-base/kernel-base.product"/>
+ </antcall>
+ <echo message="Published kernel base product to ${p2.repository.dir}."/>
+
+ <antcall target="p2.publish-product">
+ <param name="repository" value="${p2.repository.dir}"/>
+ <param name="product.file.location" value="${p2.products.location}/kernel/kernel.product"/>
+ </antcall>
+ <echo message="Published kernel product to ${p2.repository.dir}."/>
+
+ <antcall target="p2.install-virgo-product">
+ <param name="repository" value="${p2.repository.dir}"/>
+ <param name="destination" value="${package.output.dir}"/>
+ <param name="product.iu" value="kernel.product"/>
+ </antcall>
+ <echo message="Installed Virgo Kernel for distribution purposes."/>
+
+ <delete dir="${package.output.dir}/Eclipse.app" quiet="true"/>
+
<zip destfile="${package.output.file}">
<zipfileset dir="${package.dir}" includes="${package.basename}/bin/*.sh" filemode="755"/>
<zipfileset dir="${package.dir}" includes="${package.basename}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
@@ -238,14 +238,14 @@
<exclude name="${package.basename}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
</zipfileset>
</zip>
- <zip destfile="${updatesite.output.file}">
+ <zip destfile="${updatesite.output.file}">
<zipfileset dir="${p2.repository.dir}"/>
</zip>
-
- <delete dir="${kernel.resources.location}" quiet="true"/>
- <delete dir="${specific.resources.location}" quiet="true"/>
- <delete dir="${target.dir}/assembly" quiet="true"/>
- <delete dir="${tools.dir}" quiet="true"/>
+
+ <delete dir="${kernel.resources.location}" quiet="true"/>
+ <delete dir="${specific.resources.location}" quiet="true"/>
+ <delete dir="${target.dir}/assembly" quiet="true"/>
+ <delete dir="${tools.dir}" quiet="true"/>
</target>
<target name="smoke-test" description="Runs a smoke test on the kernel packaged build">
diff --git a/build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties b/build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties
index 07f41750..82741bec 100644
--- a/build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties
+++ b/build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties
@@ -5,6 +5,7 @@ baseBundles = \
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.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,\
file:plugins/org.apache.felix.gogo.runtime_@FELIX.GOGO.RUNTIME.VERSION@.jar@start,\
diff --git a/build-kernel/plugins-ivy.xml b/build-kernel/plugins-ivy.xml
index e408afb4..bbf1b445 100644
--- a/build-kernel/plugins-ivy.xml
+++ b/build-kernel/plugins-ivy.xml
@@ -11,8 +11,8 @@
<dependencies>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel" rev="latest.integration" conf="plugins->runtime"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgicommand" rev="latest.integration" conf="plugins->runtime"/>
+ <dependency org="org.eclipse.virgo" name="org.eclipse.virgo.management.fragment" rev="latest.integration" conf="plugins->runtime"/>
<dependency org="org.eclipse.osgi" name='org.eclipse.equinox.region' rev='${org.eclipse.equinox.region}' conf="plugins->runtime" />
- <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.management" rev="${org.eclipse.gemini.management}" conf="plugins->runtime" />
<!-- The exclude of Equinox (org="org.eclipse.osgi" module="org.eclipse.osgi") does not work.
This is due to the transitive dependency from org.eclipse.virgo.osgi.equinox on org.eclipse.osgi
@@ -26,7 +26,7 @@
<exclude org="org.jboss.vfs"/>
<exclude org="org.apache.commons" module="com.springsource.org.apache.commons.logging"/>
<exclude org="org.springframework" module="org.springframework.context.support"/>
-
+
<override org="org.eclipse.virgo.util" rev="${org.eclipse.virgo.util}"/>
<override org="org.eclipse.virgo.medic" rev="${org.eclipse.virgo.medic}"/>
<override org="org.eclipse.osgi" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>
diff --git a/build-kernel/publish_resources/features/org.eclipse.gemini.management/feature.xml b/build-kernel/publish_resources/features/org.eclipse.gemini.management/feature.xml
deleted file mode 100755
index fb4e3705..00000000
--- a/build-kernel/publish_resources/features/org.eclipse.gemini.management/feature.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.gemini.management"
- label="%featureName"
- version="@GEMINI.MANAGEMENT.VERSION@"
- provider-name="%providerName"
- image="eclipse_update_120.jpg">
-
- <description url="http://www.eclipse.org/gemini/management/">
- %description
- </description>
-
- <copyright url="http://www.eclipse.org/gemini/management/">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin
- id="org.eclipse.gemini.mgmt"
- download-size="0"
- install-size="0"
- version="@GEMINI.MANAGEMENT.VERSION@"
- unpack="false"
- autostart="true"/>
-
- <plugin
- id="osgi.enterprise"
- download-size="0"
- install-size="0"
- version="4.2.0.v201108120515"
- unpack="false"
- autostart="false"/>
-
-</feature>
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.xml b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.xml
index 23aa8163..12c90bc9 100755
--- a/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.xml
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.xml
@@ -1,96 +1,96 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.eclipse.virgo.kernel"
- label="%featureName"
- version="@KERNEL.VERSION@"
- provider-name="%providerName"
- image="eclipse_update_120.jpg">
+ id="org.eclipse.virgo.kernel"
+ label="%featureName"
+ version="@KERNEL.VERSION@"
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg">
- <description url="http://www.eclipse.org/virgo/">
- %description
- </description>
+ <description url="http://www.eclipse.org/virgo/">
+ %description
+ </description>
- <copyright url="http://www.eclipse.org/virgo/">
- %copyright
- </copyright>
+ <copyright url="http://www.eclipse.org/virgo/">
+ %copyright
+ </copyright>
- <license url="%licenseURL">
- %license
- </license>
+ <license url="%licenseURL">
+ %license
+ </license>
- <requires>
- <import feature="org.eclipse.virgo.core" version="0.0.0"/>
- <import feature="org.eclipse.equinox.regions" version="0.0.0"/>
- </requires>
+ <requires>
+ <import feature="org.eclipse.virgo.core" version="0.0.0"/>
+ <import feature="org.eclipse.equinox.regions" version="0.0.0"/>
+ </requires>
<plugin
- id="org.eclipse.virgo.kernel.deployer"
- download-size="0"
- install-size="0"
- version="@KERNEL.VERSION@"
- unpack="false"
- autostart="true"/>
- <plugin
- id="org.eclipse.virgo.repository"
- download-size="0"
- install-size="0"
- version="@REPOSITORY.VERSION@"
- unpack="false"
- autostart="true"/>
- <plugin
- id="org.eclipse.virgo.kernel.agent.dm"
- download-size="0"
- install-size="0"
- version="@KERNEL.VERSION@"
- unpack="false"
- autostart="true"/>
- <plugin
- id="org.eclipse.virgo.kernel.artifact"
- download-size="0"
- install-size="0"
- version="@KERNEL.VERSION@"
- unpack="false"
- autostart="true"/>
- <plugin
- id="org.eclipse.virgo.kernel.services"
- download-size="0"
- install-size="0"
- version="@KERNEL.VERSION@"
- unpack="false"
- autostart="true"/>
- <plugin
- id="org.eclipse.virgo.kernel.model"
- download-size="0"
- install-size="0"
- version="@KERNEL.VERSION@"
- unpack="false"
- autostart="true"/>
- <plugin
- id="org.eclipse.virgo.kernel.shell"
- download-size="0"
- install-size="0"
- version="@KERNEL.VERSION@"
- unpack="false"
- autostart="true"/>
- <plugin
- id="org.eclipse.virgo.kernel.osgi"
- download-size="0"
- install-size="0"
- version="@KERNEL.VERSION@"
- unpack="false"
- autostart="true"/>
- <plugin
- id="org.eclipse.virgo.kernel.userregionfactory"
- download-size="0"
- install-size="0"
- version="@KERNEL.VERSION@"
- unpack="false"
- autostart="true"/>
- <plugin
- id="org.eclipse.virgo.kernel.kerneldmfragment"
- download-size="0"
- install-size="0"
- version="@KERNEL.VERSION@"
- unpack="false"/>
+ id="org.eclipse.virgo.kernel.deployer"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"
+ autostart="true"/>
+ <plugin
+ id="org.eclipse.virgo.repository"
+ download-size="0"
+ install-size="0"
+ version="@REPOSITORY.VERSION@"
+ unpack="false"
+ autostart="true"/>
+ <plugin
+ id="org.eclipse.virgo.kernel.agent.dm"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"
+ autostart="true"/>
+ <plugin
+ id="org.eclipse.virgo.kernel.artifact"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"
+ autostart="true"/>
+ <plugin
+ id="org.eclipse.virgo.kernel.services"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"
+ autostart="true"/>
+ <plugin
+ id="org.eclipse.virgo.kernel.model"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"
+ autostart="true"/>
+ <plugin
+ id="org.eclipse.virgo.kernel.shell"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"
+ autostart="true"/>
+ <plugin
+ id="org.eclipse.virgo.kernel.osgi"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"
+ autostart="true"/>
+ <plugin
+ id="org.eclipse.virgo.kernel.userregionfactory"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"
+ autostart="true"/>
+ <plugin
+ id="org.eclipse.virgo.kernel.kerneldmfragment"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"/>
</feature>
diff --git a/build-kernel/publish_resources/features/org.eclipse.gemini.management/.project b/build-kernel/publish_resources/features/org.eclipse.virgo.management/.project
index 0d8264ba..0d8264ba 100644
--- a/build-kernel/publish_resources/features/org.eclipse.gemini.management/.project
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.management/.project
diff --git a/build-kernel/publish_resources/features/org.eclipse.gemini.management/build.properties b/build-kernel/publish_resources/features/org.eclipse.virgo.management/build.properties
index db80add9..db80add9 100644
--- a/build-kernel/publish_resources/features/org.eclipse.gemini.management/build.properties
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.management/build.properties
diff --git a/build-kernel/publish_resources/features/org.eclipse.gemini.management/eclipse_update_120.jpg b/build-kernel/publish_resources/features/org.eclipse.virgo.management/eclipse_update_120.jpg
index bfdf708a..bfdf708a 100755
--- a/build-kernel/publish_resources/features/org.eclipse.gemini.management/eclipse_update_120.jpg
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.management/eclipse_update_120.jpg
Binary files differ
diff --git a/build-kernel/publish_resources/features/org.eclipse.gemini.management/epl-v10.html b/build-kernel/publish_resources/features/org.eclipse.virgo.management/epl-v10.html
index eecc800f..eecc800f 100755
--- a/build-kernel/publish_resources/features/org.eclipse.gemini.management/epl-v10.html
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.management/epl-v10.html
diff --git a/build-kernel/publish_resources/features/org.eclipse.gemini.management/feature.properties b/build-kernel/publish_resources/features/org.eclipse.virgo.management/feature.properties
index 4acea9e2..61c85d2c 100644
--- a/build-kernel/publish_resources/features/org.eclipse.gemini.management/feature.properties
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.management/feature.properties
@@ -20,7 +20,7 @@
# This file should be translated.
# "featureName" property - name of the feature
-featureName=Eclipse Gemini Management Feature
+featureName=Eclipse Virgo Management Feature
# "providerName" property - name of the company that provides the feature
providerName=Eclipse.org
@@ -28,7 +28,7 @@ providerName=Eclipse.org
# "updateSiteName" property - label for the update site
# "description" property - description of the feature
-description=This feature provides OSGi JMX support.\n\
+description=This feature provides OSGi JMX support for Virgo.\n\
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
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
new file mode 100755
index 00000000..a63db7db
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.management/feature.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.virgo.management"
+ label="%featureName"
+ version="@KERNEL.VERSION@"
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg">
+
+ <description url="http://www.eclipse.org/gemini/management/">
+ %description
+ </description>
+
+ <copyright url="http://www.eclipse.org/gemini/management/">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.virgo.management.fragment"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"
+ autostart="true"/>
+
+ <plugin
+ id="org.eclipse.gemini.mgmt"
+ download-size="0"
+ install-size="0"
+ version="@GEMINI.MANAGEMENT.VERSION@"
+ unpack="false"
+ autostart="true"/>
+
+ <plugin
+ id="osgi.enterprise"
+ download-size="0"
+ install-size="0"
+ version="4.2.0.v201108120515"
+ unpack="false"
+ autostart="false"/>
+
+</feature>
diff --git a/build-kernel/publish_resources/products/kernel/kernel.product b/build-kernel/publish_resources/products/kernel/kernel.product
index 187c2312..1fdae4d2 100755
--- a/build-kernel/publish_resources/products/kernel/kernel.product
+++ b/build-kernel/publish_resources/products/kernel/kernel.product
@@ -15,7 +15,7 @@
<features>
<feature id="org.eclipse.virgo.kernel.specific.resources" version="0.0.0" />
<feature id="org.eclipse.virgo.scripts" version="0.0.0" />
- <feature id="org.eclipse.gemini.management" version="0.0.0" />
+ <feature id="org.eclipse.virgo.management" version="0.0.0" />
</features>
</product>
diff --git a/build-kernel/repository/ext/osgi.console.properties b/build-kernel/repository/ext/osgi.console.properties
index 310943bf..d8f0748e 100644
--- a/build-kernel/repository/ext/osgi.console.properties
+++ b/build-kernel/repository/ext/osgi.console.properties
@@ -1,4 +1,4 @@
-telnet.enabled=false
+telnet.enabled=true
telnet.port=2501
telnet.host=localhost
ssh.enabled=false
diff --git a/org.eclipse.virgo.kernel.agent.dm/.classpath b/org.eclipse.virgo.kernel.agent.dm/.classpath
index 18ab1b62..bc9a8859 100644
--- a/org.eclipse.virgo.kernel.agent.dm/.classpath
+++ b/org.eclipse.virgo.kernel.agent.dm/.classpath
@@ -41,7 +41,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.event/1.2.100.v20110110/org.eclipse.equinox.event-1.2.100.v20110110.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"/>
+ <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="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.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.D-20120125142228/org.eclipse.virgo.kernel.core-3.5.0.D-20120125142228.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.D-20120125142228/org.eclipse.virgo.kernel.core-sources-3.5.0.D-20120125142228.jar"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/org.eclipse.virgo.management.fragment/.classpath b/org.eclipse.virgo.management.fragment/.classpath
new file mode 100644
index 00000000..7be8ef40
--- /dev/null
+++ b/org.eclipse.virgo.management.fragment/.classpath
@@ -0,0 +1,29 @@
+<?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.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 combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.agent.dm"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.management/1.0.0.RELEASE/org.eclipse.gemini.management-1.0.0.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="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.virgo.management.fragment/.project b/org.eclipse.virgo.management.fragment/.project
new file mode 100644
index 00000000..3074e823
--- /dev/null
+++ b/org.eclipse.virgo.management.fragment/.project
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.virgo.kernel.management.fragment</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.springframework.ide.eclipse.core.springbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.springsource.server.ide.bundlor.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>com.springsource.server.ide.facet.core.bundlenature</nature>
+ <nature>org.springframework.ide.eclipse.core.springnature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>com.springsource.server.dev.eclipse.serverdevelopmentnature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ </natures>
+</projectDescription>
diff --git a/org.eclipse.virgo.management.fragment/.settings/com.springsource.server.ide.bundlor.core.prefs b/org.eclipse.virgo.management.fragment/.settings/com.springsource.server.ide.bundlor.core.prefs
new file mode 100644
index 00000000..61ee8a9b
--- /dev/null
+++ b/org.eclipse.virgo.management.fragment/.settings/com.springsource.server.ide.bundlor.core.prefs
@@ -0,0 +1,3 @@
+#Mon Jul 06 09:06:52 BST 2009
+com.springsource.server.ide.bundlor.core.template.properties.files=../build.properties;../build.versions
+eclipse.preferences.version=1
diff --git a/org.eclipse.virgo.management.fragment/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.management.fragment/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 00000000..92aa2909
--- /dev/null
+++ b/org.eclipse.virgo.management.fragment/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
+</faceted-project>
diff --git a/org.eclipse.virgo.management.fragment/.settings/org.springframework.ide.eclipse.beans.core.prefs b/org.eclipse.virgo.management.fragment/.settings/org.springframework.ide.eclipse.beans.core.prefs
new file mode 100644
index 00000000..e68da314
--- /dev/null
+++ b/org.eclipse.virgo.management.fragment/.settings/org.springframework.ide.eclipse.beans.core.prefs
@@ -0,0 +1,3 @@
+#Mon Jul 06 16:49:15 BST 2009
+eclipse.preferences.version=1
+org.springframework.ide.eclipse.beans.core.ignoreMissingNamespaceHandler=false
diff --git a/org.eclipse.virgo.management.fragment/build.xml b/org.eclipse.virgo.management.fragment/build.xml
new file mode 100644
index 00000000..aaabed2e
--- /dev/null
+++ b/org.eclipse.virgo.management.fragment/build.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.virgo.management.fragment">
+
+ <property name="clover.enforce" value="false"/>
+ <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../build.versions"/>
+ <import file="${basedir}/../virgo-build/standard/default.xml"/>
+
+</project>
diff --git a/org.eclipse.virgo.management.fragment/ivy.xml b/org.eclipse.virgo.management.fragment/ivy.xml
new file mode 100644
index 00000000..45d2c140
--- /dev/null
+++ b/org.eclipse.virgo.management.fragment/ivy.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
+
+ <info organisation="org.eclipse.virgo" module="${ant.project.name}"/>
+
+ <configurations>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <artifact name="${ant.project.name}"/>
+ <artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+ </publications>
+
+ <dependencies>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.management" rev="${org.eclipse.gemini.management}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.region" rev="${org.eclipse.equinox.region}" conf="compile->runtime" />
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
+ </dependencies>
+
+</ivy-module>
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
new file mode 100644
index 00000000..1ddba27e
--- /dev/null
+++ b/org.eclipse.virgo.management.fragment/src/main/java/org/eclipse/virgo/management/fragment/VirgoObjectNameTranslator.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2011 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.management.fragment;
+
+import java.util.Hashtable;
+
+import javax.management.ObjectName;
+
+import org.eclipse.equinox.region.RegionDigraph;
+import org.eclipse.gemini.mgmt.ObjectNameTranslator;
+
+public class VirgoObjectNameTranslator implements ObjectNameTranslator{
+
+ private static final String REGION_KEY = "region";
+
+ private final RegionDigraph regionDigraph;
+
+ public VirgoObjectNameTranslator(RegionDigraph regionDigraph) {
+ this.regionDigraph = regionDigraph;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ObjectName translate(ObjectName originalName) {
+ Hashtable<String, String> keyPropertyList = originalName.getKeyPropertyList();
+ keyPropertyList.put(REGION_KEY, this.regionDigraph.getRegion(7l).getName());
+ try {
+ return new ObjectName(originalName.getDomain(), keyPropertyList);
+ } catch (Exception e) {
+ throw new RuntimeException("Error modifying ObjectName for '" + originalName.getCanonicalName() + "'", e);
+ }
+ }
+
+}
diff --git a/org.eclipse.virgo.management.fragment/src/test/java/.gitignore b/org.eclipse.virgo.management.fragment/src/test/java/.gitignore
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/org.eclipse.virgo.management.fragment/src/test/java/.gitignore
diff --git a/org.eclipse.virgo.management.fragment/src/test/resources/.gitignore b/org.eclipse.virgo.management.fragment/src/test/resources/.gitignore
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/org.eclipse.virgo.management.fragment/src/test/resources/.gitignore
diff --git a/org.eclipse.virgo.management.fragment/template.mf b/org.eclipse.virgo.management.fragment/template.mf
new file mode 100644
index 00000000..8aeb8148
--- /dev/null
+++ b/org.eclipse.virgo.management.fragment/template.mf
@@ -0,0 +1,12 @@
+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)}"
+Bundle-SymbolicName: org.eclipse.virgo.management.fragment
+Bundle-Version: ${version}
+GeminiManagement-ObjectNameTranslator: org.eclipse.virgo.management.fragment.VirgoObjectNameTranslator
+Import-Package:
+ org.eclipse.equinox.region;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}",
+ javax.management;version="0"
+Excluded-Imports: org.eclipse.gemini.mgmt
+Excluded-Exports: *

Back to the top