[wsas-java-dev] svn commit r426 - in wsas/java/trunk: . modules/core/src/org/wso2/wsas modules/integration modules/integration/test/org/wso2/codegen/service/ajax modules/samples

[svn at wso2.com]

Author: saminda
Date: Mon Jan 15 06:42:06 2007
New Revision: 426

Modified:
   wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java
   wsas/java/trunk/modules/integration/pom.xml
   wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/ajax/AjaxClientGeneratorServiceTest.java
   wsas/java/trunk/modules/samples/pom.xml
   wsas/java/trunk/pom.xml
Log:
Fixing all the testcases 


Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java	(original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java	Mon Jan 15 06:42:06 2007
@@ -116,7 +116,7 @@
             //Setting the codegen configuration properties for try it! functionality
             //TODO Change this to proper one once Maven2 build is fixed. 
             System.setProperty("org.apache.axis2.codegen.config",
-                               "/org/wso2/wsf/common/codegen/config/codegen-config.properties");
+                               "/codegen-config.properties");
 
             ServerConfigurator tunstenConfigurator =
                     new ServerConfigurator(axis2RepoLocation,

Modified: wsas/java/trunk/modules/integration/pom.xml
==============================================================================
--- wsas/java/trunk/modules/integration/pom.xml	(original)
+++ wsas/java/trunk/modules/integration/pom.xml	Mon Jan 15 06:42:06 2007
@@ -72,14 +72,6 @@
             <type>test-jar</type>
         </dependency>
 
-         <!-- Codegen jar -->
-        <dependency>
-            <groupId>org.wso2.codegen</groupId>
-            <artifactId>wso2codegen</artifactId>
-            <version>${wso2codegen.version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <!-- System dependency -->
         <dependency>
             <groupId>sun.jdk</groupId>

Modified: wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/ajax/AjaxClientGeneratorServiceTest.java
==============================================================================
--- wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/ajax/AjaxClientGeneratorServiceTest.java	(original)
+++ wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/ajax/AjaxClientGeneratorServiceTest.java	Mon Jan 15 06:42:06 2007
@@ -43,7 +43,7 @@
                                       new Hashtable());
 
             System.setProperty("org.apache.axis2.codegen.config",
-                               "/org/wso2/wsf/common/codegen/config/codegen-config.properties");
+                               "/codegen-config.properties");
             ConfigPropertyFileLoader.reload();
 
             ServerUtils.deployService(configContext,

Modified: wsas/java/trunk/modules/samples/pom.xml
==============================================================================
--- wsas/java/trunk/modules/samples/pom.xml	(original)
+++ wsas/java/trunk/modules/samples/pom.xml	Mon Jan 15 06:42:06 2007
@@ -43,6 +43,7 @@
             </plugin>
 
             <plugin>
+                <inherited>false</inherited>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>

Modified: wsas/java/trunk/pom.xml
==============================================================================
--- wsas/java/trunk/pom.xml	(original)
+++ wsas/java/trunk/pom.xml	Mon Jan 15 06:42:06 2007
@@ -271,6 +271,14 @@
             <version>${wso2codegen.version}</version>
             <type>aar</type>
         </dependency>
+        <!-- Codegen jar -->
+        <dependency>
+            <groupId>org.wso2.codegen</groupId>
+            <artifactId>wso2codegen</artifactId>
+            <version>${wso2codegen.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.wso2.mex</groupId>
             <artifactId>wso2mex</artifactId>
@@ -526,7 +534,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit.version}</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>