Index: nucleus/admin/rest/pom.xml
===================================================================
--- nucleus/admin/rest/pom.xml	(revision 50083)
+++ nucleus/admin/rest/pom.xml	(working copy)
@@ -88,4 +88,31 @@
         <module>rest-client</module>
         <module>rest-service</module>
     </modules>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>rest-devtest</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
Index: nucleus/admin/rest/rest-client/osgi.bundle
===================================================================
--- nucleus/admin/rest/rest-client/osgi.bundle	(revision 50083)
+++ nucleus/admin/rest/rest-client/osgi.bundle	(working copy)
@@ -39,7 +39,7 @@
 #
 
 -exportcontents: \
-                        org.glassfish.admin.rest
+                        org.glassfish.admin.rest.client
 DynamicImport-Package: \
                         com.sun.jersey.api.container, \
                         com.sun.jersey.api.core, \
Index: nucleus/admin/rest/rest-client/pom.xml
===================================================================
--- nucleus/admin/rest/rest-client/pom.xml	(revision 50083)
+++ nucleus/admin/rest/rest-client/pom.xml	(working copy)
@@ -45,9 +45,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.glassfish.admin</groupId>
-        <artifactId>nucleus-admin</artifactId>
+        <artifactId>rest-service-parent</artifactId>
         <version>4.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>rest-client</artifactId>
@@ -55,36 +55,24 @@
     <name>GlassFish Admin REST Client</name>
     <description>Rest Interface for GlassFish Management and Monitoring</description>
 
-    <developers>
-        <developer>
-            <id>jdlee</id>
-            <name>Jason Lee</name>
-            <organization>Oracle, Inc.</organization>
-            <roles>
-                <role>lead</role>
-                <role>developer</role>
-            </roles>
-        </developer>
-        <developer>
-            <id>ludo</id>
-            <name>Ludovic Champenois</name>
-            <url>http://weblogs.java.net/blog/ludo/</url>
-            <organization>Oracle, Inc.</organization>
-            <roles>
-                <role>developer</role>
-            </roles>
-        </developer>
-        <developer>
-            <id>mm110999</id>
-            <name>Mitesh Meswani</name>
-            <organization>Oracle, Inc.</organization>
-            <roles>
-                <role>developer</role>
-            </roles>
-        </developer>
-    </developers>
     <dependencies>
         <dependency>
+            <groupId>com.sun.jersey.contribs</groupId>
+            <artifactId>jersey-multipart</artifactId>
+<!--            <scope>provided</scope>-->
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-client</artifactId>
+<!--            <scope>provided</scope>-->
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-json</artifactId>
+<!--            <scope>provided</scope>-->
+        </dependency>
+        <!--
+        <dependency>
             <groupId>org.glassfish.hk2</groupId>
             <artifactId>hk2</artifactId>
         </dependency>
@@ -124,26 +112,11 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.sun.jersey.contribs</groupId>
-            <artifactId>jersey-multipart</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-grizzly2</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>org.kohsuke.metainf-services</groupId>
             <artifactId>metainf-services</artifactId>
             <optional>true</optional>
@@ -153,45 +126,6 @@
             <artifactId>security</artifactId>
             <version>${project.version}</version>
         </dependency>
+        -->
     </dependencies>
-    <build>
-                <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>org/glassfish/admin/rest/**/*.properties</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>org/glassfish/admin/rest/**</include>
-                </includes>
-            </resource>        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>rest-devtest</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>false</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
Index: nucleus/admin/rest/rest-service/pom.xml
===================================================================
--- nucleus/admin/rest/rest-service/pom.xml	(revision 50083)
+++ nucleus/admin/rest/rest-service/pom.xml	(working copy)
@@ -45,46 +45,30 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.glassfish.admin</groupId>
-        <artifactId>nucleus-admin</artifactId>
+        <artifactId>rest-service-parent</artifactId>
         <version>4.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+    
     <modelVersion>4.0.0</modelVersion>
     <artifactId>rest-service</artifactId>
     <packaging>hk2-jar</packaging>
     <name>GlassFish Admin REST Service</name>
     <description>Rest Interface for GlassFish Management and Monitoring</description>
 
-    <developers>
-        <developer>
-            <id>jdlee</id>
-            <name>Jason Lee</name>
-            <organization>Oracle, Inc.</organization>
-            <roles>
-                <role>lead</role>
-                <role>developer</role>
-            </roles>
-        </developer>
-        <developer>
-            <id>ludo</id>
-            <name>Ludovic Champenois</name>
-            <url>http://weblogs.java.net/blog/ludo/</url>
-            <organization>Oracle, Inc.</organization>
-            <roles>
-                <role>developer</role>
-            </roles>
-        </developer>
-        <developer>
-            <id>mm110999</id>
-            <name>Mitesh Meswani</name>
-            <organization>Oracle, Inc.</organization>
-            <roles>
-                <role>developer</role>
-            </roles>
-        </developer>
-    </developers>
     <dependencies>
         <dependency>
+            <groupId>org.glassfish.admin</groupId>
+            <artifactId>rest-client</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.common</groupId>
+            <artifactId>common-util</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.glassfish.hk2</groupId>
             <artifactId>hk2</artifactId>
         </dependency>
@@ -113,17 +97,16 @@
             <artifactId>flashlight-framework</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.glassfish.external</groupId>
             <artifactId>management-api</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.jvnet</groupId>
             <artifactId>mimepull</artifactId>
             <scope>provided</scope>
         </dependency>
+        <!--
         <dependency>
             <groupId>com.sun.jersey.contribs</groupId>
             <artifactId>jersey-multipart</artifactId>
@@ -144,6 +127,7 @@
             <artifactId>jersey-json</artifactId>
             <scope>provided</scope>
         </dependency>
+        -->
         <dependency>
             <groupId>org.kohsuke.metainf-services</groupId>
             <artifactId>metainf-services</artifactId>
@@ -161,19 +145,6 @@
         </dependency>
     </dependencies>
     <build>
-                <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>org/glassfish/admin/rest/**/*.properties</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>org/glassfish/admin/rest/**</include>
-                </includes>
-            </resource>        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
Index: appserver/packager/glassfish-management/pom.xml
===================================================================
--- appserver/packager/glassfish-management/pom.xml	(revision 50083)
+++ appserver/packager/glassfish-management/pom.xml	(working copy)
@@ -100,6 +100,11 @@
 
         <dependency>
             <groupId>org.glassfish.admin</groupId>
+            <artifactId>rest-client</artifactId>
+            <version>${project.version}</version>
+        </dependency>    
+        <dependency>
+            <groupId>org.glassfish.admin</groupId>
             <artifactId>rest-service</artifactId>
             <version>${project.version}</version>
         </dependency>