[wsas-java-dev] svn commit r715 - in wsas/java/trunk: .
modules/admin modules/admin/test/org/wso2/wsas/admin/service/logging
modules/core modules/core/test/org/wso2/wsas
modules/core/test/org/wso2/wsas/core
modules/core/test/org/wso2/wsas/util modules/integration
modules/standalone-edition
modules/standalone-edition/test/org/wso2/wsas
modules/standalone-edition/test/org/wso2/wsas/util
svn at wso2.com
svn at wso2.com
Mon Feb 5 01:18:54 PST 2007
Author: saminda
Date: Mon Feb 5 01:18:05 2007
New Revision: 715
Added:
wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/AbstractTestCase.java
- copied unchanged from r699, wsas/java/trunk/modules/core/test/org/wso2/wsas/AbstractTestCase.java
wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/EchoTest.java
- copied, changed from r699, wsas/java/trunk/modules/core/test/org/wso2/wsas/core/EchoTest.java
wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/TestConstants.java
- copied, changed from r699, wsas/java/trunk/modules/core/test/org/wso2/wsas/TestConstants.java
wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/util/
wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/util/Echo.java
- copied unchanged from r699, wsas/java/trunk/modules/core/test/org/wso2/wsas/util/Echo.java
wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/util/ServerUtils.java
- copied unchanged from r699, wsas/java/trunk/modules/core/test/org/wso2/wsas/util/ServerUtils.java
Removed:
wsas/java/trunk/modules/core/test/org/wso2/wsas/AbstractTestCase.java
wsas/java/trunk/modules/core/test/org/wso2/wsas/TestConstants.java
wsas/java/trunk/modules/core/test/org/wso2/wsas/core/
wsas/java/trunk/modules/core/test/org/wso2/wsas/util/Echo.java
wsas/java/trunk/modules/core/test/org/wso2/wsas/util/ServerUtils.java
Modified:
wsas/java/trunk/modules/admin/pom.xml
wsas/java/trunk/modules/admin/test/org/wso2/wsas/admin/service/logging/LoggingServiceIntegrationTest.java
wsas/java/trunk/modules/core/pom.xml
wsas/java/trunk/modules/integration/pom.xml
wsas/java/trunk/modules/standalone-edition/pom.xml
wsas/java/trunk/pom.xml
Log:
fixing testcase ; almost
Modified: wsas/java/trunk/modules/admin/pom.xml
==============================================================================
--- wsas/java/trunk/modules/admin/pom.xml (original)
+++ wsas/java/trunk/modules/admin/pom.xml Mon Feb 5 01:18:05 2007
@@ -23,6 +23,12 @@
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.wso2.wsas</groupId>
+ <artifactId>wso2wsas-standalone-edition</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<!-- System dependency -->
<dependency>
<groupId>sun.jdk</groupId>
@@ -39,6 +45,13 @@
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.wso2.wsas</groupId>
+ <artifactId>wso2wsas-standalone-edition</artifactId>
+ <version>${pom.version}</version>
+ <type>test-jar</type>
+ </dependency>
+
</dependencies>
<build>
Modified: wsas/java/trunk/modules/admin/test/org/wso2/wsas/admin/service/logging/LoggingServiceIntegrationTest.java
==============================================================================
--- wsas/java/trunk/modules/admin/test/org/wso2/wsas/admin/service/logging/LoggingServiceIntegrationTest.java (original)
+++ wsas/java/trunk/modules/admin/test/org/wso2/wsas/admin/service/logging/LoggingServiceIntegrationTest.java Mon Feb 5 01:18:05 2007
@@ -35,7 +35,7 @@
private QName logServiceName;
protected void setUp() throws Exception {
- ServerConfiguration.configurationXMLLocation = "../core/conf/server.xml";
+ ServerConfiguration.configurationXMLLocation = "../standalone-edition/conf/server.xml";
super.setUp();
logServiceName = new QName("LoggingService");
ServerUtils.deployService(getConfigContext(),
Modified: wsas/java/trunk/modules/core/pom.xml
==============================================================================
--- wsas/java/trunk/modules/core/pom.xml (original)
+++ wsas/java/trunk/modules/core/pom.xml Mon Feb 5 01:18:05 2007
@@ -44,6 +44,7 @@
<skip>false</skip>
<excludes>
<exclude>**/*Abstract*.java</exclude>
+ <exclude>**/*CryptoUtilTest*.java</exclude>
</excludes>
<includes>
<include>**/*Test.java</include>
Modified: wsas/java/trunk/modules/integration/pom.xml
==============================================================================
--- wsas/java/trunk/modules/integration/pom.xml (original)
+++ wsas/java/trunk/modules/integration/pom.xml Mon Feb 5 01:18:05 2007
@@ -37,6 +37,12 @@
<dependency>
<groupId>org.wso2.wsas</groupId>
+ <artifactId>wso2wsas-standalone-edition</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.wso2.wsas</groupId>
<artifactId>wso2wsas-samples-chad</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -72,6 +78,13 @@
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.wso2.wsas</groupId>
+ <artifactId>wso2wsas-standalone-edition</artifactId>
+ <version>${pom.version}</version>
+ <type>test-jar</type>
+ </dependency>
+
<!-- System dependency -->
<dependency>
<groupId>sun.jdk</groupId>
Modified: wsas/java/trunk/modules/standalone-edition/pom.xml
==============================================================================
--- wsas/java/trunk/modules/standalone-edition/pom.xml (original)
+++ wsas/java/trunk/modules/standalone-edition/pom.xml Mon Feb 5 01:18:05 2007
@@ -48,6 +48,79 @@
<target>1.4</target>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>process_repo</id>
+ <phase>generate-test-resources</phase>
+ <configuration>
+ <tasks>
+ <!-- 1. Generate keystore for wsas-->
+ <delete file="conf/wso2wsas.jks"/>
+ <genkey alias="wso2wsas" storepass="wso2wsas" keyalg="RSA"
+ keystore="conf/wso2wsas.jks"
+ validity="99999">
+ <dname>
+ <param name="CN" value="WSO2WSAS"/>
+ <param name="OU" value=""/>
+ <param name="O" value="WSO2"/>
+ <param name="C" value="LK"/>
+ </dname>
+ </genkey>
+
+ <!-- 2. Copying the repo -->
+ <copy todir="target/repository">
+ <fileset dir="../core/target/repository">
+ <include name="*/**"/>
+ </fileset>
+ </copy>
+
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>populate_repo</id>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <tasks>
+ <!-- 1. Processing Hibernate config and hbm xmls to test cases. Should find a
+ better way to do this.
+ -->
+ <mkdir dir="target/test-classes"/>
+ <copy todir="target/test-classes">
+ <fileset dir="../core/conf/hibernate"/>
+ </copy>
+ <move file="target/test-classes/test-hibernate.cfg.xml"
+ tofile="target/test-classes/wso2wsas.hibernate.cfg.xml"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
Copied: wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/EchoTest.java (from r699, wsas/java/trunk/modules/core/test/org/wso2/wsas/core/EchoTest.java)
==============================================================================
--- wsas/java/trunk/modules/core/test/org/wso2/wsas/core/EchoTest.java (original)
+++ wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/EchoTest.java Mon Feb 5 01:18:05 2007
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.wso2.wsas.core;
+package org.wso2.wsas;
import org.wso2.wsas.AbstractTestCase;
import org.wso2.wsas.TestConstants;
Copied: wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/TestConstants.java (from r699, wsas/java/trunk/modules/core/test/org/wso2/wsas/TestConstants.java)
==============================================================================
--- wsas/java/trunk/modules/core/test/org/wso2/wsas/TestConstants.java (original)
+++ wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/TestConstants.java Mon Feb 5 01:18:05 2007
@@ -21,9 +21,6 @@
public static final int TESTING_PORT = 9762;
public static final String TESTING_REPO = "target/repository";
- private TestConstants() {
- }
-
public static final QName ECHO_SERVICE_NAME = new QName("Echo");
public static final QName ECHO_OPERATION = new QName("echoOMElement");
}
Modified: wsas/java/trunk/pom.xml
==============================================================================
--- wsas/java/trunk/pom.xml (original)
+++ wsas/java/trunk/pom.xml Mon Feb 5 01:18:05 2007
@@ -857,8 +857,8 @@
<modules>
<module>modules/core</module>
- <module>modules/admin</module>
<module>modules/standalone-edition</module>
+ <module>modules/admin</module>
<module>modules/servlet-edition</module>
<module>modules/samples</module>
<module>modules/integration</module>
@@ -921,7 +921,7 @@
<xmlunit.version>1.0</xmlunit.version>
<log4j.version>1.2.13</log4j.version>
- <jakarta.httpcore.version>4.0-alpha2</jakarta.httpcore.version>
+ <jakarta.httpcore.version>4.0-alpha3</jakarta.httpcore.version>
<commons.collections.version>3.1</commons.collections.version>
<commons.discovery.version>0.2</commons.discovery.version>
More information about the Wsas-java-dev
mailing list