Pl. send me the diffs for all the files you are trying to commit.
Thanks,
Sahoo
Bhakti Mehta wrote:
> Index: pom.xml
> ===================================================================
> Done. I made the following change in the v3/pom.xml . Please let me
> know if I can commit these changes
> Regards,
> Bhakti
>
> --- pom.xml (revision 26039)
> +++ pom.xml (working copy)
> @@ -140,8 +140,8 @@
>
> <glassfish-corba.version>3.0.0-b018</glassfish-corba.version>
> <uc-pkg-client.version>1.0.7-15.1269</uc-pkg-client.version>
> <ucbootstrap.version>0.0.0.15</ucbootstrap.version>
> - <webservices.version>2.0-b03</webservices.version>
> - <jaxb.version>2.2-promoted-b9</jaxb.version>
> + <webservices.version>2.0-b04</webservices.version>
> + <jaxb.version>2.2-promoted-b16</jaxb.version>
>
> <javax-persistence-api.version>2.0.0-M1</javax-persistence-api.version>
> <dbschema.version>RELEASE60</dbschema.version>
> <!-- osgi version string must start with a number. Manually
> mapping above dbschema.version to osgi.version here -->
> @@ -732,6 +732,28 @@
> <version>${antlr.version}</version>
> </dependency>
>
> + <dependency>
> + <groupId>com.sun.xml.ws</groupId>
> + <artifactId>webservices-osgi</artifactId>
> + <version>${webservices.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>javax.xml</groupId>
> + <artifactId>webservices-api-osgi</artifactId>
> + <version>${webservices.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>com.sun.xml.bind</groupId>
> + <artifactId>jaxb-osgi</artifactId>
> + <version>${jaxb.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>javax.xml.bind</groupId>
> + <artifactId>jaxb-api-osgi</artifactId>
> + <version>${jaxb.version}</version>
> + </dependency>
> +
> +
> </dependencies>
> </dependencyManagement>
>
>
> Sahoo wrote:
>> You have specified the dependency versions in your pom.xmls. Instead,
>> please use <dependencyManagement/> in v3/pom.xml to specify all the
>> versions for external dependencies.
>>
>> Thanks,
>> Sahoo
>>
>> Bhakti Mehta wrote:
>>> Jane/Sahoo/Jerome,
>>> Please can you review the following poms.
>>>
>>> The following changes are made.
>>> 1. Newer versions metro and jaxb
>>> 2.The webservices scripts were not being included in glassfish
>>> distribution, so followed Snjezana's suggestions and created a
>>> distribution fragment just like appclient so that they land up in
>>> glassfish.zip
>>> 3.For Ejb webservices endpoints I need to depend on
>>> grizzly-http-servlet and
>>> grizzly-utils so added those dependencies
>>>
>>> Please let me know by tomorrow morning so I can commit the changes
>>> Thanks,
>>> Bhakti
>>>
>>> ===================================================================
>>> --- pom.xml (revision 26006)
>>> +++ pom.xml (working copy)
>>> @@ -140,8 +140,8 @@
>>>
>>> <glassfish-corba.version>3.0.0-b018</glassfish-corba.version>
>>> <uc-pkg-client.version>1.0.7-15.1269</uc-pkg-client.version>
>>> <ucbootstrap.version>0.0.0.15</ucbootstrap.version>
>>> - <webservices.version>2.0-b03</webservices.version>
>>> - <jaxb.version>2.2-promoted-b9</jaxb.version>
>>> + <webservices.version>2.0-b04</webservices.version>
>>> + <jaxb.version>2.2-promoted-b16</jaxb.version>
>>>
>>> <javax-persistence-api.version>2.0.0-M1</javax-persistence-api.version>
>>> <dbschema.version>RELEASE60</dbschema.version>
>>> <!-- osgi version string must start with a number. Manually
>>> mapping above dbschema.version to osgi.version here -->
>>> Index: distributions/glassfish/pom.xml
>>> ===================================================================
>>> --- distributions/glassfish/pom.xml (revision 26006)
>>> +++ distributions/glassfish/pom.xml (working copy)
>>> @@ -119,6 +119,12 @@
>>> <version>${project.version}</version>
>>> </dependency>
>>> <dependency>
>>> + <groupId>org.glassfish.webservices</groupId>
>>> + <artifactId>webservices-scripts</artifactId>
>>> + <version>${project.version}</version>
>>> + <type>distribution-fragment</type>
>>> + </dependency>
>>> + <dependency>
>>> <groupId>com.sun.xml.ws</groupId>
>>> <artifactId>webservices-osgi</artifactId>
>>> <version>${webservices.version}</version>
>>> @@ -142,6 +148,12 @@
>>> <type>jar</type>
>>> </dependency>
>>> <dependency>
>>> + <groupId>javax.xml.bind</groupId>
>>> + <artifactId>jaxb-api-osgi</artifactId>
>>> + <version>${jaxb.version}</version>
>>> + <type>jar</type>
>>> + </dependency>
>>> + <dependency>
>>> <groupId>org.glassfish.security</groupId>
>>> <artifactId>webservices.security</artifactId>
>>> <version>${project.version}</version>
>>> Index: packager/metro/pom.xml
>>> ===================================================================
>>> --- packager/metro/pom.xml (revision 26006)
>>> +++ packager/metro/pom.xml (working copy)
>>> @@ -112,6 +112,11 @@
>>> <version>${jaxb.version}</version>
>>> </dependency>
>>> <dependency>
>>> + <groupId>javax.xml.bind</groupId>
>>> + <artifactId>jaxb-api-osgi</artifactId>
>>> + <version>${jaxb.version}</version>
>>> + </dependency>
>>> + <dependency>
>>> <groupId>org.glassfish.security</groupId>
>>> <artifactId>webservices.security</artifactId>
>>> <version>${project.version}</version>
>>>
>>>
>>> Index: webservices/webservices-scripts/pom.xml
>>> ===================================================================
>>> --- webservices/webservices-scripts/pom.xml (revision 0)
>>> +++ webservices/webservices-scripts/pom.xml (revision 0)
>>> @@ -0,0 +1,70 @@
>>> +<project xmlns="http://maven.apache.org/POM/4.0.0"
>>> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
>>> http://maven.apache.org/maven-v4_0_0.xsd">
>>> +
>>> + <modelVersion>4.0.0</modelVersion>
>>> + <parent>
>>> + <groupId>org.glassfish.webservices</groupId>
>>> + <artifactId>webservices</artifactId>
>>> + <version>3.0-SNAPSHOT</version>
>>> + </parent>
>>> +
>>> + <artifactId>webservices-scripts</artifactId>
>>> + <name>GlassFish webservices scripts</name>
>>> +
>>> + <!--
>>> + The comments below were copied from the appclient-scripts
>>> module. + They are very helpful so it seemed like a good
>>> idea to leave them here also.
>>> + -->
>>> + <!--
>>> + This packaging specifies that it's a package that contains
>>> files to be added to
>>> + the distribution.
>>> +
>>> + In this packaging mode, the build will produce a jar, like it
>>> normally does for
>>> + the <packaging>jar</packaging>, but the contents of this jar
>>> is then extracted
>>> + when the final GlassFish distribution is assembled. (But when
>>> this happens,
>>> + META-INF/** in the jar will be ignored.)
>>> +
>>> + For a fragment to be added to the distribution, the
>>> distribution POM needs
>>> + to directly or indirectly depend on the fragment module. This
>>> is normally
>>> + done by creating a feature-level grouping POM (which allows
>>> you to bundle multiple
>>> + modules and treat it as a single dependency - see the
>>> webtier-all module for example),
>>> + and have that declare a dependency on the fragment, instead
>>> of directly
>>> + modifying the distribution POM.
>>> +
>>> + So the idea here is that individual technology area will
>>> create their own
>>> + fragments that contain pieces that they need, and when the
>>> said technology
>>> + is bundled in GF, the corresponding fragment will be also
>>> added, thanks to
>>> + the transitive dependency handling in Maven.
>>> + -->
>>> +
>>> + <packaging>distribution-fragment</packaging>
>>> +
>>> +<!--
>>> +
>>> + <packaging>pom</packaging>
>>> +--> <build>
>>> + <!--
>>> + In this module, all the files are statically stored as-is
>>> in the Subversion repository,
>>> + so the simple copying from src/main/resources to
>>> target/classes that Maven does by default
>>> + is suffice.
>>> +
>>> + But in more complex scenario, one can use
>>> maven-antrun-extended-plugin and use a series of Ant tasks
>>> + to perform processing on resources, such as token
>>> replacement, file generation, pre-processing, etc.
>>> +
>>> + The following section shows how you can do this.
>>> + -->
>>> + <plugins>
>>> + <plugin>
>>> + <groupId>org.glassfish.build</groupId>
>>> + <artifactId>maven-glassfishbuild-plugin</artifactId>
>>> + </plugin>
>>> + </plugins>
>>> + <extensions>
>>> + <extension>
>>> + <groupId>org.glassfish.build</groupId>
>>> +
>>> <artifactId>maven-glassfishbuild-extension</artifactId>
>>> + <version>${project.version}</version>
>>> + </extension>
>>> + </extensions>
>>> + </build>
>>> +
>>> +</project>
>>>
>>> Index: webservices/jsr109-impl/pom.xml
>>> ===================================================================
>>> --- webservices/jsr109-impl/pom.xml (revision 26006)
>>> +++ webservices/jsr109-impl/pom.xml (working copy)
>>> @@ -153,6 +153,11 @@
>>> <version>${jaxb.version}</version>
>>> </dependency>
>>> <dependency>
>>> + <groupId>javax.xml.bind</groupId>
>>> + <artifactId>jaxb-api-osgi</artifactId>
>>> + <version>${jaxb.version}</version>
>>> + </dependency>
>>> + <dependency>
>>> <groupId>org.glassfish</groupId>
>>> <artifactId>javax.ejb</artifactId>
>>> <version>${project.version}</version>
>>> @@ -162,6 +167,18 @@
>>> <artifactId>ejb-internal-api</artifactId>
>>> <version>${project.version}</version>
>>> </dependency>
>>> + <dependency>
>>> + <groupId>com.sun.grizzly</groupId>
>>> + <artifactId>grizzly-http-servlet</artifactId>
>>> + <version>${grizzly.version}</version>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>com.sun.grizzly</groupId>
>>> + <artifactId>grizzly-utils</artifactId>
>>> + <version>${grizzly.version}</version>
>>> + </dependency>
>>> +
>>> +
>>> </dependencies>
>>> </project>
>>> Index: webservices/pom.xml
>>> ===================================================================
>>> --- webservices/pom.xml (revision 26006)
>>> +++ webservices/pom.xml (working copy)
>>> @@ -50,6 +50,7 @@
>>> <name>GlassFish Web Services related modules</name> <modules>
>>> <module>jsr109-impl</module>
>>> + <module>webservices-scripts</module>
>>> </modules>
>>> </project>
>>>
>>> /Users/bhakti/trialv3/v3 %
>>>
>>>
>>> ---------------------------------------------------------------------
>>> 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
>