Right now, the client module is completely empty, so there's nothing to
include. When we're ready to commit changes that move the client code
to the new module, we'll send another change request (which will include
an OSGi review).
The service module is exactly the same as it is now (OSGi bundle,
artifact ID, etc, just a different directory in the source tree). REST,
Console and QL tests all passed after this refactoring.
On 6/7/11 12:52 PM, Jane Young wrote:
> You also need to update packager/glassfish-management module to
> include the two artifacts.
> The other changes look fine.
>
> On 6/7/11 10:06 AM, Jason Lee wrote:
>> Can I commit this?
>>
>> On 6/6/11 8:26 PM, Jason Lee wrote:
>>> Sorry. I thought they were in the diff. I've attached both of them.
>>> The
>>> rest-service POM is basically the existing REST POM. The client POM is
>>> pretty basic for now.
>>>
>>> On 6/6/11 6:30 PM, Jane Young wrote:
>>>> What is the content of rest-service and rest-client's pom files?
>>>>
>>>> On 6/6/11 2:35 PM, Jason Lee wrote:
>>>>> As a result of a customer request, the REST team will be delivering
>>>>> enhanced client-side support and utilities for the REST module. The
>>>>> best way to do this without requiring that rest-service.jar and
>>>>> all its
>>>>> dependencies be on the classpath is to restructure the REST (maven)
>>>>> module into two sub-modules: the current rest-service, and a new
>>>>> rest-client. The diff to make this change is below. The work is
>>>>> currently being done on the trunk, but will be ported to the 3.1.1
>>>>> branch when it's ready. I would like to get permission to commit
>>>>> these
>>>>> changes to POM, and solicit any feedback anyone on the team might
>>>>> have.
>>>>>
>>>>> I am currently rebuilding my tree and running QL in preparation
>>>>> for the
>>>>> commit, once/if approved.
>>>>>
>>>>> Thanks.
>>>>>
>>>>> Index: admin/rest/pom.xml
>>>>>
>>>>> ===================================================================
>>>>> --- admin/rest/pom.xml (revision 47336)
>>>>> +++ admin/rest/pom.xml (working copy)
>>>>> @@ -50,10 +50,10 @@
>>>>> <relativePath>../pom.xml</relativePath>
>>>>> </parent>
>>>>> <modelVersion>4.0.0</modelVersion>
>>>>> -<artifactId>rest-service</artifactId>
>>>>> -<packaging>hk2-jar</packaging>
>>>>> -<name>admin-rest</name>
>>>>> -<description>Rest Interface for GlassFish Management and
>>>>> Monitoring</description>
>>>>> +<artifactId>rest-service-parent</artifactId>
>>>>> +<packaging>pom</packaging>
>>>>> +<name>GlassFish Admin REST Parent</name>
>>>>> +<description>Parent module for GlassFish REST
>>>>> interface</description>
>>>>>
>>>>> <developers>
>>>>> <developer>
>>>>> @@ -83,115 +83,9 @@
>>>>> </roles>
>>>>> </developer>
>>>>> </developers>
>>>>> -<dependencies>
>>>>> -<dependency>
>>>>> -<groupId>com.sun.enterprise</groupId>
>>>>> -<artifactId>hk2</artifactId>
>>>>> -</dependency>
>>>>> -<dependency>
>>>>> -<groupId>org.glassfish.core</groupId>
>>>>> -<artifactId>kernel</artifactId>
>>>>> -<version>${project.version}</version>
>>>>> -</dependency>
>>>>> -<dependency>
>>>>> -<groupId>org.glassfish.common</groupId>
>>>>> -<artifactId>glassfish-api</artifactId>
>>>>> -<version>${project.version}</version>
>>>>> -</dependency>
>>>>> -<dependency>
>>>>> -<groupId>org.glassfish.common</groupId>
>>>>> -<artifactId>common-util</artifactId>
>>>>> -<version>${project.version}</version>
>>>>> -</dependency>
>>>>> -<dependency>
>>>>> -<groupId>com.sun.jersey</groupId>
>>>>> -<artifactId>jersey-server</artifactId>
>>>>> -<scope>provided</scope>
>>>>> -</dependency>
>>>>> -<dependency>
>>>>> -<groupId>org.glassfish.flashlight</groupId>
>>>>> -<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>
>>>>> -<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>
>>>>> -</dependency>
>>>>> -<dependency>
>>>>> -<groupId>org.glassfish.security</groupId>
>>>>> -<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>
>>>>> +<modules>
>>>>> +<module>rest-client</module>
>>>>> +<module>rest-service</module>
>>>>> +</modules>
>>>>> </project>
>>>>> Index: admin/rest/rest-service/pom.xml
>>>>>
>>>>> ===================================================================
>>>>> --- admin/rest/rest-service/pom.xml (revision 0)
>>>>> +++ admin/rest/rest-service/pom.xml (working copy)
>>>>> @@ -52,7 +52,7 @@
>>>>> <modelVersion>4.0.0</modelVersion>
>>>>> <artifactId>rest-service</artifactId>
>>>>> <packaging>hk2-jar</packaging>
>>>>> -<name>admin-rest</name>
>>>>> +<name>GlassFish Admin REST Service</name>
>>>>> <description>Rest Interface for GlassFish Management and
>>>>> Monitoring</description>
>>>>>
>>>>> <developers>
>>>>>
>>>>>
>>
>
--
Jason Lee
Senior Member of Technical Staff
GlassFish REST API / Administration Console
Oracle Corporation
Phone +1 405-216-3193
Blog http://blogs.steeplesoft.com