Hi, Jane
Thanks for your comments, I have made the changes according to your
suggestion.
Index: pom.xml
===================================================================
--- pom.xml (revision 30586)
+++ pom.xml (working copy)
@@ -49,6 +49,54 @@
<packaging>hk2-jar</packaging>
<name>Deployment Object Library</name>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.glassfish</groupId>
+
<artifactId>javax.annotation</artifactId>
+
<outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ <version>${project.version}</version>
+
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>com.sun.enterprise</groupId>
+ <artifactId>hk2-maven-plugin</artifactId>
+ <configuration>
+ <compilerArguments>
+ <!-- also adding the classes.jar in the
bootclasspath as rt.jar is not available on Mac -->
+
<bootclasspath>${project.build.directory}/endorsed/javax.annotation-${project.version}.jar${path.separator}${java.home}/../Classes/classes.jar${path.separator}${java.home}/lib/rt.jar</bootclasspath>
+ </compilerArguments>
+ <fork>true</fork>
+ </configuration>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+
<developers>
<developer>
<id>hzhang</id>
@@ -88,16 +136,6 @@
</roles>
</developer>
</developers>
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
- </build>
<dependencies>
<dependency>
<groupId>com.sun.enterprise</groupId>
Thanks,
- Hong
> Sorry for the late response.
>
> The changes fail in Mac. When I compile, I get the following error:
> [INFO] Compiling 559 source files to
> /export/GlassFish/Aug18/v3/deployment/dol/target/classes
> com.sun.tools.javac.util.FatalError: Fatal Error: Unable to find
> package java.lang in classpath or bootclasspath
> Fatal Error: Unable to find package java.lang in classpath or
> bootclasspath
> [INFO]
> ------------------------------------------------------------------------
> [ERROR] BUILD ERROR
> [INFO]
> ------------------------------------------------------------------------
> [INFO] Fatal error compiling
>
> and the reason is because Mac does not have rt.jar. You'll need to
> add the classes.jar in the bootclasspath. On Mac, classes.jar is
> located in ${java.home}/../Classes/classes.jar.
>
> I didn't catch that in webservices/jsr109-imp/pom.xml. There's
> probably no references to any packages in rt.jar/classes.jar and
> should be removed from bootclasspath in the pom.
>
> Another comment:
> Do you want to move the properties files to src/main/resources instead
> of src/main/java?
> If you move it to src/main/resource, then you don't need to specify:
> <resources>
> <resource>
> <directory>src/main/java</directory>
> <includes>
> <include>**/*.properties</include>
> </includes>
> </resource>
> </resources>
>
> Jane
>
>
> Hong Zhang wrote:
>> Just a reminder, can someone reivew the pom.xml for me? Snjezana has
>> already reviewed the build.xml.
>> I am hoping to check in this set of the changes before the weekend so
>> I don't have to join the crowd on Monday after the weekend's java.net
>> outage :-)
>>
>> Thanks,
>>
>> - Hong
>>
>> Hong Zhang wrote:
>>
>>> Thanks, Snjezana.
>>>
>>> Can someone review the pom.xml from deployment/dol module?
>>>
>>> Thanks,
>>>
>>> - Hong
>>>
>>> Snjezana Sevo-Zenzerovic wrote:
>>>
>>>> Hong,
>>>>
>>>> packager change looks fine.
>>>>
>>>> Thanks,
>>>>
>>>> Snjezana
>>>>
>>>> Hong Zhang wrote:
>>>>
>>>>> Hi,
>>>>> This is to make sure the javax.annotation.Resource class loaded
>>>>> from Glassfish instead of JDK. A similar mechanism was used as
>>>>> JAX-WS. One pom.xml and one build.xml were changed.
>>>>> The change of pom.xml in deployment/dol is to satisfy build
>>>>> time dependency. And the build.xml in packager/glassfish-common to
>>>>> satisfy runtime dependency.
>>>>>
>>>>> Index: deployment/dol/pom.xml
>>>>> ===================================================================
>>>>> --- deployment/dol/pom.xml (revision 30586)
>>>>> +++ deployment/dol/pom.xml (working copy)
>>>>> @@ -49,6 +49,53 @@
>>>>> <packaging>hk2-jar</packaging>
>>>>> <name>Deployment Object Library</name>
>>>>>
>>>>> + <build>
>>>>> + <plugins>
>>>>> + <plugin>
>>>>> + <artifactId>maven-dependency-plugin</artifactId>
>>>>> + <executions>
>>>>> + <execution>
>>>>> + <phase>process-resources</phase>
>>>>> + <goals>
>>>>> + <goal>copy</goal>
>>>>> + </goals>
>>>>> + <configuration>
>>>>> + <artifactItems>
>>>>> + <artifactItem>
>>>>> + <groupId>org.glassfish</groupId>
>>>>> +
>>>>> <artifactId>javax.annotation</artifactId>
>>>>> +
>>>>> <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
>>>>>
>>>>> +
>>>>> <version>${project.version}</version>+
>>>>> + </artifactItem>
>>>>> + </artifactItems>
>>>>> + </configuration>
>>>>> + </execution>
>>>>> + </executions>
>>>>> + </plugin>
>>>>> +
>>>>> + <plugin>
>>>>> + <groupId>com.sun.enterprise</groupId>
>>>>> + <artifactId>hk2-maven-plugin</artifactId>
>>>>> + <configuration>
>>>>> + <compilerArguments>
>>>>> +
>>>>> <bootclasspath>${project.build.directory}/endorsed/javax.annotation-${project.version}.jar${path.separator}${java.home}/lib/rt.jar</bootclasspath>
>>>>>
>>>>> + </compilerArguments>
>>>>> + <fork>true</fork>
>>>>> + </configuration>
>>>>> + </plugin>
>>>>> + </plugins>
>>>>> + <resources>
>>>>> + <resource>
>>>>> + <directory>src/main/java</directory>
>>>>> + <includes>
>>>>> + <include>**/*.properties</include>
>>>>> + </includes>
>>>>> + </resource>
>>>>> + </resources>
>>>>> + </build>
>>>>> +
>>>>> +
>>>>> <developers>
>>>>> <developer>
>>>>>
>>>>> <developer>
>>>>> <id>hzhang</id>
>>>>> @@ -88,16 +135,6 @@
>>>>> </roles>
>>>>> </developer>
>>>>> </developers>
>>>>> - <build>
>>>>> - <resources>
>>>>> - <resource>
>>>>> - <directory>src/main/java</directory>
>>>>> - <includes>
>>>>> - <include>**/*.properties</include>
>>>>> - </includes>
>>>>> - </resource>
>>>>> - </resources>
>>>>> - </build>
>>>>> <dependencies>
>>>>> <dependency>
>>>>> <groupId>com.sun.enterprise</groupId>
>>>>>
>>>>> Index: packager/glassfish-common/build.xml
>>>>> ===================================================================
>>>>> --- packager/glassfish-common/build.xml (revision 30586)
>>>>> +++ packager/glassfish-common/build.xml (working copy)
>>>>> @@ -44,6 +44,7 @@
>>>>>
>>>>> <move
>>>>> file="target/stage/${install.dir.name}/glassfish/modules/jaxb-api-osgi.jar"
>>>>> todir="target/stage/${install.dir.name}/glassfish/modules/endorsed"
>>>>> failonerror="false"/>
>>>>>
>>>>> + <move
>>>>> file="target/stage/${install.dir.name}/glassfish/modules/javax.annotation.jar"
>>>>> todir="target/stage/${install.dir.name}/glassfish/modules/endorsed"
>>>>> failonerror="false"/>
>>>>>
>>>>> <if test="${compression}">
>>>>> <antcall target="pack.compression" />
>>>>>
>>>>>
>>>>> Thanks,
>>>>>
>>>>> - Hong
>>>>>
>>>>
>>>>
>>>> ---------------------------------------------------------------------
>>>> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
>>>> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>>>>
>>>
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
>>> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
>> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>