Thanks Jerome for fixing. I am sorry I was unaware of two ql workspaces.
I had committed changes to the trunks QL and did not realize about the
branch's QL. I was myself using the trunk's QL for the branch.
Aplogies for the inconvenience caused .
Regards,
Bhakti
Jane Young wrote:
> Thank you very much Jerome for fixing QL over the weekend,
>
> Bhakti,
> Can you port the same changes to trunk? I noticed you've removed
> webservices-api-osgi.jar from QL in the trunk workspace:
> Author: bhaktimehta
> Date: 2009-05-01 18:07:44+0000
> New Revision: 26827
>
> Modified:
> trunk/v3/tests/quicklook/gfproject/build-impl.xml
>
> Log:
> just check for the impl jars no need for apis
>
> Modified: trunk/v3/tests/quicklook/gfproject/build-impl.xml
> Url: https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/trunk/v3/tests/quicklook/gfproject/build-impl.xml?view=diff&rev=26827&p1=trunk/v3/tests/quicklook/gfproject/build-impl.xml&p2=trunk/v3/tests/quicklook/gfproject/build-impl.xml&r1=26826&r2=26827
> ==============================================================================
> --- trunk/v3/tests/quicklook/gfproject/build-impl.xml (original)
> +++ trunk/v3/tests/quicklook/gfproject/build-impl.xml 2009-05-01 18:07:44+0000
> @@ -309,7 +309,6 @@
>
> <condition property="wsjar.available">
> <and>
> - <available file="${glassfish.home}/modules/webservices-api-osgi.jar"/>
> <available file="${glassfish.home}/modules/webservices-osgi.jar"/>
> <available file="${glassfish.home}/modules/jaxb-osgi.jar"/>
> </and>
>
>
> And for some reason, the trunk QL is passing.
> Thanks again Jerome looking in this.
>
> Jane
>
>
>
> Jerome Dochez wrote:
>> Ok I figured it out and just like I expected, I wasn't me.
>>
>> You probably reverted my change but also Snjezana's change which was
>> done after me which actually triggered the file movement if I am not
>> mistaken.
>> http://fisheye4.atlassian.com/changelog/glassfish-svn/?cs=26856
>>
>> In any case, the real issue is that QL harness had not been changed
>> to look for the new location
>> for the jaxb and webservice-api jars. I just fixed it.
>>
>> <condition property="wsjar.available">
>> <and>
>> - <available
>> file="${glassfish.home}/modules/webservices-api-osgi.jar"/>
>> + <available
>> file="${glassfish.home}/modules/endorsed/webservices-api-osgi.jar"/>
>> <available
>> file="${glassfish.home}/modules/webservices-osgi.jar"/>
>> - <available file="${glassfish.home}/modules/jaxb-osgi.jar"/>
>> + <available
>> file="${glassfish.home}/modules/endorsed/jaxb-api-osgi.jar"/>
>> </and>
>> </condition>
>>
>>
>> I am still surprised at a few things :
>>
>> 1. the wsimport is called by not invoking the wsimport command but
>> just a plain invocation, I am not sure how we can set the
>> lib.endorsed settings correcly in such a case.
>> 2. same for the client invocation, although I have tried to fix it.
>>
>> Jerome
>>
>> *
>> *
>> On May 2, 2009, at 11:00 AM, Jane Young wrote:
>>
>>> You need to do a "mvn clean install" to reproduce it.
>>>
>>>
>>> Jerome Dochez wrote:
>>>> weird, I certainly ran the QL, maybe my checkin+bahkti's are
>>>> conflicting.
>>>>
>>>> I am looking at it now.
>>>>
>>>>
>>>> On May 2, 2009, at 2:40 AM, Jane Young wrote:
>>>>
>>>>> It's Jerome's commit (rev 26855) that's causing the QL tests to fail.
>>>>> http://fisheye4.atlassian.com/changelog/glassfish-svn/?cs=26855
>>>>>
>>>>> When I back-out his changes, all QL tests passed.
>>>>>
>>>>> Jerome, if you get chance, can you take a look at this?
>>>>>
>>>>> Thanks,
>>>>> Jane
>>>>>
>>>>>
>>>>> Jane Young wrote:
>>>>>> Hi Bhkati,
>>>>>>
>>>>>> QL is failing with "java.lang.ClassNotFoundException:
>>>>>> jaxwsfromwsdl.client.AddNumbersClient".
>>>>>>
>>>>>> See (internal):
>>>>>> http://gf-hudson.sfbay/hudson/job/gf-preview-build-continuous/30/testReport/jaxwsfromwsdl.client/JaxwsFromWsdlTestNG/_BeforeTest_loadClass/
>>>>>>
>>>>>> Is this related to your check in (rev 26837)? Can you take a look?
>>>>>>
>>>>>> Thanks,
>>>>>> Jane
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> Author: bhaktimehta
>>>>>> Date: 2009-05-01 20:39:54+0000
>>>>>> New Revision: 26837
>>>>>>
>>>>>> Modified:
>>>>>> branches/3.0-Preview/packager/metro/build.xml
>>>>>> branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen
>>>>>> branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen.bat
>>>>>> branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile
>>>>>> branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile.bat
>>>>>> branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy
>>>>>> branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy.bat
>>>>>> branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen
>>>>>> branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen.bat
>>>>>> branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport
>>>>>> branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport.bat
>>>>>> branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc
>>>>>> branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc.bat
>>>>>>
>>>>>> Log:
>>>>>> Porting fixes to the branch for modules/endorsed changes tests run ql
>>>>>>
>>>>>> Modified: branches/3.0-Preview/packager/metro/build.xml
>>>>>> Url: https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/branches/3.0-Preview/packager/metro/build.xml?view=diff&rev=26837&p1=branches/3.0-Preview/packager/metro/build.xml&p2=branches/3.0-Preview/packager/metro/build.xml&r1=26836&r2=26837
>>>>>> ==============================================================================
>>>>>> --- branches/3.0-Preview/packager/metro/build.xml (original)
>>>>>> +++ branches/3.0-Preview/packager/metro/build.xml 2009-05-01 20:39:54+0000
>>>>>> @@ -182,7 +182,8 @@
>>>>>>
>>>>>> <stage-module-jars graphid="all-modules" />
>>>>>> <stage-distribution-fragments graphid="all-modules" />
>>>>>> -
>>>>>> + <mkdir dir="target/stage/${install.dir.name}/glassfish/modules/endorsed"/>
>>>>>> + <move file="target/stage/${install.dir.name}/glassfish/modules/webservices-api-osgi.jar" todir="target/stage/${install.dir.name}/glassfish/modules/endorsed" failonerror="false"/>
>>>>>>
>>>>>> <chmod file="target/stage/${install.dir.name}/glassfish/bin/*" perm="ugo+rx"/>
>>>>>>
>>>>>>
>>>>>> Modified: branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen
>>>>>> Url: https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen?view=diff&rev=26837&p1=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen&p2=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen&r1=26836&r2=26837
>>>>>> ==============================================================================
>>>>>> --- branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen (original)
>>>>>> +++ branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen 2009-05-01 20:39:54+0000
>>>>>> @@ -9,4 +9,4 @@
>>>>>> AS_INSTALL_LIB=$AS_INSTALL/modules
>>>>>>
>>>>>>
>>>>>> -java -cp "$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jaxb-api-osgi.jar" com.sun.tools.jxc.SchemaGeneratorFacade "$@"
>>>>>> +java -Djava.endorsed.dirs="$AS_INSTALL_LIB/endorsed" -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar" com.sun.tools.jxc.SchemaGeneratorFacade "$@"
>>>>>>
>>>>>> Modified: branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen.bat
>>>>>> Url: https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen.bat?view=diff&rev=26837&p1=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen.bat&p2=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen.bat&r1=26836&r2=26837
>>>>>> ==============================================================================
>>>>>> --- branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen.bat (original)
>>>>>> +++ branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen.bat 2009-05-01 20:39:54+0000
>>>>>> @@ -5,4 +5,4 @@
>>>>>> REM Use is subject to license terms.
>>>>>> REM
>>>>>>
>>>>>> -java -cp "%~dp0..\modules\jaxb-api-osgi.jar;%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\webservices-api-osgi.jar" com.sun.tools.jxc.SchemaGeneratorFacade "%*"
>>>>>> +java -Djava.endorsed.dirs="%~dp0..\modules\endorsed" -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar" com.sun.tools.jxc.SchemaGeneratorFacade "%*"
>>>>>>
>>>>>> Modified: branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile
>>>>>> Url: https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile?view=diff&rev=26837&p1=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile&p2=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile&r1=26836&r2=26837
>>>>>> ==============================================================================
>>>>>> --- branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile (original)
>>>>>> +++ branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile 2009-05-01 20:39:54+0000
>>>>>> @@ -9,4 +9,4 @@
>>>>>> AS_INSTALL_LIB=$AS_INSTALL/modules
>>>>>> JAVAX_MAIL_JAR=$AS_INSTALL_LIB/javax.mail.jar
>>>>>>
>>>>>> -java -cp "$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jaxb-api-osgi.jar:$JAVAX_MAIL_JAR:$JAVA_HOME/lib/tools.jar" com.sun.xml.rpc.tools.wscompile.Main "$@"
>>>>>> +java -Djava.endorsed.dirs="$AS_INSTALL_LIB/endorsed" -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$JAVAX_MAIL_JAR:$JAVA_HOME/lib/tools.jar" com.sun.xml.rpc.tools.wscompile.Main "$@"
>>>>>>
>>>>>> Modified: branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile.bat
>>>>>> Url: https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile.bat?view=diff&rev=26837&p1=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile.bat&p2=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile.bat&r1=26836&r2=26837
>>>>>> ==============================================================================
>>>>>> --- branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile.bat (original)
>>>>>> +++ branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wscompile.bat 2009-05-01 20:39:54+0000
>>>>>> @@ -5,4 +5,4 @@
>>>>>> REM Use is subject to license terms.
>>>>>> REM
>>>>>>
>>>>>> -java -cp "%~dp0..\modules\jaxb-api-osgi.jar;%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\javax.mail.jar;%JAVA_HOME%/lib/tools.jar" com.sun.xml.rpc.tools.wscompile.Main "%*"
>>>>>> +java -Djava.endorsed.dirs="%~dp0..\modules\endorsed" -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\javax.mail.jar;%JAVA_HOME%/lib/tools.jar" com.sun.xml.rpc.tools.wscompile.Main "%*"
>>>>>>
>>>>>> Modified: branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy
>>>>>> Url: https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy?view=diff&rev=26837&p1=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy&p2=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy&r1=26836&r2=26837
>>>>>> ==============================================================================
>>>>>> --- branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy (original)
>>>>>> +++ branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy 2009-05-01 20:39:54+0000
>>>>>> @@ -9,4 +9,4 @@
>>>>>> AS_INSTALL_LIB=$AS_INSTALL/modules
>>>>>> JAVAX_MAIL_JAR=$AS_INSTALL_LIB/javax.mail.jar
>>>>>>
>>>>>> -java -cp "$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jaxb-api-osgi.jar:$JAVAX_MAIL_JAR:$JAVA_HOME/lib/tools.jar" com.sun.xml.rpc.tools.wsdeploy.Main "$@"
>>>>>> +java -Djava.endorsed.dirs="$AS_INSTALL_LIB/endorsed" -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$JAVAX_MAIL_JAR:$JAVA_HOME/lib/tools.jar" com.sun.xml.rpc.tools.wsdeploy.Main "$@"
>>>>>>
>>>>>> Modified: branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy.bat
>>>>>> Url: https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy.bat?view=diff&rev=26837&p1=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy.bat&p2=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy.bat&r1=26836&r2=26837
>>>>>> ==============================================================================
>>>>>> --- branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy.bat (original)
>>>>>> +++ branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsdeploy.bat 2009-05-01 20:39:54+0000
>>>>>> @@ -5,4 +5,4 @@
>>>>>> REM Use is subject to license terms.
>>>>>> REM
>>>>>>
>>>>>> -java -cp "%~dp0..\modules\jaxb-api-osgi.jar;%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\javax.mail.jar;%JAVA_HOME%/lib/tools.jar" com.sun.xml.rpc.tools.wsdeploy.Main "%*"
>>>>>> +java -Djava.endorsed.dirs="%~dp0..\modules\endorsed" -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\javax.mail.jar;%JAVA_HOME%/lib/tools.jar" com.sun.xml.rpc.tools.wsdeploy.Main "%*"
>>>>>>
>>>>>> Modified: branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen
>>>>>> Url: https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen?view=diff&rev=26837&p1=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen&p2=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen&r1=26836&r2=26837
>>>>>> ==============================================================================
>>>>>> --- branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen (original)
>>>>>> +++ branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen 2009-05-01 20:39:54+0000
>>>>>> @@ -8,4 +8,4 @@
>>>>>> AS_INSTALL=`dirname $0`/..
>>>>>> AS_INSTALL_LIB=$AS_INSTALL/modules
>>>>>>
>>>>>> -java -cp "$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jaxb-api-osgi.jar" com.sun.tools.ws.WsGen "$@"
>>>>>> +java -Djava.endorsed.dirs="$AS_INSTALL_LIB/endorsed" -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar" com.sun.tools.ws.WsGen "$@"
>>>>>>
>>>>>> Modified: branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen.bat
>>>>>> Url: https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen.bat?view=diff&rev=26837&p1=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen.bat&p2=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen.bat&r1=26836&r2=26837
>>>>>> ==============================================================================
>>>>>> --- branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen.bat (original)
>>>>>> +++ branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen.bat 2009-05-01 20:39:54+0000
>>>>>> @@ -5,4 +5,4 @@
>>>>>> REM Use is subject to license terms.
>>>>>> REM
>>>>>>
>>>>>> -java -cp "%~dp0..\modules\jaxb-api-osgi.jar;%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\webservices-api-osgi.jar" com.sun.tools.ws.WsGen "%*"
>>>>>> +java -Djava.endorsed.dirs="%~dp0..\modules\endorsed" -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar" com.sun.tools.ws.WsGen "%*"
>>>>>>
>>>>>> Modified: branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport
>>>>>> Url: https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport?view=diff&rev=26837&p1=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport&p2=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport&r1=26836&r2=26837
>>>>>> ==============================================================================
>>>>>> --- branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport (original)
>>>>>> +++ branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport 2009-05-01 20:39:54+0000
>>>>>> @@ -9,4 +9,4 @@
>>>>>> AS_INSTALL_LIB=$AS_INSTALL/modules
>>>>>>
>>>>>>
>>>>>> -java -cp "$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jaxb-api-osgi.jar" com.sun.tools.ws.WsImport "$@"
>>>>>> +java -Djava.endorsed.dirs="$AS_INSTALL_LIB/endorsed" -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar" com.sun.tools.ws.WsImport "$@"
>>>>>>
>>>>>> Modified: branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport.bat
>>>>>> Url: https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport.bat?view=diff&rev=26837&p1=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport.bat&p2=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport.bat&r1=26836&r2=26837
>>>>>> ==============================================================================
>>>>>> --- branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport.bat (original)
>>>>>> +++ branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport.bat 2009-05-01 20:39:54+0000
>>>>>> @@ -5,4 +5,4 @@
>>>>>> REM Use is subject to license terms.
>>>>>> REM
>>>>>>
>>>>>> -java -cp "%~dp0..\modules\jaxb-api-osgi.jar;%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\webservices-api-osgi.jar" com.sun.tools.ws.WsImport "%*"
>>>>>> +java -Djava.endorsed.dirs="%~dp0..\modules\endorsed" -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar" com.sun.tools.ws.WsImport "%*"
>>>>>>
>>>>>> Modified: branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc
>>>>>> Url: https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc?view=diff&rev=26837&p1=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc&p2=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc&r1=26836&r2=26837
>>>>>> ==============================================================================
>>>>>> --- branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc (original)
>>>>>> +++ branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc 2009-05-01 20:39:54+0000
>>>>>> @@ -8,4 +8,4 @@
>>>>>> AS_INSTALL=`dirname $0`/..
>>>>>> AS_INSTALL_LIB=$AS_INSTALL/modules
>>>>>>
>>>>>> -java -cp "$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jaxb-api-osgi.jar" com.sun.tools.xjc.Driver "$@"
>>>>>> +java -Djava.endorsed.dirs="$AS_INSTALL_LIB/endorsed" -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar" com.sun.tools.xjc.Driver "$@"
>>>>>>
>>>>>> Modified: branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc.bat
>>>>>> Url: https://glassfish-svn.dev.java.net/source/browse/glassfish-svn/branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc.bat?view=diff&rev=26837&p1=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc.bat&p2=branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc.bat&r1=26836&r2=26837
>>>>>> ==============================================================================
>>>>>> --- branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc.bat (original)
>>>>>> +++ branches/3.0-Preview/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc.bat 2009-05-01 20:39:54+0000
>>>>>> @@ -5,4 +5,4 @@
>>>>>> REM Use is subject to license terms.
>>>>>> REM
>>>>>>
>>>>>> -java -cp "%~dp0..\modules\jaxb-api-osgi.jar;%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\webservices-api-osgi.jar" com.sun.tools.xjc.Driver "%*"
>>>>>> +java -Djava.endorsed.dirs="%~dp0..\modules\endorsed" -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar" com.sun.tools.xjc.Driver "%*"
>>>>>>
>>>>>> ---------------------------------------------------------------------
>>>>>> To unsubscribe, e-mail: commits-unsubscribe_at_glassfish-svn.dev.java.net
>>>>>> For additional commands, e-mail: commits-help_at_glassfish-svn.dev.java.net
>>>>>
>>>>
>>>
>>
>