[wsas-java-dev] svn commit r297 - in wsas/java/trunk: .
modules/core/src/org/wso2/wsas
modules/distribution/common/src/assemble
modules/distribution/standalone
modules/distribution/webapp/src/assemble
svn at wso2.com
svn at wso2.com
Mon Jan 1 20:11:35 PST 2007
Author: saminda
Date: Mon Jan 1 20:11:34 2007
New Revision: 297
Modified:
wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java
wsas/java/trunk/modules/distribution/common/src/assemble/dist-common-assembly.xml
wsas/java/trunk/modules/distribution/standalone/pom.xml
wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml
wsas/java/trunk/pom.xml
Log:
Updates according to assemblies
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 1 20:11:34 2007
@@ -114,6 +114,7 @@
initLoggingConfiguration();
//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");
Modified: wsas/java/trunk/modules/distribution/common/src/assemble/dist-common-assembly.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/common/src/assemble/dist-common-assembly.xml (original)
+++ wsas/java/trunk/modules/distribution/common/src/assemble/dist-common-assembly.xml Mon Jan 1 20:11:34 2007
@@ -29,6 +29,7 @@
<exclude>org.wso2.wsf:wso2wsf-statistics:mar</exclude>
<exclude>org.wso2.wsf:wso2wsf-throttle:mar</exclude>
<exclude>org.wso2.wsf:wso2wsf-tracer:mar</exclude>
+ <exclude>org.wso2.wsf:wso2wsf-codegen:aar</exclude>
<exclude>org.apache.axis2:addressing:mar</exclude>
<exclude>org.apache.axis2:rampart:mar</exclude>
<exclude>org.apache.axis2:rahas:mar</exclude>
@@ -51,6 +52,12 @@
</includes>
</dependencySet>
<dependencySet>
+ <outputDirectory>${dist.temp.assembly.bin.dir}/repository/services</outputDirectory>
+ <includes>
+ <include>org.wso2.wsf:wso2wsf-codegen:aar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
<outputDirectory>${dist.temp.assembly.bin.dir}/lib/endorsed</outputDirectory>
<includes>
<include>xerces:xml-apis:jar</include>
Modified: wsas/java/trunk/modules/distribution/standalone/pom.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/standalone/pom.xml (original)
+++ wsas/java/trunk/modules/distribution/standalone/pom.xml Mon Jan 1 20:11:34 2007
@@ -37,9 +37,20 @@
<!-- Creating the distribution -->
<!-- TODO Copy the correct sample properties files -->
<mkdir dir="target"/>
+ <mkdir dir="${dist.temp.dir}/samples/CommodityQuote/conf"/>
+ <mkdir dir="${dist.temp.dir}/samples/Trader/conf"/>
+ <mkdir dir="${dist.temp.dir}/samples/JavascriptService/conf"/>
+ <!-- Copy the sample default_epr.properties file -->
+ <copy todir="${dist.temp.dir}/samples/CommodityQuote/conf/"
+ file="../../samples/CommodityQuote/conf/default_epr.properties" overwrite="true"/>
+ <copy todir="${dist.temp.dir}/samples/Trader/conf/"
+ file="../../samples/Trader/conf/default_epr.properties" overwrite="true"/>
+ <copy todir="${dist.temp.dir}/samples/JavascriptService/conf/"
+ file="../../samples/JavascriptService/conf/default_epr.properties" overwrite="true"/>
<zip destfile="target/wso2wsas-standalone-edition-java-${wso2wsas.version}.zip">
<fileset dir="../common/target/dist/temp"/>
<fileset dir="../common/target/dist-bin/temp"/>
+ <fileset dir="target/dist/temp"/>
</zip>
</tasks>
</configuration>
Modified: wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml (original)
+++ wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml Mon Jan 1 20:11:34 2007
@@ -78,13 +78,14 @@
<exclude>org.wso2.wsf:wso2wsf-statistics:mar</exclude>
<exclude>org.wso2.wsf:wso2wsf-throttle:mar</exclude>
<exclude>org.wso2.wsf:wso2wsf-tracer:mar</exclude>
+ <exclude>org.wso2.wsf:wso2wsf-codegen:aar</exclude>
<exclude>org.apache.axis2:addressing:mar</exclude>
<exclude>org.apache.axis2:rampart:mar</exclude>
<exclude>org.apache.axis2:rahas:mar</exclude>
<exclude>org.apache.sandesha2:sandesha2:mar</exclude>
<exclude>org.wso2.adminui:wso2-adminui-zip:zip</exclude>
<exclude>org.wso2.adminui:wso2-adminui-graphs-zip:zip</exclude>
- <exclude>servletapi:servletapi:jar</exclude>
+ <exclude>javax.servlet:servlet-api:jar</exclude>
<exclude>jetty:jetty:jar</exclude>
<exclude>jetty:jetty-util:jar</exclude>
<exclude>jetty:servlet-api-2.5:jar</exclude>
Modified: wsas/java/trunk/pom.xml
==============================================================================
--- wsas/java/trunk/pom.xml (original)
+++ wsas/java/trunk/pom.xml Mon Jan 1 20:11:34 2007
@@ -135,31 +135,24 @@
<groupId>org.wso2.wsf</groupId>
<artifactId>wso2wsf-core</artifactId>
<version>${wso2wsf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk13</artifactId>
- </exclusion>
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.wso2.wsf</groupId>
<artifactId>wso2wsf-tools</artifactId>
<version>${wso2wsf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk13</artifactId>
- </exclusion>
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </exclusion>
- </exclusions>
+ </dependency>
+ <!-- Codegen jar -->
+ <dependency>
+ <groupId>org.wso2.wsf</groupId>
+ <artifactId>wso2wsf-codegen</artifactId>
+ <version>${wso2wsf.version}</version>
+ </dependency>
+ <!-- Codegen aar -->
+ <dependency>
+ <groupId>org.wso2.wsf</groupId>
+ <artifactId>wso2wsf-codegen</artifactId>
+ <version>${wso2wsf.version}</version>
+ <type>aar</type>
</dependency>
<dependency>
<groupId>org.wso2.wsf</groupId>
@@ -167,39 +160,50 @@
<version>${wso2wsf.version}</version>
<type>mar</type>
</dependency>
+ <!-- Statistics mar-->
<dependency>
<groupId>org.wso2.wsf</groupId>
<artifactId>wso2wsf-statistics</artifactId>
<version>${wso2wsf.version}</version>
<type>mar</type>
</dependency>
+ <!-- Statistics Jar -->
+ <dependency>
+ <groupId>org.wso2.wsf</groupId>
+ <artifactId>wso2wsf-statistics</artifactId>
+ <version>${wso2wsf.version}</version>
+ </dependency>
+ <!-- Throttle mar -->
<dependency>
<groupId>org.wso2.wsf</groupId>
<artifactId>wso2wsf-throttle</artifactId>
<version>${wso2wsf.version}</version>
<type>mar</type>
</dependency>
+ <!-- Throttle aar only with testing scope-->
+ <dependency>
+ <groupId>org.wso2.wsf</groupId>
+ <artifactId>wso2wsf-throttle</artifactId>
+ <version>${wso2wsf.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.wso2.wsf</groupId>
<artifactId>wso2wsf-tracer</artifactId>
<version>${wso2wsf.version}</version>
<type>mar</type>
</dependency>
+ <!-- Tracer Jar -->
+ <dependency>
+ <groupId>org.wso2.wsf</groupId>
+ <artifactId>wso2wsf-tracer</artifactId>
+ <version>${wso2wsf.version}</version>
+ </dependency>
<dependency>
<groupId>org.wso2.wsf</groupId>
<artifactId>wso2wsf-core-test</artifactId>
<version>${wso2wsf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk13</artifactId>
- </exclusion>
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Axis2 Jars -->
@@ -441,8 +445,8 @@
<version>${backport.util.concurrent.version}</version>
</dependency>
<dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
<version>${servletapi.version}</version>
</dependency>
<!--<dependency>
@@ -579,6 +583,7 @@
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk13</artifactId>
<version>${bcprov.jdk13.version}</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
</profile>
@@ -593,6 +598,7 @@
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
<version>${bcprov.jdk15.version}</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
</profile>
More information about the Wsas-java-dev
mailing list