Renaming all shorthand mgmt to the full management
diff --git a/gemini.mgmt.releng/.project b/gemini.management.releng/.project
similarity index 100%
rename from gemini.mgmt.releng/.project
rename to gemini.management.releng/.project
diff --git a/gemini.mgmt.releng/pom.xml b/gemini.management.releng/pom.xml
similarity index 89%
rename from gemini.mgmt.releng/pom.xml
rename to gemini.management.releng/pom.xml
index 9ad0e00..c30a2b5 100644
--- a/gemini.mgmt.releng/pom.xml
+++ b/gemini.management.releng/pom.xml
@@ -2,8 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.gemini.mgmt</groupId>
- <artifactId>org.eclipse.gemini.mgmt_parent</artifactId>
+ <groupId>org.eclipse.gemini.management</groupId>
+ <artifactId>org.eclipse.gemini.management_parent</artifactId>
<version>1.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Gemini Management Parent POM</name>
@@ -17,11 +17,11 @@
</properties>
<modules>
- <module>../org.eclipse.gemini.mgmt</module>
- <module>../org.eclipse.gemini.mgmt.tests</module>
- <module>../org.eclipse.gemini.mgmt.feature</module>
- <module>../gemini.mgmt.repository</module>
- <module>../org.eclipse.gemini.mgmt.target</module>
+ <module>../org.eclipse.gemini.management</module>
+ <module>../org.eclipse.gemini.management.tests</module>
+ <module>../org.eclipse.gemini.management.feature</module>
+ <module>../gemini.management.repository</module>
+ <module>../org.eclipse.gemini.management.target</module>
</modules>
<build>
<plugins>
@@ -39,7 +39,7 @@
<resolver>p2</resolver>
<target>
<artifact>
- <groupId>org.eclipse.gemini.mgmt</groupId>
+ <groupId>org.eclipse.gemini.management</groupId>
<artifactId>target-platform</artifactId>
<version>1.0.2-SNAPSHOT</version>
<classifier>gemini-management</classifier>
diff --git a/gemini.mgmt.repository/.project b/gemini.management.repository/.project
similarity index 100%
rename from gemini.mgmt.repository/.project
rename to gemini.management.repository/.project
diff --git a/gemini.mgmt.repository/pom.xml b/gemini.management.repository/pom.xml
similarity index 88%
rename from gemini.mgmt.repository/pom.xml
rename to gemini.management.repository/pom.xml
index 07b003a..29f0cd1 100644
--- a/gemini.mgmt.repository/pom.xml
+++ b/gemini.management.repository/pom.xml
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.gemini.mgmt</groupId>
- <artifactId>org.eclipse.gemini.mgmt_parent</artifactId>
+ <groupId>org.eclipse.gemini.management</groupId>
+ <artifactId>org.eclipse.gemini.management_parent</artifactId>
<version>1.0.2-SNAPSHOT</version>
- <relativePath>../gemini.mgmt.releng/pom.xml</relativePath>
+ <relativePath>../gemini.management.releng/pom.xml</relativePath>
</parent>
- <artifactId>gemini.mgmt.repository</artifactId>
+ <artifactId>gemini.management.repository</artifactId>
<packaging>eclipse-update-site</packaging>
<name>Gemini Management Update Site</name>
diff --git a/gemini.management.repository/site.xml b/gemini.management.repository/site.xml
new file mode 100644
index 0000000..9681d8e
--- /dev/null
+++ b/gemini.management.repository/site.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/org.eclipse.gemini.management.feature_0.0.0.jar" id="org.eclipse.gemini.management.feature" version="0.0.0">
+ <category name="gemini.management"/>
+ </feature>
+ <category-def name="gemini.management" label="Gemini Management"/>
+</site>
diff --git a/gemini.mgmt.repository/site.xml b/gemini.mgmt.repository/site.xml
deleted file mode 100644
index ecbc93c..0000000
--- a/gemini.mgmt.repository/site.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <feature url="features/org.eclipse.gemini.mgmt.feature_0.0.0.jar" id="org.eclipse.gemini.mgmt.feature" version="0.0.0">
- <category name="gemini.mgmt"/>
- </feature>
- <category-def name="gemini.mgmt" label="Gemini Management"/>
-</site>
diff --git a/org.eclipse.gemini.mgmt.feature/.project b/org.eclipse.gemini.management.feature/.project
similarity index 100%
rename from org.eclipse.gemini.mgmt.feature/.project
rename to org.eclipse.gemini.management.feature/.project
diff --git a/org.eclipse.gemini.mgmt.feature/build.properties b/org.eclipse.gemini.management.feature/build.properties
similarity index 100%
rename from org.eclipse.gemini.mgmt.feature/build.properties
rename to org.eclipse.gemini.management.feature/build.properties
diff --git a/org.eclipse.gemini.mgmt.feature/feature.xml b/org.eclipse.gemini.management.feature/feature.xml
similarity index 85%
rename from org.eclipse.gemini.mgmt.feature/feature.xml
rename to org.eclipse.gemini.management.feature/feature.xml
index 9a11a28..b6c8b3e 100644
--- a/org.eclipse.gemini.mgmt.feature/feature.xml
+++ b/org.eclipse.gemini.management.feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.eclipse.gemini.mgmt.feature"
+ id="org.eclipse.gemini.management.feature"
label="Feature"
version="1.0.2.qualifier">
@@ -17,7 +17,7 @@
</license>
<plugin
- id="org.eclipse.gemini.mgmt"
+ id="org.eclipse.gemini.management"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/org.eclipse.gemini.mgmt.feature/pom.xml b/org.eclipse.gemini.management.feature/pom.xml
similarity index 61%
rename from org.eclipse.gemini.mgmt.feature/pom.xml
rename to org.eclipse.gemini.management.feature/pom.xml
index c4187e6..5fb64bd 100644
--- a/org.eclipse.gemini.mgmt.feature/pom.xml
+++ b/org.eclipse.gemini.management.feature/pom.xml
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.gemini.mgmt</groupId>
- <artifactId>org.eclipse.gemini.mgmt_parent</artifactId>
+ <groupId>org.eclipse.gemini.management</groupId>
+ <artifactId>org.eclipse.gemini.management_parent</artifactId>
<version>1.0.2-SNAPSHOT</version>
- <relativePath>../gemini.mgmt.releng/pom.xml</relativePath>
+ <relativePath>../gemini.management.releng/pom.xml</relativePath>
</parent>
- <artifactId>org.eclipse.gemini.mgmt.feature</artifactId>
+ <artifactId>org.eclipse.gemini.management.feature</artifactId>
<packaging>eclipse-feature</packaging>
<name>Gemini Management Feature</name>
diff --git a/org.eclipse.gemini.mgmt.target/gemini-management.target b/org.eclipse.gemini.management.target/gemini-management.target
similarity index 100%
rename from org.eclipse.gemini.mgmt.target/gemini-management.target
rename to org.eclipse.gemini.management.target/gemini-management.target
diff --git a/org.eclipse.gemini.mgmt.target/pom.xml b/org.eclipse.gemini.management.target/pom.xml
similarity index 85%
rename from org.eclipse.gemini.mgmt.target/pom.xml
rename to org.eclipse.gemini.management.target/pom.xml
index f16fbf0..680ed0f 100755
--- a/org.eclipse.gemini.mgmt.target/pom.xml
+++ b/org.eclipse.gemini.management.target/pom.xml
@@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.gemini.mgmt</groupId>
- <artifactId>org.eclipse.gemini.mgmt_parent</artifactId>
+ <groupId>org.eclipse.gemini.management</groupId>
+ <artifactId>org.eclipse.gemini.management_parent</artifactId>
<version>1.0.2-SNAPSHOT</version>
- <relativePath>../gemini.mgmt.releng/pom.xml</relativePath>
+ <relativePath>../gemini.management.releng/pom.xml</relativePath>
</parent>
<artifactId>target-platform</artifactId>
diff --git a/org.eclipse.gemini.mgmt.tests/.classpath b/org.eclipse.gemini.management.tests/.classpath
similarity index 100%
rename from org.eclipse.gemini.mgmt.tests/.classpath
rename to org.eclipse.gemini.management.tests/.classpath
diff --git a/org.eclipse.gemini.mgmt.tests/.project b/org.eclipse.gemini.management.tests/.project
similarity index 100%
rename from org.eclipse.gemini.mgmt.tests/.project
rename to org.eclipse.gemini.management.tests/.project
diff --git a/org.eclipse.gemini.mgmt.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gemini.management.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.gemini.mgmt.tests/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.gemini.management.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.gemini.mgmt.tests/.settings/org.eclipse.pde.core.prefs b/org.eclipse.gemini.management.tests/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from org.eclipse.gemini.mgmt.tests/.settings/org.eclipse.pde.core.prefs
rename to org.eclipse.gemini.management.tests/.settings/org.eclipse.pde.core.prefs
diff --git a/org.eclipse.gemini.mgmt.tests/META-INF/MANIFEST.MF b/org.eclipse.gemini.management.tests/META-INF/MANIFEST.MF
similarity index 74%
rename from org.eclipse.gemini.mgmt.tests/META-INF/MANIFEST.MF
rename to org.eclipse.gemini.management.tests/META-INF/MANIFEST.MF
index 36548d4..2b3061e 100644
--- a/org.eclipse.gemini.mgmt.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.gemini.management.tests/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Gemini Management Tests
-Bundle-SymbolicName: org.eclipse.gemini.mgmt.tests
+Bundle-SymbolicName: org.eclipse.gemini.management.tests
Bundle-Version: 1.0.2.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.management,
javax.management.remote,
org.easymock,
org.osgi.framework;version="1.3.0"
-Fragment-Host: org.eclipse.gemini.mgmt
+Fragment-Host: org.eclipse.gemini.management
Require-Bundle: org.junit4
diff --git a/org.eclipse.gemini.mgmt.tests/build.properties b/org.eclipse.gemini.management.tests/build.properties
similarity index 100%
rename from org.eclipse.gemini.mgmt.tests/build.properties
rename to org.eclipse.gemini.management.tests/build.properties
diff --git a/org.eclipse.gemini.mgmt.tests/pom.xml b/org.eclipse.gemini.management.tests/pom.xml
similarity index 85%
rename from org.eclipse.gemini.mgmt.tests/pom.xml
rename to org.eclipse.gemini.management.tests/pom.xml
index c2a6f2b..d36e5c6 100644
--- a/org.eclipse.gemini.mgmt.tests/pom.xml
+++ b/org.eclipse.gemini.management.tests/pom.xml
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.gemini.mgmt</groupId>
- <artifactId>org.eclipse.gemini.mgmt_parent</artifactId>
+ <groupId>org.eclipse.gemini.management</groupId>
+ <artifactId>org.eclipse.gemini.management_parent</artifactId>
<version>1.0.2-SNAPSHOT</version>
- <relativePath>../gemini.mgmt.releng/pom.xml</relativePath>
+ <relativePath>../gemini.management.releng/pom.xml</relativePath>
</parent>
- <artifactId>org.eclipse.gemini.mgmt.tests</artifactId>
+ <artifactId>org.eclipse.gemini.management.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
<name>Gemini Management Bundle Tests</name>
diff --git a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/DefaultObjectNameTranslatorTest.java b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/DefaultObjectNameTranslatorTest.java
similarity index 98%
rename from org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/DefaultObjectNameTranslatorTest.java
rename to org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/DefaultObjectNameTranslatorTest.java
index 3821917..95f4be0 100755
--- a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/DefaultObjectNameTranslatorTest.java
+++ b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/DefaultObjectNameTranslatorTest.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt;
+package org.eclipse.gemini.management;
import java.util.ArrayList;
import java.util.Dictionary;
diff --git a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/TestObjectNameTranslator.java b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/TestObjectNameTranslator.java
similarity index 95%
rename from org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/TestObjectNameTranslator.java
rename to org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/TestObjectNameTranslator.java
index ac7e41f..6fc9f57 100755
--- a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/TestObjectNameTranslator.java
+++ b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/TestObjectNameTranslator.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt;
+package org.eclipse.gemini.management;
import javax.management.ObjectName;
diff --git a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/UninstantiableObjectNameTranslator.java b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/UninstantiableObjectNameTranslator.java
similarity index 93%
rename from org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/UninstantiableObjectNameTranslator.java
rename to org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/UninstantiableObjectNameTranslator.java
index 1bff40b..90d2484 100755
--- a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/UninstantiableObjectNameTranslator.java
+++ b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/UninstantiableObjectNameTranslator.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt;
+package org.eclipse.gemini.management;
public class UninstantiableObjectNameTranslator {
diff --git a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/AbstractOSGiMBeanTest.java b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/AbstractOSGiMBeanTest.java
similarity index 95%
rename from org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/AbstractOSGiMBeanTest.java
rename to org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/AbstractOSGiMBeanTest.java
index 5818666..71ea963 100644
--- a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/AbstractOSGiMBeanTest.java
+++ b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/AbstractOSGiMBeanTest.java
@@ -8,7 +8,7 @@
* Contributors:
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt.integration.tests;
+package org.eclipse.gemini.management.integration.tests;
import java.lang.management.ManagementFactory;
@@ -19,7 +19,7 @@
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
-import org.eclipse.gemini.mgmt.Activator;
+import org.eclipse.gemini.management.Activator;
import org.junit.BeforeClass;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
diff --git a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/BundleStateTest.java b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/BundleStateTest.java
similarity index 97%
rename from org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/BundleStateTest.java
rename to org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/BundleStateTest.java
index 631c90f..64d2fbe 100644
--- a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/BundleStateTest.java
+++ b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/BundleStateTest.java
@@ -12,7 +12,7 @@
* Contributors:
* SAP employees
******************************************************************************/
-package org.eclipse.gemini.mgmt.integration.tests;
+package org.eclipse.gemini.management.integration.tests;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -28,10 +28,10 @@
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
-import org.eclipse.gemini.mgmt.framework.BundleState;
-import org.eclipse.gemini.mgmt.framework.CustomBundleStateMBean;
-import org.eclipse.gemini.mgmt.framework.internal.OSGiBundle;
-import org.eclipse.gemini.mgmt.internal.BundleUtil;
+import org.eclipse.gemini.management.framework.BundleState;
+import org.eclipse.gemini.management.framework.CustomBundleStateMBean;
+import org.eclipse.gemini.management.framework.internal.OSGiBundle;
+import org.eclipse.gemini.management.internal.BundleUtil;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.Bundle;
diff --git a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/BundleWiringStateTest.java b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/BundleWiringStateTest.java
similarity index 92%
rename from org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/BundleWiringStateTest.java
rename to org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/BundleWiringStateTest.java
index ee01fa5..ce4faec 100644
--- a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/BundleWiringStateTest.java
+++ b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/BundleWiringStateTest.java
@@ -8,7 +8,7 @@
* Contributors:
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt.integration.tests;
+package org.eclipse.gemini.management.integration.tests;
import static org.junit.Assert.assertEquals;
@@ -19,9 +19,9 @@
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
-import org.eclipse.gemini.mgmt.framework.BundleWiringState;
-import org.eclipse.gemini.mgmt.framework.CustomBundleWiringStateMBean;
-import org.eclipse.gemini.mgmt.framework.ServiceState;
+import org.eclipse.gemini.management.framework.BundleWiringState;
+import org.eclipse.gemini.management.framework.CustomBundleWiringStateMBean;
+import org.eclipse.gemini.management.framework.ServiceState;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.BundleContext;
diff --git a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/FrameworkTest.java b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/FrameworkTest.java
similarity index 89%
rename from org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/FrameworkTest.java
rename to org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/FrameworkTest.java
index 0daec16..bfb21e7 100644
--- a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/FrameworkTest.java
+++ b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/FrameworkTest.java
@@ -8,11 +8,11 @@
* Contributors:
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt.integration.tests;
+package org.eclipse.gemini.management.integration.tests;
import static org.junit.Assert.assertEquals;
-import org.eclipse.gemini.mgmt.framework.Framework;
+import org.eclipse.gemini.management.framework.Framework;
import org.junit.Test;
import org.osgi.jmx.framework.FrameworkMBean;
diff --git a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/PackageStateTest.java b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/PackageStateTest.java
similarity index 95%
rename from org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/PackageStateTest.java
rename to org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/PackageStateTest.java
index 484a2e3..8911bb9 100644
--- a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/PackageStateTest.java
+++ b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/PackageStateTest.java
@@ -8,7 +8,7 @@
* Contributors:
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt.integration.tests;
+package org.eclipse.gemini.management.integration.tests;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@@ -23,8 +23,8 @@
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
-import org.eclipse.gemini.mgmt.framework.PackageState;
-import org.eclipse.gemini.mgmt.framework.ServiceState;
+import org.eclipse.gemini.management.framework.PackageState;
+import org.eclipse.gemini.management.framework.ServiceState;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.Bundle;
diff --git a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/ServiceStateTest.java b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/ServiceStateTest.java
similarity index 93%
rename from org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/ServiceStateTest.java
rename to org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/ServiceStateTest.java
index 3c820c5..e0683b8 100644
--- a/org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/ServiceStateTest.java
+++ b/org.eclipse.gemini.management.tests/src/org/eclipse/gemini/management/integration/tests/ServiceStateTest.java
@@ -8,7 +8,7 @@
* Contributors:
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt.integration.tests;
+package org.eclipse.gemini.management.integration.tests;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertArrayEquals;
@@ -19,8 +19,8 @@
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
-import org.eclipse.gemini.mgmt.framework.CustomServiceStateMBean;
-import org.eclipse.gemini.mgmt.framework.ServiceState;
+import org.eclipse.gemini.management.framework.CustomServiceStateMBean;
+import org.eclipse.gemini.management.framework.ServiceState;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.Bundle;
diff --git a/org.eclipse.gemini.mgmt/.classpath b/org.eclipse.gemini.management/.classpath
similarity index 100%
rename from org.eclipse.gemini.mgmt/.classpath
rename to org.eclipse.gemini.management/.classpath
diff --git a/org.eclipse.gemini.mgmt/.project b/org.eclipse.gemini.management/.project
similarity index 100%
rename from org.eclipse.gemini.mgmt/.project
rename to org.eclipse.gemini.management/.project
diff --git a/org.eclipse.gemini.mgmt/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gemini.management/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.gemini.mgmt/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.gemini.management/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.gemini.mgmt/.settings/org.eclipse.pde.core.prefs b/org.eclipse.gemini.management/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from org.eclipse.gemini.mgmt/.settings/org.eclipse.pde.core.prefs
rename to org.eclipse.gemini.management/.settings/org.eclipse.pde.core.prefs
diff --git a/org.eclipse.gemini.mgmt/META-INF/MANIFEST.MF b/org.eclipse.gemini.management/META-INF/MANIFEST.MF
similarity index 86%
rename from org.eclipse.gemini.mgmt/META-INF/MANIFEST.MF
rename to org.eclipse.gemini.management/META-INF/MANIFEST.MF
index 7769063..25d2c09 100644
--- a/org.eclipse.gemini.mgmt/META-INF/MANIFEST.MF
+++ b/org.eclipse.gemini.management/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Gemini Management
-Bundle-SymbolicName: org.eclipse.gemini.mgmt
+Bundle-SymbolicName: org.eclipse.gemini.management
Bundle-Version: 1.0.2.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.management,
@@ -21,4 +21,4 @@
org.osgi.service.provisioning,
org.osgi.service.useradmin,
org.osgi.util.tracker
-Bundle-Activator: org.eclipse.gemini.mgmt.Activator
+Bundle-Activator: org.eclipse.gemini.management.Activator
diff --git a/org.eclipse.gemini.mgmt/build.properties b/org.eclipse.gemini.management/build.properties
similarity index 100%
rename from org.eclipse.gemini.mgmt/build.properties
rename to org.eclipse.gemini.management/build.properties
diff --git a/org.eclipse.gemini.mgmt/pom.xml b/org.eclipse.gemini.management/pom.xml
similarity index 76%
rename from org.eclipse.gemini.mgmt/pom.xml
rename to org.eclipse.gemini.management/pom.xml
index e31711a..7f6535d 100644
--- a/org.eclipse.gemini.mgmt/pom.xml
+++ b/org.eclipse.gemini.management/pom.xml
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.gemini.mgmt</groupId>
- <artifactId>org.eclipse.gemini.mgmt_parent</artifactId>
+ <groupId>org.eclipse.gemini.management</groupId>
+ <artifactId>org.eclipse.gemini.management_parent</artifactId>
<version>1.0.2-SNAPSHOT</version>
- <relativePath>../gemini.mgmt.releng/pom.xml</relativePath>
+ <relativePath>../gemini.management.releng/pom.xml</relativePath>
</parent>
- <artifactId>org.eclipse.gemini.mgmt</artifactId>
+ <artifactId>org.eclipse.gemini.management</artifactId>
<packaging>eclipse-plugin</packaging>
<name>Gemini Management Bundle</name>
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/Activator.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/Activator.java
similarity index 96%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/Activator.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/Activator.java
index 1180397..bef07eb 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/Activator.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/Activator.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt;
+package org.eclipse.gemini.management;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -30,18 +30,18 @@
import javax.management.ObjectName;
import javax.management.StandardMBean;
-import org.eclipse.gemini.mgmt.configurationadmin.ConfigAdminManager;
-import org.eclipse.gemini.mgmt.framework.BundleState;
-import org.eclipse.gemini.mgmt.framework.BundleWiringState;
-import org.eclipse.gemini.mgmt.framework.CustomBundleStateMBean;
-import org.eclipse.gemini.mgmt.framework.CustomServiceStateMBean;
-import org.eclipse.gemini.mgmt.framework.CustomBundleWiringStateMBean;
-import org.eclipse.gemini.mgmt.framework.Framework;
-import org.eclipse.gemini.mgmt.framework.PackageState;
-import org.eclipse.gemini.mgmt.framework.ServiceState;
-import org.eclipse.gemini.mgmt.permissionadmin.PermissionManager;
-import org.eclipse.gemini.mgmt.provisioning.Provisioning;
-import org.eclipse.gemini.mgmt.useradmin.UserManager;
+import org.eclipse.gemini.management.configurationadmin.ConfigAdminManager;
+import org.eclipse.gemini.management.framework.BundleState;
+import org.eclipse.gemini.management.framework.BundleWiringState;
+import org.eclipse.gemini.management.framework.CustomBundleStateMBean;
+import org.eclipse.gemini.management.framework.CustomServiceStateMBean;
+import org.eclipse.gemini.management.framework.CustomBundleWiringStateMBean;
+import org.eclipse.gemini.management.framework.Framework;
+import org.eclipse.gemini.management.framework.PackageState;
+import org.eclipse.gemini.management.framework.ServiceState;
+import org.eclipse.gemini.management.permissionadmin.PermissionManager;
+import org.eclipse.gemini.management.provisioning.Provisioning;
+import org.eclipse.gemini.management.useradmin.UserManager;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/DefaultObjectNameTranslator.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/DefaultObjectNameTranslator.java
similarity index 98%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/DefaultObjectNameTranslator.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/DefaultObjectNameTranslator.java
index 9e028c1..8683e90 100755
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/DefaultObjectNameTranslator.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/DefaultObjectNameTranslator.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt;
+package org.eclipse.gemini.management;
import java.util.List;
import java.util.logging.Logger;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/Monitor.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/Monitor.java
similarity index 97%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/Monitor.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/Monitor.java
index 9c4bbcb..ffceed2 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/Monitor.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/Monitor.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt;
+package org.eclipse.gemini.management;
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/ObjectNameTranslator.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/ObjectNameTranslator.java
similarity index 98%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/ObjectNameTranslator.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/ObjectNameTranslator.java
index 2353299..a86145c 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/ObjectNameTranslator.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/ObjectNameTranslator.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt;
+package org.eclipse.gemini.management;
import javax.management.ObjectName;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/configurationadmin/ConfigAdminManager.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/configurationadmin/ConfigAdminManager.java
similarity index 97%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/configurationadmin/ConfigAdminManager.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/configurationadmin/ConfigAdminManager.java
index e504d4a..77d721b 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/configurationadmin/ConfigAdminManager.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/configurationadmin/ConfigAdminManager.java
@@ -13,9 +13,9 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.configurationadmin;
+package org.eclipse.gemini.management.configurationadmin;
-import static org.eclipse.gemini.mgmt.internal.OSGiProperties.*;
+import static org.eclipse.gemini.management.internal.OSGiProperties.*;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/BundleState.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/BundleState.java
similarity index 96%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/BundleState.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/BundleState.java
index 4651346..c71df44 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/BundleState.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/BundleState.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.framework;
+package org.eclipse.gemini.management.framework;
import java.io.IOException;
import java.util.ArrayList;
@@ -35,10 +35,10 @@
import org.osgi.framework.wiring.BundleWiring;
import org.osgi.jmx.framework.BundleStateMBean;
-import org.eclipse.gemini.mgmt.Monitor;
-import org.eclipse.gemini.mgmt.framework.internal.OSGiBundle;
-import org.eclipse.gemini.mgmt.framework.internal.OSGiBundleEvent;
-import org.eclipse.gemini.mgmt.internal.BundleUtil;
+import org.eclipse.gemini.management.Monitor;
+import org.eclipse.gemini.management.framework.internal.OSGiBundle;
+import org.eclipse.gemini.management.framework.internal.OSGiBundleEvent;
+import org.eclipse.gemini.management.internal.BundleUtil;
/**
*
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/BundleWiringState.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/BundleWiringState.java
similarity index 96%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/BundleWiringState.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/BundleWiringState.java
index 9460add..96dbfa6 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/BundleWiringState.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/BundleWiringState.java
@@ -8,7 +8,7 @@
* Contributors:
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt.framework;
+package org.eclipse.gemini.management.framework;
import java.io.IOException;
import java.util.HashMap;
@@ -20,9 +20,9 @@
import javax.management.openmbean.TabularData;
import javax.management.openmbean.TabularDataSupport;
-import org.eclipse.gemini.mgmt.framework.internal.OSGiBundleRevision;
-import org.eclipse.gemini.mgmt.framework.internal.OSGiBundleRevisionIdTracker;
-import org.eclipse.gemini.mgmt.framework.internal.OSGiBundleWiring;
+import org.eclipse.gemini.management.framework.internal.OSGiBundleRevision;
+import org.eclipse.gemini.management.framework.internal.OSGiBundleRevisionIdTracker;
+import org.eclipse.gemini.management.framework.internal.OSGiBundleWiring;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.wiring.BundleRevision;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/CustomBundleStateMBean.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/CustomBundleStateMBean.java
similarity index 98%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/CustomBundleStateMBean.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/CustomBundleStateMBean.java
index f5df475..8a8e833 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/CustomBundleStateMBean.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/CustomBundleStateMBean.java
@@ -12,7 +12,7 @@
* Contributors:
* SAP employees
******************************************************************************/
-package org.eclipse.gemini.mgmt.framework;
+package org.eclipse.gemini.management.framework;
import java.io.IOException;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/CustomBundleWiringStateMBean.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/CustomBundleWiringStateMBean.java
similarity index 99%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/CustomBundleWiringStateMBean.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/CustomBundleWiringStateMBean.java
index 4be9a49..73f192c 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/CustomBundleWiringStateMBean.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/CustomBundleWiringStateMBean.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eclipse.gemini.mgmt.framework;
+package org.eclipse.gemini.management.framework;
import java.io.IOException;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/CustomServiceStateMBean.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/CustomServiceStateMBean.java
similarity index 97%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/CustomServiceStateMBean.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/CustomServiceStateMBean.java
index 10cc1b2..ed9dc96 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/CustomServiceStateMBean.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/CustomServiceStateMBean.java
@@ -12,7 +12,7 @@
* Contributors:
* Christopher Frost - VMware
******************************************************************************/
-package org.eclipse.gemini.mgmt.framework;
+package org.eclipse.gemini.management.framework;
import java.io.IOException;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/Framework.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/Framework.java
similarity index 98%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/Framework.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/Framework.java
index 334ef6a..92d2491 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/Framework.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/Framework.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.framework;
+package org.eclipse.gemini.management.framework;
import java.io.IOException;
import java.io.InputStream;
@@ -32,8 +32,8 @@
import org.osgi.framework.startlevel.FrameworkStartLevel;
import org.osgi.framework.wiring.FrameworkWiring;
-import org.eclipse.gemini.mgmt.framework.internal.BundleBatchActionResult;
-import org.eclipse.gemini.mgmt.framework.internal.BundleBatchInstallResult;
+import org.eclipse.gemini.management.framework.internal.BundleBatchActionResult;
+import org.eclipse.gemini.management.framework.internal.BundleBatchInstallResult;
import org.osgi.jmx.framework.FrameworkMBean;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/PackageState.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/PackageState.java
similarity index 97%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/PackageState.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/PackageState.java
index cf7f765..f154838 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/PackageState.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/PackageState.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.framework;
+package org.eclipse.gemini.management.framework;
import java.io.IOException;
import java.util.ArrayList;
@@ -30,7 +30,7 @@
import org.osgi.service.packageadmin.ExportedPackage;
import org.osgi.service.packageadmin.PackageAdmin;
-import org.eclipse.gemini.mgmt.framework.internal.OSGiPackage;
+import org.eclipse.gemini.management.framework.internal.OSGiPackage;
/**
*
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/ServiceState.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/ServiceState.java
similarity index 96%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/ServiceState.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/ServiceState.java
index dc44225..ad84199 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/ServiceState.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/ServiceState.java
@@ -14,7 +14,7 @@
* Christopher Frost - Updates for RFC 169
******************************************************************************/
-package org.eclipse.gemini.mgmt.framework;
+package org.eclipse.gemini.management.framework;
import static org.osgi.framework.Constants.OBJECTCLASS;
@@ -25,10 +25,10 @@
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
-import org.eclipse.gemini.mgmt.Monitor;
-import org.eclipse.gemini.mgmt.framework.internal.OSGiService;
-import org.eclipse.gemini.mgmt.framework.internal.OSGiServiceEvent;
-import org.eclipse.gemini.mgmt.internal.OSGiProperties;
+import org.eclipse.gemini.management.Monitor;
+import org.eclipse.gemini.management.framework.internal.OSGiService;
+import org.eclipse.gemini.management.framework.internal.OSGiServiceEvent;
+import org.eclipse.gemini.management.internal.OSGiProperties;
import org.osgi.framework.AllServiceListener;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/BundleBatchActionResult.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/BundleBatchActionResult.java
similarity index 98%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/BundleBatchActionResult.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/BundleBatchActionResult.java
index 43a9fe9..a33beb7 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/BundleBatchActionResult.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/BundleBatchActionResult.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.framework.internal;
+package org.eclipse.gemini.management.framework.internal;
import java.util.HashMap;
import java.util.Map;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/BundleBatchInstallResult.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/BundleBatchInstallResult.java
similarity index 98%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/BundleBatchInstallResult.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/BundleBatchInstallResult.java
index 0111110..56437af 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/BundleBatchInstallResult.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/BundleBatchInstallResult.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.framework.internal;
+package org.eclipse.gemini.management.framework.internal;
import java.io.IOException;
import java.util.HashMap;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundle.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundle.java
similarity index 98%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundle.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundle.java
index 1eaa4b0..ce2768f 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundle.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundle.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.framework.internal;
+package org.eclipse.gemini.management.framework.internal;
import static org.osgi.framework.Constants.SERVICE_ID;
@@ -33,8 +33,8 @@
import javax.management.openmbean.TabularData;
import javax.management.openmbean.TabularDataSupport;
-import org.eclipse.gemini.mgmt.framework.CustomBundleStateMBean;
-import org.eclipse.gemini.mgmt.internal.BundleUtil;
+import org.eclipse.gemini.management.framework.CustomBundleStateMBean;
+import org.eclipse.gemini.management.internal.BundleUtil;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.wiring.BundleRevision;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleCapability.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleCapability.java
similarity index 92%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleCapability.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleCapability.java
index 98e35e7..6971bcb 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleCapability.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleCapability.java
@@ -8,7 +8,7 @@
* Contributors:
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt.framework.internal;
+package org.eclipse.gemini.management.framework.internal;
import java.util.HashMap;
import java.util.Map;
@@ -19,8 +19,8 @@
import javax.management.openmbean.OpenDataException;
import javax.management.openmbean.TabularDataSupport;
-import org.eclipse.gemini.mgmt.framework.CustomBundleWiringStateMBean;
-import org.eclipse.gemini.mgmt.internal.OSGiProperties;
+import org.eclipse.gemini.management.framework.CustomBundleWiringStateMBean;
+import org.eclipse.gemini.management.internal.OSGiProperties;
import org.osgi.framework.wiring.BundleCapability;
public class OSGiBundleCapability {
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleEvent.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleEvent.java
similarity index 97%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleEvent.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleEvent.java
index b02494b..d470925 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleEvent.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleEvent.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.framework.internal;
+package org.eclipse.gemini.management.framework.internal;
import java.util.HashMap;
import java.util.Map;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleRequirement.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleRequirement.java
similarity index 92%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleRequirement.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleRequirement.java
index babe8cc..f0b98ec 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleRequirement.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleRequirement.java
@@ -8,7 +8,7 @@
* Contributors:
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt.framework.internal;
+package org.eclipse.gemini.management.framework.internal;
import java.util.HashMap;
import java.util.Map;
@@ -19,8 +19,8 @@
import javax.management.openmbean.OpenDataException;
import javax.management.openmbean.TabularDataSupport;
-import org.eclipse.gemini.mgmt.framework.CustomBundleWiringStateMBean;
-import org.eclipse.gemini.mgmt.internal.OSGiProperties;
+import org.eclipse.gemini.management.framework.CustomBundleWiringStateMBean;
+import org.eclipse.gemini.management.internal.OSGiProperties;
import org.osgi.framework.wiring.BundleRequirement;
public class OSGiBundleRequirement {
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleRevision.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleRevision.java
similarity index 96%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleRevision.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleRevision.java
index 34d4a71..18a3cce 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleRevision.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleRevision.java
@@ -8,7 +8,7 @@
* Contributors:
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt.framework.internal;
+package org.eclipse.gemini.management.framework.internal;
import java.util.HashMap;
import java.util.List;
@@ -18,7 +18,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.eclipse.gemini.mgmt.framework.CustomBundleWiringStateMBean;
+import org.eclipse.gemini.management.framework.CustomBundleWiringStateMBean;
import org.osgi.framework.wiring.BundleCapability;
import org.osgi.framework.wiring.BundleRequirement;
import org.osgi.framework.wiring.BundleRevision;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleRevisionIdTracker.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleRevisionIdTracker.java
similarity index 95%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleRevisionIdTracker.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleRevisionIdTracker.java
index 4e0986c..dfbe88d 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleRevisionIdTracker.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleRevisionIdTracker.java
@@ -8,7 +8,7 @@
* Contributors:
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt.framework.internal;
+package org.eclipse.gemini.management.framework.internal;
import java.util.ArrayList;
import java.util.List;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleWire.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleWire.java
similarity index 95%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleWire.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleWire.java
index 542a3b5..a7dfa3b 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleWire.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleWire.java
@@ -8,7 +8,7 @@
* Contributors:
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt.framework.internal;
+package org.eclipse.gemini.management.framework.internal;
import java.util.HashMap;
import java.util.Map;
@@ -17,7 +17,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.eclipse.gemini.mgmt.framework.CustomBundleWiringStateMBean;
+import org.eclipse.gemini.management.framework.CustomBundleWiringStateMBean;
import org.osgi.framework.wiring.BundleWire;
import org.osgi.framework.wiring.BundleWiring;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleWiring.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleWiring.java
similarity index 97%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleWiring.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleWiring.java
index d6656de..3f8b10d 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiBundleWiring.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiBundleWiring.java
@@ -8,7 +8,7 @@
* Contributors:
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.gemini.mgmt.framework.internal;
+package org.eclipse.gemini.management.framework.internal;
import java.util.HashMap;
import java.util.List;
@@ -18,7 +18,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.eclipse.gemini.mgmt.framework.CustomBundleWiringStateMBean;
+import org.eclipse.gemini.management.framework.CustomBundleWiringStateMBean;
import org.osgi.framework.wiring.BundleCapability;
import org.osgi.framework.wiring.BundleRequirement;
import org.osgi.framework.wiring.BundleWire;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiPackage.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiPackage.java
similarity index 98%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiPackage.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiPackage.java
index a72239f..a1d9af4 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiPackage.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiPackage.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.framework.internal;
+package org.eclipse.gemini.management.framework.internal;
import java.util.HashMap;
import java.util.Map;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiService.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiService.java
similarity index 97%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiService.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiService.java
index f57ba98..1c74bab 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiService.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiService.java
@@ -13,9 +13,9 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.framework.internal;
+package org.eclipse.gemini.management.framework.internal;
-//import static org.eclipse.gemini.mgmt.internal.BundleUtil.LongArrayFrom;
+//import static org.eclipse.gemini.management.internal.BundleUtil.LongArrayFrom;
import static org.osgi.framework.Constants.OBJECTCLASS;
import static org.osgi.framework.Constants.SERVICE_ID;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiServiceEvent.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiServiceEvent.java
similarity index 98%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiServiceEvent.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiServiceEvent.java
index ceb94de..00b4377 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/framework/internal/OSGiServiceEvent.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/internal/OSGiServiceEvent.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.framework.internal;
+package org.eclipse.gemini.management.framework.internal;
import java.util.HashMap;
import java.util.Map;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/internal/BundleUtil.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/internal/BundleUtil.java
similarity index 98%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/internal/BundleUtil.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/internal/BundleUtil.java
index 2998511..0c166c4 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/internal/BundleUtil.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/internal/BundleUtil.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.internal;
+package org.eclipse.gemini.management.internal;
import java.util.ArrayList;
import java.util.List;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/internal/OSGiProperties.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/internal/OSGiProperties.java
similarity index 98%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/internal/OSGiProperties.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/internal/OSGiProperties.java
index 59dcfda..3ac735b 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/internal/OSGiProperties.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/internal/OSGiProperties.java
@@ -14,7 +14,7 @@
* Christopher Frost - Refactoring for Spec updates
******************************************************************************/
-package org.eclipse.gemini.mgmt.internal;
+package org.eclipse.gemini.management.internal;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -37,7 +37,7 @@
import javax.management.openmbean.TabularData;
import javax.management.openmbean.TabularDataSupport;
-import org.eclipse.gemini.mgmt.framework.CustomBundleWiringStateMBean;
+import org.eclipse.gemini.management.framework.CustomBundleWiringStateMBean;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
import org.osgi.jmx.JmxConstants;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/permissionadmin/PermissionManager.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/permissionadmin/PermissionManager.java
similarity index 98%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/permissionadmin/PermissionManager.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/permissionadmin/PermissionManager.java
index 289537f..191f892 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/permissionadmin/PermissionManager.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/permissionadmin/PermissionManager.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.permissionadmin;
+package org.eclipse.gemini.management.permissionadmin;
import java.io.IOException;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/provisioning/Provisioning.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/provisioning/Provisioning.java
similarity index 94%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/provisioning/Provisioning.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/provisioning/Provisioning.java
index 096982d..856a499 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/provisioning/Provisioning.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/provisioning/Provisioning.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.provisioning;
+package org.eclipse.gemini.management.provisioning;
import java.io.IOException;
import java.io.InputStream;
@@ -22,7 +22,7 @@
import javax.management.openmbean.TabularData;
-import org.eclipse.gemini.mgmt.internal.OSGiProperties;
+import org.eclipse.gemini.management.internal.OSGiProperties;
import org.osgi.jmx.service.provisioning.ProvisioningServiceMBean;
import org.osgi.service.provisioning.ProvisioningService;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/useradmin/UserManager.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/useradmin/UserManager.java
similarity index 97%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/useradmin/UserManager.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/useradmin/UserManager.java
index 602923d..c372b66 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/useradmin/UserManager.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/useradmin/UserManager.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.useradmin;
+package org.eclipse.gemini.management.useradmin;
import java.io.IOException;
import java.util.ArrayList;
@@ -23,11 +23,11 @@
import javax.management.openmbean.TabularData;
import org.osgi.framework.InvalidSyntaxException;
-import org.eclipse.gemini.mgmt.internal.OSGiProperties;
-import org.eclipse.gemini.mgmt.useradmin.internal.OSGiAuthorization;
-import org.eclipse.gemini.mgmt.useradmin.internal.OSGiGroup;
-import org.eclipse.gemini.mgmt.useradmin.internal.OSGiRole;
-import org.eclipse.gemini.mgmt.useradmin.internal.OSGiUser;
+import org.eclipse.gemini.management.internal.OSGiProperties;
+import org.eclipse.gemini.management.useradmin.internal.OSGiAuthorization;
+import org.eclipse.gemini.management.useradmin.internal.OSGiGroup;
+import org.eclipse.gemini.management.useradmin.internal.OSGiRole;
+import org.eclipse.gemini.management.useradmin.internal.OSGiUser;
import org.osgi.jmx.service.useradmin.UserAdminMBean;
import org.osgi.service.useradmin.Group;
import org.osgi.service.useradmin.Role;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/useradmin/internal/OSGiAuthorization.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/useradmin/internal/OSGiAuthorization.java
similarity index 97%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/useradmin/internal/OSGiAuthorization.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/useradmin/internal/OSGiAuthorization.java
index 51de097..506a0f2 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/useradmin/internal/OSGiAuthorization.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/useradmin/internal/OSGiAuthorization.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.useradmin.internal;
+package org.eclipse.gemini.management.useradmin.internal;
import java.util.HashMap;
import java.util.Map;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/useradmin/internal/OSGiGroup.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/useradmin/internal/OSGiGroup.java
similarity index 97%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/useradmin/internal/OSGiGroup.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/useradmin/internal/OSGiGroup.java
index ce9b4eb..93687ca 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/useradmin/internal/OSGiGroup.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/useradmin/internal/OSGiGroup.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.useradmin.internal;
+package org.eclipse.gemini.management.useradmin.internal;
import java.util.HashMap;
import java.util.Map;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/useradmin/internal/OSGiRole.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/useradmin/internal/OSGiRole.java
similarity index 97%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/useradmin/internal/OSGiRole.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/useradmin/internal/OSGiRole.java
index 0b125c3..db64781 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/useradmin/internal/OSGiRole.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/useradmin/internal/OSGiRole.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.useradmin.internal;
+package org.eclipse.gemini.management.useradmin.internal;
import java.util.HashMap;
import java.util.Map;
diff --git a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/useradmin/internal/OSGiUser.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/useradmin/internal/OSGiUser.java
similarity index 96%
rename from org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/useradmin/internal/OSGiUser.java
rename to org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/useradmin/internal/OSGiUser.java
index 30801f5..8e4a868 100644
--- a/org.eclipse.gemini.mgmt/src/main/java/org/eclipse/gemini/mgmt/useradmin/internal/OSGiUser.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/useradmin/internal/OSGiUser.java
@@ -13,7 +13,7 @@
* Hal Hildebrand - Initial JMX support
******************************************************************************/
-package org.eclipse.gemini.mgmt.useradmin.internal;
+package org.eclipse.gemini.management.useradmin.internal;
import java.util.HashMap;
import java.util.Map;
diff --git a/org.eclipse.gemini.mgmt/src/test/java/.gitignore b/org.eclipse.gemini.management/src/test/java/.gitignore
similarity index 100%
rename from org.eclipse.gemini.mgmt/src/test/java/.gitignore
rename to org.eclipse.gemini.management/src/test/java/.gitignore
