Author: isuru Date: Tue Nov 25 10:50:46 2008 New Revision: 24860 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=24860
Log: Fixes in wsas samples Added: trunk/wsas/java/carbon/samples/Chad/bin.xml Modified: trunk/wsas/java/carbon/samples/Chad/build.xml trunk/wsas/java/carbon/samples/Chad/pom.xml trunk/wsas/java/carbon/samples/DataService/build.xml trunk/wsas/java/carbon/samples/EJBService/build.xml trunk/wsas/java/carbon/samples/FlickrClient/build.xml trunk/wsas/java/carbon/samples/JAXWS/build.xml trunk/wsas/java/carbon/samples/JAXWS/wsdl/CalculatorService.wsdl trunk/wsas/java/carbon/samples/Jibx/build.xml trunk/wsas/java/carbon/samples/Jibx/pom.xml trunk/wsas/java/carbon/samples/Jibx/run-client.bat trunk/wsas/java/carbon/samples/Jibx/run-client.sh trunk/wsas/java/carbon/samples/Jibx/src/org/wso2/wsas/jibx/Client.java trunk/wsas/java/carbon/samples/MEX/build.xml trunk/wsas/java/carbon/samples/MEX/pom.xml trunk/wsas/java/carbon/samples/MEX/run-client.bat trunk/wsas/java/carbon/samples/MEX/run-client.sh trunk/wsas/java/carbon/samples/MTOM/build.xml trunk/wsas/java/carbon/samples/MTOM/pom.xml trunk/wsas/java/carbon/samples/MTOM/run-client.bat trunk/wsas/java/carbon/samples/MTOM/run-client.sh trunk/wsas/java/carbon/samples/MTOM/src/org/wso2/wsas/sample/mtom/client/Client.java trunk/wsas/java/carbon/samples/MTOM/src/org/wso2/wsas/sample/mtom/services/MTOMService.java trunk/wsas/java/carbon/samples/TinyURL/src/org/wso2/wsas/sample/tinyurl/TUrl.java trunk/wsas/java/carbon/samples/XKMS/pom.xml trunk/wsas/java/carbon/samples/Xfer/build.xml trunk/wsas/java/carbon/samples/Xfer/pom.xml trunk/wsas/java/carbon/samples/Xfer/run-client.bat trunk/wsas/java/carbon/samples/Xfer/run-client.sh trunk/wsas/java/carbon/samples/pom.xml trunk/wsas/java/carbon/samples/sts-sample/build.xml trunk/wsas/java/carbon/samples/sts-sample/pom.xml trunk/wsas/java/carbon/samples/sts-sample/run-client.bat trunk/wsas/java/carbon/samples/sts-sample/run-client.sh Added: trunk/wsas/java/carbon/samples/Chad/bin.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Chad/bin.xml?pathrev=24860 ============================================================================== --- (empty file) +++ trunk/wsas/java/carbon/samples/Chad/bin.xml Tue Nov 25 10:50:46 2008 @@ -0,0 +1,16 @@ +<assembly> + <id>bin</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + + <dependencySet> + <outputDirectory>hibernate</outputDirectory> + <includes> + <include>org.hibernate:hibernate:jar</include> + </includes> + </dependencySet> + </dependencySets> +</assembly> \ No newline at end of file Modified: trunk/wsas/java/carbon/samples/Chad/build.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Chad/build.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Chad/build.xml (original) +++ trunk/wsas/java/carbon/samples/Chad/build.xml Tue Nov 25 10:50:46 2008 @@ -32,6 +32,10 @@ <fileset dir="${wso2wsas.home}"> <include name="repository/lib/*.jar"/> </fileset> + <fileset dir="target/wso2wsas-samples-chad-SNAPSHOT-bin.dir/"> + <include name="hibernate/*.jar"/> + </fileset> + </path> <target name="init" depends="clean"> Modified: trunk/wsas/java/carbon/samples/Chad/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Chad/pom.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Chad/pom.xml (original) +++ trunk/wsas/java/carbon/samples/Chad/pom.xml Tue Nov 25 10:50:46 2008 @@ -49,6 +49,25 @@ <enableRulesSummary>false</enableRulesSummary> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + <executions> + <execution> + <id>distribution-package</id> + <phase>install</phase> + <goals> + <goal>directory-single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>bin.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> <!--<plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clover-plugin</artifactId> @@ -118,6 +137,11 @@ <artifactId>org.wso2.carbon.axiom</artifactId> <version>1.2.7</version> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + <version>3.2.5.ga</version> + </dependency> </dependencies> <reporting> Modified: trunk/wsas/java/carbon/samples/DataService/build.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/DataService/build.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/DataService/build.xml (original) +++ trunk/wsas/java/carbon/samples/DataService/build.xml Tue Nov 25 10:50:46 2008 @@ -30,7 +30,7 @@ <property name="dbURL" value="jdbc:derby:${basedir}/${db.dir}/DATA_SERV_SAMP;create=true"/> - <ant antfile="${wso2wsas.home}/bin/build.xml"/> + <ant antfile="${wsashome}/bin/build.xml"/> <path id="all.jar.classpath"> <fileset dir="${wsashome}/repository/lib"> Modified: trunk/wsas/java/carbon/samples/EJBService/build.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/EJBService/build.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/EJBService/build.xml (original) +++ trunk/wsas/java/carbon/samples/EJBService/build.xml Tue Nov 25 10:50:46 2008 @@ -23,7 +23,7 @@ <property name="carbon.home" value="${wsashome}"/> <property name="wsas.lib" value="${wsashome}/lib"/> - <ant antfile="${wso2wsas.home}/bin/build.xml"/> + <ant antfile="${wsashome}/bin/build.xml"/> <target name="init"> <mkdir dir="${classes}"/> Modified: trunk/wsas/java/carbon/samples/FlickrClient/build.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/FlickrClient/build.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/FlickrClient/build.xml (original) +++ trunk/wsas/java/carbon/samples/FlickrClient/build.xml Tue Nov 25 10:50:46 2008 @@ -47,7 +47,7 @@ </target> <target name="generate-source" depends="init"> - <java classname="org.wso2.utils.codegen.CodegenHelper" fork="true"> + <java classname="org.wso2.carbon.utils.codegen.CodegenHelper" fork="true"> <arg value="./conf/codegen.xml"/> <classpath refid="axis2.class.path"/> </java> Modified: trunk/wsas/java/carbon/samples/JAXWS/build.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/JAXWS/build.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/JAXWS/build.xml (original) +++ trunk/wsas/java/carbon/samples/JAXWS/build.xml Tue Nov 25 10:50:46 2008 @@ -34,6 +34,13 @@ <ant antfile="${wso2wsas.home}/bin/build.xml"/> + <copy todir="${wso2wsas.home}/repository/lib"> + <fileset dir="${wsas.lib}"> + <include name="axis2-jws-api*.jar"/> + <include name="jaxb-api*.jar"/> + </fileset> + </copy> + <path id="wsas.class.path"> <pathelement path="${java.class.path}"/> <fileset dir="${wso2wsas.home}"> @@ -45,20 +52,20 @@ </path> <path id="client.class.path"> - <fileset dir="${wso2wsas.home}/lib"> - <include name="*.jar" /> - <include name="endorsed/*.jar" /> - </fileset> - <fileset dir="services"> - <include name="*.jar" /> - </fileset> - <fileset dir="${generated.lib.dir}"> - <include name="*.jar" /> - </fileset> + <fileset dir="${wso2wsas.home}/repository/lib"> + <include name="*.jar"/> + <include name="endorsed/*.jar"/> + </fileset> + <fileset dir="services"> + <include name="*.jar"/> + </fileset> + <fileset dir="${generated.lib.dir}"> + <include name="*.jar"/> + </fileset> </path> <target name="init" depends="clean"> - <antcall target="prepare" /> + <antcall target="prepare"/> </target> <target name="clean"> @@ -77,7 +84,7 @@ </target> <target name="generate-source" depends="init"> - <java classname="org.wso2.utils.codegen.CodegenHelper" fork="true"> + <java classname="org.wso2.carbon.utils.codegen.CodegenHelper" fork="true"> <arg value="./conf/codegen.xml"/> <classpath refid="wsas.class.path"/> </java> @@ -109,7 +116,7 @@ </jar> <jar destfile="${services}/${jarName}"> - <fileset dir="${classes}"> + <fileset dir="${classes}"> <include name="**/*.class"/> </fileset> </jar> @@ -125,28 +132,28 @@ </fileset> </copy> - </target> + </target> + + <target name="run-client" depends="prepare"> + <antcall target="adb.client.jar"/> + <antcall target="adb.client.run"/> + </target> - <target name="run-client" depends="prepare" > - <antcall target="adb.client.jar" /> - <antcall target="adb.client.run" /> - </target> - - <target name="adb.client.compile"> - <javac srcdir="src" destdir="${generated.classes.dir}" > - <classpath refid="wsas.class.path" /> - </javac> - </target> - - <target name="adb.client.jar"> - <jar basedir="${generated.classes.dir}" destfile="${generated.lib.dir}/adb-client.jar" /> - </target> - - <target name="adb.client.run"> - <java classname="org.wso2.wsas.sample.jaxws.calculator.client.CalculatorClient"> - <classpath refid="client.class.path" /> - </java> - </target> + <target name="adb.client.compile"> + <javac srcdir="src" destdir="${generated.classes.dir}"> + <classpath refid="wsas.class.path"/> + </javac> + </target> + + <target name="adb.client.jar"> + <jar basedir="${generated.classes.dir}" destfile="${generated.lib.dir}/adb-client.jar"/> + </target> + + <target name="adb.client.run"> + <java classname="org.wso2.wsas.sample.jaxws.calculator.client.CalculatorClient"> + <classpath refid="client.class.path"/> + </java> + </target> </project> Modified: trunk/wsas/java/carbon/samples/JAXWS/wsdl/CalculatorService.wsdl URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/JAXWS/wsdl/CalculatorService.wsdl?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/JAXWS/wsdl/CalculatorService.wsdl (original) +++ trunk/wsas/java/carbon/samples/JAXWS/wsdl/CalculatorService.wsdl Tue Nov 25 10:50:46 2008 @@ -73,7 +73,7 @@ </wsdl:binding> <wsdl:service name="CalculatorService"> <wsdl:port name="Calculator" binding="tns:CalculatorSoapBinding"> - <soap:address location="http://localhost:9762/services/CalculatorService"/> + <soap:address location="http://localhost:9763/services/CalculatorService"/> </wsdl:port> </wsdl:service> </wsdl:definitions> Modified: trunk/wsas/java/carbon/samples/Jibx/build.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Jibx/build.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Jibx/build.xml (original) +++ trunk/wsas/java/carbon/samples/Jibx/build.xml Tue Nov 25 10:50:46 2008 @@ -25,10 +25,12 @@ <property name="gen.src" value="target/generated/src"/> <property name="services" value="services"/> + <ant antfile="${dir.wso2wsas}/bin/build.xml"/> + <path id="axis2.class.path"> <pathelement path="${java.class.path}"/> <fileset dir="${wso2wsas.home}"> - <include name="lib/*.jar"/> + <include name="repository/lib/*.jar"/> </fileset> </path> Modified: trunk/wsas/java/carbon/samples/Jibx/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Jibx/pom.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Jibx/pom.xml (original) +++ trunk/wsas/java/carbon/samples/Jibx/pom.xml Tue Nov 25 10:50:46 2008 @@ -55,7 +55,7 @@ <tasks> <!--<property name="keys.dir" value="${basedir}/target/keys"/>--> <!--<delete dir="${keys.dir}"/>--> - <java classname="org.wso2.utils.codegen.CodegenHelper" + <java classname="org.wso2.carbon.utils.codegen.CodegenHelper" fork="true"> <arg value="./conf/codegen.xml"/> <classpath refid="maven.dependency.classpath"/> @@ -168,6 +168,75 @@ </plugins> </build> + <dependencies> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.core</artifactId> + <version>SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.utils</artifactId> + <version>SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.rm</artifactId> + <version>SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.security.mgt</artifactId> + <version>SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.axis2</artifactId> + <version>1.4.1-wso2</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.wss4j</artifactId> + <version>1.5.4</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.security.rampart</artifactId> + <version>SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.axiom</artifactId> + <version>1.2.7</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + <version>3.2.5.ga</version> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-bind</artifactId> + <version>1.1.5</version> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-run</artifactId> + <version>1.1.5</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>wstx-asl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-jibx</artifactId> + <version>1.4.1-wso2</version> + </dependency> + </dependencies> + <reporting> <plugins> <plugin> Modified: trunk/wsas/java/carbon/samples/Jibx/run-client.bat URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Jibx/run-client.bat?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Jibx/run-client.bat (original) +++ trunk/wsas/java/carbon/samples/Jibx/run-client.bat Tue Nov 25 10:50:46 2008 @@ -68,7 +68,7 @@ rem loop through the libs and add them to the class path cd %WSO2WSAS_HOME%\samples\Jibx set CLIENT_CLASSPATH=.\conf;.\temp\classes -FOR %%C in (..\..\lib\*.jar) DO set CLIENT_CLASSPATH=!CLIENT_CLASSPATH!;..\..\lib\%%~nC%%~xC +FOR %%C in (..\..\repository\lib\*.jar) DO set CLIENT_CLASSPATH=!CLIENT_CLASSPATH!;..\..\repository\lib\%%~nC%%~xC rem ----- Execute The Requested Command --------------------------------------- echo Using WSO2WSAS_HOME: %WSO2WSAS_HOME% Modified: trunk/wsas/java/carbon/samples/Jibx/run-client.sh URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Jibx/run-client.sh?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Jibx/run-client.sh (original) +++ trunk/wsas/java/carbon/samples/Jibx/run-client.sh Tue Nov 25 10:50:46 2008 @@ -65,7 +65,7 @@ # update classpath CLIENT_CLASSPATH="" -for f in "$WSO2WSAS_HOME"/lib/*.jar +for f in "$WSO2WSAS_HOME"/repository/lib/*.jar do CLIENT_CLASSPATH=$CLIENT_CLASSPATH:$f done Modified: trunk/wsas/java/carbon/samples/Jibx/src/org/wso2/wsas/jibx/Client.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Jibx/src/org/wso2/wsas/jibx/Client.java?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Jibx/src/org/wso2/wsas/jibx/Client.java (original) +++ trunk/wsas/java/carbon/samples/Jibx/src/org/wso2/wsas/jibx/Client.java Tue Nov 25 10:50:46 2008 @@ -16,7 +16,7 @@ package org.wso2.wsas.jibx; import org.apache.axis2.AxisFault; -import org.wso2.utils.NetworkUtils; +import org.wso2.carbon.utils.NetworkUtils; import org.wso2.wsas.jibx.client.LibraryServiceStub; import org.wso2.wsas.jibx.library.beans.Book; Modified: trunk/wsas/java/carbon/samples/MEX/build.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/MEX/build.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/MEX/build.xml (original) +++ trunk/wsas/java/carbon/samples/MEX/build.xml Tue Nov 25 10:50:46 2008 @@ -8,10 +8,12 @@ <property name="src" value="src" /> <property name="services" value="services" /> - <path id="axis2.class.path"> + <ant antfile="${wso2wsas.home}/bin/build.xml"/> + + <path id="axis2.class.path"> <pathelement path="${java.class.path}" /> <fileset dir="${wso2wsas.home}"> - <include name="lib/*.jar" /> + <include name="repository/lib/*.jar" /> </fileset> </path> Modified: trunk/wsas/java/carbon/samples/MEX/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/MEX/pom.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/MEX/pom.xml (original) +++ trunk/wsas/java/carbon/samples/MEX/pom.xml Tue Nov 25 10:50:46 2008 @@ -31,13 +31,13 @@ <dependency> <groupId>org.wso2.mex</groupId> <artifactId>wso2mex</artifactId> - <version>${wso2mex.version}</version> + <version>2.2</version> <type>mar</type> </dependency> <dependency> <groupId>org.wso2.mex</groupId> <artifactId>wso2mex</artifactId> - <version>${wso2mex.version}</version> + <version>2.2</version> <type>jar</type> </dependency> </dependencies> Modified: trunk/wsas/java/carbon/samples/MEX/run-client.bat URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/MEX/run-client.bat?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/MEX/run-client.bat (original) +++ trunk/wsas/java/carbon/samples/MEX/run-client.bat Tue Nov 25 10:50:46 2008 @@ -68,7 +68,7 @@ rem loop through the libs and add them to the class path cd %WSO2WSAS_HOME%\samples\MEX set CLIENT_CLASSPATH=.\conf;.\tmp\classes -FOR %%C in (..\..\lib\*.jar) DO set CLIENT_CLASSPATH=!CLIENT_CLASSPATH!;..\..\lib\%%~nC%%~xC +FOR %%C in (..\..\repository\lib\*.jar) DO set CLIENT_CLASSPATH=!CLIENT_CLASSPATH!;..\..\repository\lib\%%~nC%%~xC rem ----- Execute The Requested Command --------------------------------------- echo Using WSO2WSAS_HOME: %WSO2WSAS_HOME% Modified: trunk/wsas/java/carbon/samples/MEX/run-client.sh URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/MEX/run-client.sh?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/MEX/run-client.sh (original) +++ trunk/wsas/java/carbon/samples/MEX/run-client.sh Tue Nov 25 10:50:46 2008 @@ -65,7 +65,7 @@ # update classpath CLIENT_CLASSPATH="" -for f in "$WSO2WSAS_HOME"/lib/*.jar +for f in "$WSO2WSAS_HOME"/repository/lib/*.jar do CLIENT_CLASSPATH=$CLIENT_CLASSPATH:$f done Modified: trunk/wsas/java/carbon/samples/MTOM/build.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/MTOM/build.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/MTOM/build.xml (original) +++ trunk/wsas/java/carbon/samples/MTOM/build.xml Tue Nov 25 10:50:46 2008 @@ -17,7 +17,8 @@ <project default="build-all"> <property name="wso2wsas.home" value="../../"/> - <property name="lib" value="${wso2wsas.home}/lib"/> + <property name="carbon.home" value="${wso2wsas.home}"/> + <property name="wsas.lib" value="${wso2wsas.home}/lib"/> <property name="repo.location" value="${wso2wsas.home}/repository"/> <property name="temp.dir" value="temp"/> <property name="classes" value="${temp.dir}/classes"/> @@ -25,10 +26,12 @@ <property name="gen.src" value="target/generated/src"/> <property name="services" value="services"/> + <ant antfile="${wso2wsas.home}/bin/build.xml"/> + <path id="axis2.class.path"> <pathelement path="${java.class.path}"/> <fileset dir="${wso2wsas.home}"> - <include name="lib/*.jar"/> + <include name="repository/lib/*.jar"/> </fileset> </path> @@ -46,7 +49,7 @@ </target> <target name="generate-source" depends="init"> - <java classname="org.wso2.utils.codegen.CodegenHelper" fork="true"> + <java classname="org.wso2.carbon.utils.codegen.CodegenHelper" fork="true"> <arg value="./conf/codegen.xml"/> <classpath refid="axis2.class.path"/> </java> @@ -99,4 +102,4 @@ </fileset> </copy> </target> -</project> \ No newline at end of file +</project> Modified: trunk/wsas/java/carbon/samples/MTOM/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/MTOM/pom.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/MTOM/pom.xml (original) +++ trunk/wsas/java/carbon/samples/MTOM/pom.xml Tue Nov 25 10:50:46 2008 @@ -53,7 +53,7 @@ <phase>generate-sources</phase> <configuration> <tasks> - <java classname="org.wso2.utils.codegen.CodegenHelper" + <java classname="org.wso2.carbon.utils.codegen.CodegenHelper" fork="true"> <arg value="./conf/codegen.xml"/> <classpath refid="maven.dependency.classpath"/> @@ -124,6 +124,54 @@ </plugins> </build> + <dependencies> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.core</artifactId> + <version>SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.utils</artifactId> + <version>SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.rm</artifactId> + <version>SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.security.mgt</artifactId> + <version>SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.axis2</artifactId> + <version>1.4.1-wso2</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.wss4j</artifactId> + <version>1.5.4</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.security.rampart</artifactId> + <version>SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.axiom</artifactId> + <version>1.2.7</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + <version>3.2.5.ga</version> + </dependency> + </dependencies> + <reporting> <plugins> <plugin> Modified: trunk/wsas/java/carbon/samples/MTOM/run-client.bat URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/MTOM/run-client.bat?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/MTOM/run-client.bat (original) +++ trunk/wsas/java/carbon/samples/MTOM/run-client.bat Tue Nov 25 10:50:46 2008 @@ -68,7 +68,7 @@ rem loop through the libs and add them to the class path cd %WSO2WSAS_HOME%\samples\MTOM set CLIENT_CLASSPATH=.\conf;.\temp\classes -FOR %%C in (..\..\lib\*.jar) DO set CLIENT_CLASSPATH=!CLIENT_CLASSPATH!;..\..\lib\%%~nC%%~xC +FOR %%C in (..\..\repository\lib\*.jar) DO set CLIENT_CLASSPATH=!CLIENT_CLASSPATH!;..\..\repository\lib\%%~nC%%~xC rem ----- Execute The Requested Command --------------------------------------- echo Using WSO2WSAS_HOME: %WSO2WSAS_HOME% Modified: trunk/wsas/java/carbon/samples/MTOM/run-client.sh URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/MTOM/run-client.sh?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/MTOM/run-client.sh (original) +++ trunk/wsas/java/carbon/samples/MTOM/run-client.sh Tue Nov 25 10:50:46 2008 @@ -65,7 +65,7 @@ # update classpath CLIENT_CLASSPATH="" -for f in "$WSO2WSAS_HOME"/lib/*.jar +for f in "$WSO2WSAS_HOME"/repository/lib/*.jar do CLIENT_CLASSPATH=$CLIENT_CLASSPATH:$f done Modified: trunk/wsas/java/carbon/samples/MTOM/src/org/wso2/wsas/sample/mtom/client/Client.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/MTOM/src/org/wso2/wsas/sample/mtom/client/Client.java?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/MTOM/src/org/wso2/wsas/sample/mtom/client/Client.java (original) +++ trunk/wsas/java/carbon/samples/MTOM/src/org/wso2/wsas/sample/mtom/client/Client.java Tue Nov 25 10:50:46 2008 @@ -24,7 +24,7 @@ import org.apache.axis2.util.CommandLineOptionParser; import org.apache.axis2.util.OptionsValidator; import org.w3.www._2005._05.xmlmime.Base64Binary; -import org.wso2.utils.NetworkUtils; +import org.wso2.carbon.utils.NetworkUtils; import javax.activation.DataHandler; import javax.activation.FileDataSource; @@ -78,7 +78,7 @@ // TCPMON. Please look at http://ws.apache.org/commons/tcpmon/tcpmontutorial.html // to learn how to setup tcpmon MTOMSampleStub stub = new MTOMSampleStub( - "http://"; + NetworkUtils.getLocalHostname() + ":9762/services/MTOMSample"); + "http://"; + NetworkUtils.getLocalHostname() + ":9763/services/MTOMSample"); // Enable MTOM in the client side stub._getServiceClient().getOptions() Modified: trunk/wsas/java/carbon/samples/MTOM/src/org/wso2/wsas/sample/mtom/services/MTOMService.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/MTOM/src/org/wso2/wsas/sample/mtom/services/MTOMService.java?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/MTOM/src/org/wso2/wsas/sample/mtom/services/MTOMService.java (original) +++ trunk/wsas/java/carbon/samples/MTOM/src/org/wso2/wsas/sample/mtom/services/MTOMService.java Tue Nov 25 10:50:46 2008 @@ -23,7 +23,7 @@ import org.apache.ws.axis2.mtomsample.AttachmentResponse; import org.apache.ws.axis2.mtomsample.AttachmentType; import org.w3.www._2005._05.xmlmime.Base64Binary; -import org.wso2.wsas.ServerConstants; +import org.wso2.carbon.CarbonConstants; import javax.activation.DataHandler; import java.io.File; @@ -47,7 +47,7 @@ */ public String attachment(String fileName, Base64Binary binaryData) { String mtomWriteDirString = - System.getProperty(ServerConstants.WSO2WSAS_HOME) + File.separator + + System.getProperty("wso2wsas.home") + File.separator + "tmp" + File.separator + "mtom" + File.separator; File mtomWriteDir = new File(mtomWriteDirString); mtomWriteDir.mkdirs(); Modified: trunk/wsas/java/carbon/samples/TinyURL/src/org/wso2/wsas/sample/tinyurl/TUrl.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/TinyURL/src/org/wso2/wsas/sample/tinyurl/TUrl.java?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/TinyURL/src/org/wso2/wsas/sample/tinyurl/TUrl.java (original) +++ trunk/wsas/java/carbon/samples/TinyURL/src/org/wso2/wsas/sample/tinyurl/TUrl.java Tue Nov 25 10:50:46 2008 @@ -113,7 +113,7 @@ } private static String getUrlPage(String id, String hostUrl) { - String url = hostUrl + "/go?id=" + id; + String url = hostUrl + "go?id=" + id; return "<html><h2>The short URL is : </h2><a href=\"" + url + "\">" + url + "</a></html>"; } Modified: trunk/wsas/java/carbon/samples/XKMS/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/XKMS/pom.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/XKMS/pom.xml (original) +++ trunk/wsas/java/carbon/samples/XKMS/pom.xml Tue Nov 25 10:50:46 2008 @@ -31,7 +31,7 @@ <dependency> <groupId>org.wso2.xkms</groupId> <artifactId>xkms</artifactId> - <version>${xkms.version}</version> + <version>2.2</version> <type>jar</type> </dependency> </dependencies> Modified: trunk/wsas/java/carbon/samples/Xfer/build.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Xfer/build.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Xfer/build.xml (original) +++ trunk/wsas/java/carbon/samples/Xfer/build.xml Tue Nov 25 10:50:46 2008 @@ -8,10 +8,12 @@ <property name="src" value="src" /> <property name="services" value="services" /> - <path id="axis2.class.path"> + <ant antfile="${wso2wsas.home}/bin/build.xml"/> + + <path id="axis2.class.path"> <pathelement path="${java.class.path}" /> <fileset dir="${wso2wsas.home}"> - <include name="lib/*.jar" /> + <include name="repository/lib/*.jar" /> </fileset> </path> Modified: trunk/wsas/java/carbon/samples/Xfer/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Xfer/pom.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Xfer/pom.xml (original) +++ trunk/wsas/java/carbon/samples/Xfer/pom.xml Tue Nov 25 10:50:46 2008 @@ -31,13 +31,13 @@ <dependency> <groupId>org.wso2.xfer</groupId> <artifactId>wso2xfer</artifactId> - <version>${wso2xfer.version}</version> + <version>2.2</version> <type>mar</type> </dependency> <dependency> <groupId>org.wso2.xfer</groupId> <artifactId>wso2xfer</artifactId> - <version>${wso2xfer.version}</version> + <version>2.2</version> <type>jar</type> </dependency> </dependencies> Modified: trunk/wsas/java/carbon/samples/Xfer/run-client.bat URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Xfer/run-client.bat?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Xfer/run-client.bat (original) +++ trunk/wsas/java/carbon/samples/Xfer/run-client.bat Tue Nov 25 10:50:46 2008 @@ -68,7 +68,7 @@ rem loop through the libs and add them to the class path cd %WSO2WSAS_HOME%\samples\xfer-sample set CLIENT_CLASSPATH=.\conf;.\tmp\classes -FOR %%C in (..\..\lib\*.jar) DO set CLIENT_CLASSPATH=!CLIENT_CLASSPATH!;..\..\lib\%%~nC%%~xC +FOR %%C in (..\..\repository\lib\*.jar) DO set CLIENT_CLASSPATH=!CLIENT_CLASSPATH!;..\..\repository\lib\%%~nC%%~xC rem ----- Execute The Requested Command --------------------------------------- echo Using WSO2WSAS_HOME: %WSO2WSAS_HOME% Modified: trunk/wsas/java/carbon/samples/Xfer/run-client.sh URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Xfer/run-client.sh?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Xfer/run-client.sh (original) +++ trunk/wsas/java/carbon/samples/Xfer/run-client.sh Tue Nov 25 10:50:46 2008 @@ -65,7 +65,7 @@ # update classpath CLIENT_CLASSPATH="" -for f in "$WSO2WSAS_HOME"/lib/*.jar +for f in "$WSO2WSAS_HOME"/repository/lib/*.jar do CLIENT_CLASSPATH=$CLIENT_CLASSPATH:$f done Modified: trunk/wsas/java/carbon/samples/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/pom.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/pom.xml (original) +++ trunk/wsas/java/carbon/samples/pom.xml Tue Nov 25 10:50:46 2008 @@ -62,15 +62,15 @@ <module>Trader</module> <module>FlickrClient</module> <module>DataService</module> - <!--<module>NodeManagement</module>--> - <!--<module>MEX</module>--> - <!--<module>MTOM</module>--> - <!--<module>XKMS</module>--> - <!--<module>Xfer</module>--> - <!--<module>sts-sample</module>--> + <module>NodeManagement</module> + <module>MEX</module> + <module>MTOM</module> + <module>XKMS</module> + <module>Xfer</module> + <module>sts-sample</module> <module>EJBService</module> <module>JAXWS</module> - <!--<module>Jibx</module>--> + <module>Jibx</module> <module>HelloWorld</module> </modules> </project> Modified: trunk/wsas/java/carbon/samples/sts-sample/build.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/sts-sample/build.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/sts-sample/build.xml (original) +++ trunk/wsas/java/carbon/samples/sts-sample/build.xml Tue Nov 25 10:50:46 2008 @@ -20,8 +20,10 @@ <property name="dir.wso2wsas" value="../../"/> <property name="dir.src" value="src"/> <property name="dir.classes" value="temp/classes"/> - <property name="dir.libs" value="${dir.wso2wsas}/lib/"/> + <property name="dir.libs" value="${dir.wso2wsas}/repository/lib/"/> <property name="dir.client.repo" value="temp/client-repo"/> + + <ant antfile="${dir.wso2wsas}/bin/build.xml"/> <path id="classpath.libraries"> <fileset dir="${dir.libs}"> Modified: trunk/wsas/java/carbon/samples/sts-sample/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/sts-sample/pom.xml?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/sts-sample/pom.xml (original) +++ trunk/wsas/java/carbon/samples/sts-sample/pom.xml Tue Nov 25 10:50:46 2008 @@ -77,6 +77,54 @@ </plugins> </build> + <dependencies> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.core</artifactId> + <version>SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.utils</artifactId> + <version>SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.rm</artifactId> + <version>SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.security.mgt</artifactId> + <version>SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.axis2</artifactId> + <version>1.4.1-wso2</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.wss4j</artifactId> + <version>1.5.4</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.security.rampart</artifactId> + <version>SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.axiom</artifactId> + <version>1.2.7</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + <version>3.2.5.ga</version> + </dependency> + </dependencies> + <reporting> <plugins> <plugin> Modified: trunk/wsas/java/carbon/samples/sts-sample/run-client.bat URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/sts-sample/run-client.bat?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/sts-sample/run-client.bat (original) +++ trunk/wsas/java/carbon/samples/sts-sample/run-client.bat Tue Nov 25 10:50:46 2008 @@ -68,7 +68,7 @@ rem loop through the libs and add them to the class path cd %WSO2WSAS_HOME% set CLIENT_CLASSPATH=.\samples\sts-sample\conf;.\samples\sts-sample\temp\classes -FOR %%C in (.\lib\*.jar) DO set CLIENT_CLASSPATH=!CLIENT_CLASSPATH!;.\lib\%%~nC%%~xC +FOR %%C in (.\repository\lib\*.jar) DO set CLIENT_CLASSPATH=!CLIENT_CLASSPATH!;.\repository\lib\%%~nC%%~xC rem ----- Execute The Requested Command --------------------------------------- echo Using WSO2WSAS_HOME: %WSO2WSAS_HOME% Modified: trunk/wsas/java/carbon/samples/sts-sample/run-client.sh URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/sts-sample/run-client.sh?rev=24860&r1=24859&r2=24860&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/sts-sample/run-client.sh (original) +++ trunk/wsas/java/carbon/samples/sts-sample/run-client.sh Tue Nov 25 10:50:46 2008 @@ -65,7 +65,7 @@ # update classpath CLIENT_CLASSPATH="" -for f in "$WSO2WSAS_HOME"/lib/*.jar +for f in "$WSO2WSAS_HOME"/repository/lib/*.jar do CLIENT_CLASSPATH=$CLIENT_CLASSPATH:$f done _______________________________________________ Wsas-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
