Author: isuru Date: Tue Nov 18 18:10:16 2008 New Revision: 24172 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=24172
Log: Fixing samples Modified: trunk/wsas/java/carbon/samples/Chad/build.xml trunk/wsas/java/carbon/samples/Chad/pom.xml trunk/wsas/java/carbon/samples/Chad/src/org/wso2/wsas/sample/chad/Chad.java trunk/wsas/java/carbon/samples/DataService/build.xml trunk/wsas/java/carbon/samples/DataService/pom.xml trunk/wsas/java/carbon/samples/EJBService/build.xml trunk/wsas/java/carbon/samples/EJBService/pom.xml trunk/wsas/java/carbon/samples/FlickrClient/build.xml trunk/wsas/java/carbon/samples/FlickrClient/pom.xml trunk/wsas/java/carbon/samples/FlickrClient/run-client.bat trunk/wsas/java/carbon/samples/FlickrClient/run-client.sh trunk/wsas/java/carbon/samples/JAXWS/build.xml trunk/wsas/java/carbon/samples/JAXWS/pom.xml trunk/wsas/java/carbon/samples/JavascriptService/pom.xml trunk/wsas/java/carbon/samples/TinyURL/build.xml trunk/wsas/java/carbon/samples/TinyURL/pom.xml trunk/wsas/java/carbon/samples/TinyURL/src/org/wso2/wsas/sample/tinyurl/TUrl.java trunk/wsas/java/carbon/samples/TinyURL/src/org/wso2/wsas/sample/tinyurl/TUrlSOAPClient.java trunk/wsas/java/carbon/samples/Trader/pom.xml trunk/wsas/java/carbon/samples/pom.xml 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=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Chad/build.xml (original) +++ trunk/wsas/java/carbon/samples/Chad/build.xml Tue Nov 18 18:10:16 2008 @@ -17,17 +17,20 @@ <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"/> <property name="src" value="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> 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=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Chad/pom.xml (original) +++ trunk/wsas/java/carbon/samples/Chad/pom.xml Tue Nov 18 18:10:16 2008 @@ -77,6 +77,44 @@ </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</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> + </dependencies> + <reporting> <plugins> <plugin> Modified: trunk/wsas/java/carbon/samples/Chad/src/org/wso2/wsas/sample/chad/Chad.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Chad/src/org/wso2/wsas/sample/chad/Chad.java?rev=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Chad/src/org/wso2/wsas/sample/chad/Chad.java (original) +++ trunk/wsas/java/carbon/samples/Chad/src/org/wso2/wsas/sample/chad/Chad.java Tue Nov 18 18:10:16 2008 @@ -21,7 +21,6 @@ import org.apache.axis2.context.MessageContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.wsas.ServerConstants; import org.wso2.wsas.sample.chad.command.*; import org.wso2.wsas.sample.chad.data.*; @@ -39,6 +38,7 @@ private static final String LOGIN_MSG = "Access denied. " + "Only Administrators are authorized to carry out this operation.<br/><br/>" + "If you are an administrator, please login and retry."; + public static final String ADMIN_LOGGED_IN = "wso2wsas.admin.logged.in"; public Chad() { @@ -177,11 +177,11 @@ AdminUser adminUser = getAdminCmd.getAdminUser(); if (adminUser != null && adminUser.getPassword().equals(password)) { MessageContext.getCurrentMessageContext().getServiceGroupContext() - .setProperty(ServerConstants.ADMIN_LOGGED_IN, "true"); + .setProperty(Chad.ADMIN_LOGGED_IN, "true"); return true; } else { MessageContext.getCurrentMessageContext().getServiceGroupContext() - .setProperty(ServerConstants.ADMIN_LOGGED_IN, "false"); + .setProperty(Chad.ADMIN_LOGGED_IN, "false"); } } catch (CommmandExecutionException e) { log.error("Exception occurred while trying to login", e); @@ -245,7 +245,7 @@ public synchronized void logout() { MessageContext.getCurrentMessageContext().getServiceGroupContext() - .setProperty(ServerConstants.ADMIN_LOGGED_IN, "false"); + .setProperty(Chad.ADMIN_LOGGED_IN, "false"); } private void checkAuthentication() throws ChadAuthenticationException { @@ -256,7 +256,7 @@ private boolean isAuthenticated() { return "true".equals(MessageContext.getCurrentMessageContext() - .getServiceGroupContext().getProperty(ServerConstants.ADMIN_LOGGED_IN)); + .getServiceGroupContext().getProperty(Chad.ADMIN_LOGGED_IN)); } /** 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=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/DataService/build.xml (original) +++ trunk/wsas/java/carbon/samples/DataService/build.xml Tue Nov 18 18:10:16 2008 @@ -21,20 +21,25 @@ <property name="db.dir" value="database"/> <property name="src" value="src"/> <property name="classes" value="classes"/> - - <property name="userid" value="wso2wsas"/> + + <property name="carbon.home" value="${wsashome}"/> + <property name="wsas.lib" value="${wsashome}/lib"/> + + <property name="userid" value="wso2wsas"/> <property name="password" value="wso2wsas"/> <property name="dbURL" - value="jdbc:derby:${basedir}/${db.dir}/DATA_SERV_SAMP;create=true"/> - - <path id="all.jar.classpath"> - <fileset dir="${wsashome}/lib"> + value="jdbc:derby:${basedir}/${db.dir}/DATA_SERV_SAMP;create=true"/> + + <ant antfile="${wso2wsas.home}/bin/build.xml"/> + + <path id="all.jar.classpath"> + <fileset dir="${wsashome}/repository/lib"> <include name="**/*.jar"/> </fileset> </path> <path id="client.class.path"> - <fileset dir="${wsashome}/lib"> + <fileset dir="${wsashome}/repository/lib"> y <include name="**/*.jar" /> </fileset> <pathelement location="${classes}" /> Modified: trunk/wsas/java/carbon/samples/DataService/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/DataService/pom.xml?rev=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/DataService/pom.xml (original) +++ trunk/wsas/java/carbon/samples/DataService/pom.xml Tue Nov 18 18:10:16 2008 @@ -77,6 +77,44 @@ </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</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> + </dependencies> + <reporting> <plugins> <plugin> 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=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/EJBService/build.xml (original) +++ trunk/wsas/java/carbon/samples/EJBService/build.xml Tue Nov 18 18:10:16 2008 @@ -20,18 +20,22 @@ <property name="wsashome" value="../.."/> <property name="src" value="src"/> <property name="classes" value="classes"/> + <property name="carbon.home" value="${wsashome}"/> + <property name="wsas.lib" value="${wsashome}/lib"/> + + <ant antfile="${wso2wsas.home}/bin/build.xml"/> <target name="init"> <mkdir dir="${classes}"/> </target> <path id="all.jar.classpath"> - <fileset dir="${wsashome}/lib"> + <fileset dir="${wsashome}/repository/lib"> <include name="**/*.jar"/> </fileset> </path> <path id="client.class.path"> - <fileset dir="${wsashome}/lib"> + <fileset dir="${wsashome}/repository/lib"> <include name="**/*.jar" /> </fileset> <pathelement location="${classes}" /> Modified: trunk/wsas/java/carbon/samples/EJBService/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/EJBService/pom.xml?rev=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/EJBService/pom.xml (original) +++ trunk/wsas/java/carbon/samples/EJBService/pom.xml Tue Nov 18 18:10:16 2008 @@ -77,6 +77,44 @@ </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</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> + </dependencies> + <reporting> <plugins> <plugin> 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=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/FlickrClient/build.xml (original) +++ trunk/wsas/java/carbon/samples/FlickrClient/build.xml Tue Nov 18 18:10:16 2008 @@ -17,17 +17,20 @@ <project default="run"> <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"/> <property name="src" value="src"/> <property name="gen.src" value="target/generated/src"/> + <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/FlickrClient/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/FlickrClient/pom.xml?rev=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/FlickrClient/pom.xml (original) +++ trunk/wsas/java/carbon/samples/FlickrClient/pom.xml Tue Nov 18 18:10:16 2008 @@ -52,7 +52,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"/> @@ -121,6 +121,44 @@ </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</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> + </dependencies> + <reporting> <plugins> <plugin> Modified: trunk/wsas/java/carbon/samples/FlickrClient/run-client.bat URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/FlickrClient/run-client.bat?rev=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/FlickrClient/run-client.bat (original) +++ trunk/wsas/java/carbon/samples/FlickrClient/run-client.bat Tue Nov 18 18:10:16 2008 @@ -68,7 +68,7 @@ rem loop through the libs and add them to the class path cd %WSO2WSAS_HOME% set CLIENT_CLASSPATH=.\samples\FlickrClient\conf;.\samples\FlickrClient\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/FlickrClient/run-client.sh URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/FlickrClient/run-client.sh?rev=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/FlickrClient/run-client.sh (original) +++ trunk/wsas/java/carbon/samples/FlickrClient/run-client.sh Tue Nov 18 18:10:16 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/JAXWS/build.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/JAXWS/build.xml?rev=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/JAXWS/build.xml (original) +++ trunk/wsas/java/carbon/samples/JAXWS/build.xml Tue Nov 18 18:10:16 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"/> @@ -31,10 +32,12 @@ <property name="generated.classes.dir" value="${generated.dir}/classes"/> <property name="gen.src" value="target/generated/src"/> + <ant antfile="${wso2wsas.home}/bin/build.xml"/> + <path id="wsas.class.path"> <pathelement path="${java.class.path}"/> <fileset dir="${wso2wsas.home}"> - <include name="lib/*.jar"/> + <include name="repository/lib/*.jar"/> </fileset> <fileset dir="."> <include name="target/*.jar"/> Modified: trunk/wsas/java/carbon/samples/JAXWS/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/JAXWS/pom.xml?rev=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/JAXWS/pom.xml (original) +++ trunk/wsas/java/carbon/samples/JAXWS/pom.xml Tue Nov 18 18:10:16 2008 @@ -51,7 +51,7 @@ <phase>generate-sources</phase> <configuration> <tasks> - <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="maven.dependency.classpath"/> <classpath refid="maven.compile.classpath"/> @@ -94,4 +94,42 @@ </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</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> + </dependencies> </project> Modified: trunk/wsas/java/carbon/samples/JavascriptService/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/JavascriptService/pom.xml?rev=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/JavascriptService/pom.xml (original) +++ trunk/wsas/java/carbon/samples/JavascriptService/pom.xml Tue Nov 18 18:10:16 2008 @@ -77,6 +77,44 @@ </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</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> + </dependencies> + <reporting> <plugins> <plugin> Modified: trunk/wsas/java/carbon/samples/TinyURL/build.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/TinyURL/build.xml?rev=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/TinyURL/build.xml (original) +++ trunk/wsas/java/carbon/samples/TinyURL/build.xml Tue Nov 18 18:10:16 2008 @@ -17,7 +17,8 @@ <project default="build-all" basedir="."> <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="src.dir" value="src"/> @@ -26,10 +27,12 @@ <property name="services.dir" value="services"/> <property name="META-INF.dir" value="${temp.dir}/${TinyUrl.dir}/META-INF"/> + <ant antfile="${wso2wsas.home}/bin/build.xml"/> + <path id="turl.classpath"> <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/TinyURL/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/TinyURL/pom.xml?rev=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/TinyURL/pom.xml (original) +++ trunk/wsas/java/carbon/samples/TinyURL/pom.xml Tue Nov 18 18:10:16 2008 @@ -77,6 +77,44 @@ </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</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> + </dependencies> + <reporting> <plugins> <plugin> 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=24172&r1=24171&r2=24172&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 18 18:10:16 2008 @@ -19,7 +19,6 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.context.MessageContext; -import org.wso2.wsas.ServerConstants; import java.security.SecureRandom; import java.util.Hashtable; @@ -39,6 +38,8 @@ */ public final static String ID_TABLE = "local_idTable"; + public static final String HTTP_TRANSPORT = "http"; + public final static int ERR_INVALID_REQ = 0; public final static int ERR_NO_URL = 1; @@ -77,7 +78,7 @@ idTable.put(id, url); } - EndpointReference myEPR = msgCtx.getServiceContext().getMyEPR(ServerConstants.HTTP_TRANSPORT); + EndpointReference myEPR = msgCtx.getServiceContext().getMyEPR(TUrl.HTTP_TRANSPORT); if (myEPR == null) { myEPR = msgCtx.getServiceContext().getMyEPR(); } Modified: trunk/wsas/java/carbon/samples/TinyURL/src/org/wso2/wsas/sample/tinyurl/TUrlSOAPClient.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/TinyURL/src/org/wso2/wsas/sample/tinyurl/TUrlSOAPClient.java?rev=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/TinyURL/src/org/wso2/wsas/sample/tinyurl/TUrlSOAPClient.java (original) +++ trunk/wsas/java/carbon/samples/TinyURL/src/org/wso2/wsas/sample/tinyurl/TUrlSOAPClient.java Tue Nov 18 18:10:16 2008 @@ -21,7 +21,6 @@ import org.apache.axiom.om.OMFactory; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.client.ServiceClient; -import org.wso2.wsas.ServerConstants; /** * SOAP Client to add urls to the TUrl service. @@ -31,7 +30,7 @@ /** * Hard coded endpoint address */ - public final static String EPR = "http://localhost:9762/"; + ServerConstants.SERVICE_PATH + "/TUrl"; + public final static String EPR = "http://localhost:9763/services/TUrl";; public static String addUrl(String url) throws Exception { Modified: trunk/wsas/java/carbon/samples/Trader/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Trader/pom.xml?rev=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Trader/pom.xml (original) +++ trunk/wsas/java/carbon/samples/Trader/pom.xml Tue Nov 18 18:10:16 2008 @@ -121,6 +121,44 @@ </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</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> + </dependencies> + <reporting> <plugins> <plugin> Modified: trunk/wsas/java/carbon/samples/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/pom.xml?rev=24172&r1=24171&r2=24172&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/pom.xml (original) +++ trunk/wsas/java/carbon/samples/pom.xml Tue Nov 18 18:10:16 2008 @@ -56,25 +56,22 @@ </reporting> <modules> -<!-- <module>Chad</module> <module>CommodityQuote</module> - <module>JavascriptService</module> + <!--<module>JavascriptService</module>--> <module>TinyURL</module> <module>Trader</module> - <module>FlickrClient</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>CommodityQuote</module> + <!--<module>Jibx</module>--> <module>HelloWorld</module> </modules> </project> _______________________________________________ Wsas-java-dev mailing list [email protected] http://mailman.wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
