[wsas-java-dev] svn commit r335 - in wsas/java/trunk: .
modules/admin
modules/admin/src/org/wso2/wsas/admin/module/admin/META-INF
modules/admin/src/org/wso2/wsas/admin/service
modules/admin/src/org/wso2/wsas/admin/service/META-INF
modules/core/conf modules/core/src/org/wso2/wsas
modules/core/src/org/wso2/wsas/util modules/distribution/common
modules/distribution/common/src/assemble
modules/distribution/standalone modules/distribution/webapp
modules/integration modules/samples
modules/servlet-edition/conf modules/wsf-common-core
svn at wso2.com
svn at wso2.com
Fri Jan 5 05:38:38 PST 2007
Author: saminda
Date: Fri Jan 5 05:38:36 2007
New Revision: 335
Modified:
wsas/java/trunk/modules/admin/maven.xml
wsas/java/trunk/modules/admin/pom.xml
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/module/admin/META-INF/module.xml
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/META-INF/services.xml
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
wsas/java/trunk/modules/core/conf/axis2.xml
wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerConstants.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/util/TraceFilterImpl.java
wsas/java/trunk/modules/distribution/common/pom.xml
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/pom.xml
wsas/java/trunk/modules/integration/maven.xml
wsas/java/trunk/modules/integration/pom.xml
wsas/java/trunk/modules/samples/pom.xml
wsas/java/trunk/modules/servlet-edition/conf/axis2.xml
wsas/java/trunk/modules/wsf-common-core/maven.xml
wsas/java/trunk/pom.xml
Log:
distriubtion is complete
Modified: wsas/java/trunk/modules/admin/maven.xml
==============================================================================
--- wsas/java/trunk/modules/admin/maven.xml (original)
+++ wsas/java/trunk/modules/admin/maven.xml Fri Jan 5 05:38:36 2007
@@ -54,15 +54,15 @@
<copy file="../wsf-common-core/src/org/wso2/wsf/common/codegen/service/META-INF/JavaClientGeneratorService.wsdl"
tofile="target/toAdmin/service/META-INF/JavaClientGeneratorService.wsdl"/>
- <jar jarfile="target/WSO2WSASAdministration.aar" basedir="target/toAdmin/service">
+ <jar jarfile="target/wso2wsas-administration.aar" basedir="target/toAdmin/service">
<include name="**"/>
</jar>
- <jar jarfile="target/wso2wsas_admin-${wso2wsas.version}.mar"
+ <jar jarfile="target/wso2wsas-admin-${wso2wsas.version}.mar"
basedir="target/toAdmin/module">
<include name="**"/>
</jar>
- <copy file="target/wso2wsas_admin-${wso2wsas.version}.mar"
- tofile="${maven.repo.local}/org.wso2.wsas/mars/wso2wsas_admin-${wso2wsas.version}.mar"/>
+ <copy file="target/wso2wsas-admin-${wso2wsas.version}.mar"
+ tofile="${maven.repo.local}/org.wso2.wsas/mars/wso2wsas-admin-${wso2wsas.version}.mar"/>
<delete dir="target/toAdmin"/>
</goal>
@@ -71,12 +71,12 @@
<ant:copy todir="target/repository">
<ant:fileset file="../core/test-resources/axis2.xml"/>
</ant:copy>
- <copy file="target/wso2wsas_admin-${wso2wsas.version}.mar"
- tofile="target/repository/modules/wso2wsas_admin-${wso2wsas.version}.mar"/>
+ <copy file="target/wso2wsas-admin-${wso2wsas.version}.mar"
+ tofile="target/repository/modules/wso2wsas-admin-${wso2wsas.version}.mar"/>
<ant:copy todir="target/repository/modules">
<ant:fileset
file="${maven.repo.local}/org.apache.axis2/mars/addressing-${addressing.version}.mar"/>
- <ant:fileset file="target/wso2wsas_admin-${wso2wsas.version}.mar"/>
+ <ant:fileset file="target/wso2wsas-admin-${wso2wsas.version}.mar"/>
</ant:copy>
<ant:path id="core.test.classpath">
<ant:pathelement path="../core/target/test-classes"/>
Modified: wsas/java/trunk/modules/admin/pom.xml
==============================================================================
--- wsas/java/trunk/modules/admin/pom.xml (original)
+++ wsas/java/trunk/modules/admin/pom.xml Fri Jan 5 05:38:36 2007
@@ -169,11 +169,11 @@
<!--<copy file="../wsf-common-core/src/org/wso2/wsf/common/codegen/service/META-INF/JavaClientGeneratorService.wsdl"
tofile="target/toAdmin/service/META-INF/JavaClientGeneratorService.wsdl"/>-->
- <jar jarfile="target/WSO2WSASAdministration.aar"
+ <jar jarfile="target/wso2wsas-administration.aar"
basedir="target/toAdmin/service">
<include name="**"/>
</jar>
- <jar jarfile="target/wso2wsas_admin-${wso2wsas.version}.mar"
+ <jar jarfile="target/wso2wsas-admin-${wso2wsas.version}.mar"
basedir="target/toAdmin/module">
<include name="**"/>
</jar>
@@ -186,16 +186,16 @@
<copy todir="target/repository">
<fileset file="../core/test-resources/axis2.xml"/>
</copy>
- <copy file="target/wso2wsas_admin-${wso2wsas.version}.mar"
- tofile="target/repository/modules/wso2wsas_admin-${wso2wsas.version}.mar"/>
+ <copy file="target/wso2wsas-admin-${wso2wsas.version}.mar"
+ tofile="target/repository/modules/wso2wsas-admin-${wso2wsas.version}.mar"/>
<copy todir="target/repository/modules">
- <fileset file="target/wso2wsas_admin-${wso2wsas.version}.mar"/>
+ <fileset file="target/wso2wsas-admin-${wso2wsas.version}.mar"/>
</copy>
<copy tofile="target/test-classes/wso2wsas.hibernate.cfg.xml">
<fileset file="../core/conf/hibernate/test-hibernate.cfg.xml"/>
</copy>
-
+<!-- TODO Remove 2 and 3 when the Maven2 build is accoring to it standards. -->
</tasks>
</configuration>
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/module/admin/META-INF/module.xml
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/module/admin/META-INF/module.xml (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/module/admin/META-INF/module.xml Fri Jan 5 05:38:36 2007
@@ -1,4 +1,4 @@
-<module name="wso2wsas_admin" class="org.wso2.wsas.admin.module.admin.AdminModule">
+<module name="wso2wsas-admin" class="org.wso2.wsas.admin.module.admin.AdminModule">
<InFlow>
<handler name="AuthenticationHandler"
class="org.wso2.wsas.admin.module.admin.handler.AuthenticationHandler">
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/META-INF/services.xml
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/META-INF/services.xml (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/META-INF/services.xml Fri Jan 5 05:38:36 2007
@@ -2,7 +2,7 @@
<!--
Engage Admin module to all Admin Services
-->
- <module ref="wso2wsas_admin"/>
+ <module ref="wso2wsas-admin"/>
<service name="ServerAdmin" scope="soapsession">
<schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
@@ -75,42 +75,6 @@
org.wso2.wsas.admin.service.GlobalAdmin</parameter>
</service>
- <service name="TracerAdmin" scope="soapsession">
- <schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
- <transports>
- <transport>https</transport>
- </transports>
- <description>
- This service is used for adminstering the Tracer
- </description>
- <messageReceivers>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
- class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
- class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
- </messageReceivers>
- <parameter name="ServiceClass">
- org.wso2.wsf.common.tracer.service.TracerAdministrationService</parameter>
- </service>
-
- <service name="Statistics" scope="soapsession">
- <schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
- <transports>
- <transport>https</transport>
- </transports>
- <description>
- This service is used for retrieving statistics
- </description>
- <messageReceivers>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
- class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
- class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
- </messageReceivers>
- <parameter name="ServiceClass">
- org.wso2.wsf.common.statistics.service.StatisticsService</parameter>
- </service>
-
<service name="ServiceGroupAdmin" scope="soapsession">
<schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
<transports>
@@ -178,51 +142,6 @@
</messageReceivers>
<parameter name="ServiceClass">org.wso2.wsas.admin.service.ModuleAdmin</parameter>
</service>
- <!-- TODO -->
- <service name="WSDLInfoService" scope="soapsession">
- <schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
- <transports>
- <transport>https</transport>
- </transports>
- <description>
- This service will give WSDL binding information
- </description>
- <messageReceivers>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
- class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
- </messageReceivers>
- <parameter name="ServiceClass">
- org.wso2.wsf.common.codegen.service.WSDLInfoService</parameter>
- </service>
-
- <!-- TODO -->
-
- <service name="TracerService" scope="soapsession">
- <transports>
- <transport>https</transport>
- </transports>
- <messageReceivers>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
- class="org.wso2.wsf.common.tracer.service.TracerServiceMessageReceiverInOut"/>
- </messageReceivers>
- <parameter locked="false" name="ServiceClass">
- org.wso2.wsf.common.tracer.service.TracerService</parameter>
- </service>
- <!-- TODO -->
- <service name="JavaClientGeneratorService" scope="soapsession">
- <transports>
- <transport>https</transport>
- </transports>
- <messageReceivers>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
- class="org.wso2.wsf.common.codegen.service.java.JavaClientGeneratorServiceMessageReceiverInOut"/>
- </messageReceivers>
- <parameter locked="false" name="ServiceClass">
- org.wso2.wsf.common.codegen.service.java.JavaClientGeneratorService</parameter>
- <operation name="generate" mep="http://www.w3.org/2004/08/wsdl/in-out">
- <actionMapping>generate</actionMapping>
- </operation>
- </service>
<service name="LoggingService" scope="soapsession">
<transports>
@@ -239,22 +158,6 @@
<actionMapping>getLogs</actionMapping>
</operation>
</service>
- <!-- TODO -->
- <service name="AjaxClientGeneratorService" scope="soapsession">
- <transports>
- <transport>https</transport>
- </transports>
- <messageReceivers>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
- class="org.wso2.wsf.common.codegen.service.ajax.AjaxClientGeneratorServiceMessageReceiverInOut"/>
- </messageReceivers>
- <parameter locked="false" name="ServiceClass">
- org.wso2.wsf.common.codegen.service.ajax.AjaxClientGeneratorService</parameter>
- <operation name="generateAjaxClient"
- mep="http://www.w3.org/2004/08/wsdl/in-out">
- <actionMapping>generateAjaxClient</actionMapping>
- </operation>
- </service>
<service name="TransportAdmin" scope="soapsession">
<schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java Fri Jan 5 05:38:36 2007
@@ -61,9 +61,9 @@
* Admin service to manage operations related to modules
*/
public class ModuleAdmin extends AbstractAdmin {
- private static final String ADMIN_MODULE = "wso2wsas_admin";
- private static final String STATISTICS_MODULE = "statistics";
- private static final String TRACER_MODULE = "tracer";
+ private static final String ADMIN_MODULE = "wso2wsas-admin";
+ private static final String STATISTICS_MODULE = "wso2wsf-statistics";
+ private static final String TRACER_MODULE = "wso2wsf-tracer";
private static final QName RAHAS_QN = new QName("rahas");
private static final QName RAMPART_QN = new QName("rampart");
@@ -331,7 +331,7 @@
log.warn("Module " + moduleId + " not found in database");
}
- // We should not engage the throttle module to the WSO2WSASAdministration service group
+ // We should not engage the throttle module to the wso2wsas-administration service group
if (moduleId.equals("throttle")) {
axisConfig.getServiceGroup(ServerConstants.ADMINISTRATION_SERVICE_GROUP).
disengageModule(axisModule);
Modified: wsas/java/trunk/modules/core/conf/axis2.xml
==============================================================================
--- wsas/java/trunk/modules/core/conf/axis2.xml (original)
+++ wsas/java/trunk/modules/core/conf/axis2.xml Fri Jan 5 05:38:36 2007
@@ -4,8 +4,8 @@
<!-- Globally engaged modules -->
<!-- ================================================= -->
<module ref="addressing"/>
- <module ref="statistics"/>
- <module ref="tracer"/>
+ <module ref="wso2wsf-statistics"/>
+ <module ref="wso2wsf-tracer"/>
<!-- ================================================= -->
<!-- Parameters -->
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerConstants.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerConstants.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerConstants.java Fri Jan 5 05:38:36 2007
@@ -47,7 +47,7 @@
//=============================================
// Admin Constants
//=============================================
- public static final String ADMINISTRATION_SERVICE_GROUP = "WSO2WSASAdministration";
+ public static final String ADMINISTRATION_SERVICE_GROUP = "wso2wsas-administration";
public static final String LOGGED_IN = "logged.in";
public static final String SERVER_REGISTERED = "wso2wsas.server.registered";
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 Fri Jan 5 05:38:36 2007
@@ -415,7 +415,7 @@
axisConfig.engageModule(moduleIdQName);
}
- // We should not engage the throttle module to the WSO2WSASAdministration service group
+ // We should not engage the throttle module to the wso2wsas-administration service group
if (moduleId.equals("throttle")) {
axisConfig.getServiceGroup(ServerConstants.ADMINISTRATION_SERVICE_GROUP).
disengageModule(axisConfig.getModule(moduleIdQName));
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/TraceFilterImpl.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/TraceFilterImpl.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/TraceFilterImpl.java Fri Jan 5 05:38:36 2007
@@ -19,6 +19,7 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
import org.wso2.wsf.common.tracer.module.TraceFilter;
+import org.wso2.wsas.ServerConstants;
/**
*
@@ -38,7 +39,7 @@
}
String serviceGroupName =
((AxisServiceGroup) msgContext.getAxisService().getParent()).getServiceGroupName();
- if(serviceGroupName.equals("WSO2WSASAdministration")){
+ if(serviceGroupName.equals(ServerConstants.ADMINISTRATION_SERVICE_GROUP)){
return true;
}
Modified: wsas/java/trunk/modules/distribution/common/pom.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/common/pom.xml (original)
+++ wsas/java/trunk/modules/distribution/common/pom.xml Fri Jan 5 05:38:36 2007
@@ -19,7 +19,7 @@
<id>common</id>
<activation>
<property>
- <name>common</name>
+ <name>release</name>
</property>
</activation>
<build>
@@ -249,7 +249,6 @@
<exclude name="**/*.iml"/>
<exclude name="**/.project"/>
<exclude name="**/.classpath"/>
- <exclude name="**/default_epr_web.properties"/>
<exclude name="**/**.jks"/>
<exclude name="**/pom.xml"/>
</fileset>
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 Fri Jan 5 05:38:36 2007
@@ -15,6 +15,13 @@
<include>release-notes.html</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>../../admin/target</directory>
+ <outputDirectory>${dist.temp.assembly.bin.dir}/repository/modules</outputDirectory>
+ <includes>
+ <include>wso2wsas-admin-${wso2wsas.version}.mar</include>
+ </includes>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
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 Fri Jan 5 05:38:36 2007
@@ -19,7 +19,7 @@
<id>standalone</id>
<activation>
<property>
- <name>standalone</name>
+ <name>release</name>
</property>
</activation>
<build>
@@ -40,14 +40,18 @@
<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 tofile="${dist.temp.dir}/samples/CommodityQuote/conf/default_epr.properties"
+ file="../../samples/CommodityQuote/conf/default_epr.properties"/>
<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"/>
+ file="../../samples/Trader/conf/default_epr.properties"/>
+ <copy tofile="${dist.temp.dir}/samples/JavascriptService/conf/default_epr.properties"
+ file="../../samples/JavascriptService/conf/default_epr.properties" />
<zip destfile="target/wso2wsas-standalone-edition-java-${wso2wsas.version}.zip">
- <fileset dir="../common/target/dist/temp"/>
+ <fileset dir="../common/target/dist/temp">
+ <exclude name="**/CommodityQuote/**/*.properties"/>
+ <exclude name="**/Trader/**/*.properties"/>
+ <exclude name="**/JavascriptService/**/*.properties"/>
+ </fileset>
<fileset dir="../common/target/dist-bin/temp"/>
<fileset dir="target/dist/temp"/>
</zip>
Modified: wsas/java/trunk/modules/distribution/webapp/pom.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/webapp/pom.xml (original)
+++ wsas/java/trunk/modules/distribution/webapp/pom.xml Fri Jan 5 05:38:36 2007
@@ -19,7 +19,7 @@
<id>webapp</id>
<activation>
<property>
- <name>webapp</name>
+ <name>release</name>
</property>
</activation>
<build>
@@ -271,15 +271,31 @@
</copy>
<!-- Copy the sample default_epr.properties file -->
+
+ <delete failonerror="false">
+ <fileset dir="${dist.temp.dir}/samples/CommodityQuote/conf/">
+ <include name="**/**.properties"/>
+ </fileset>
+ </delete>
+
+ <delete failonerror="false">
+ <fileset dir="${dist.temp.dir}/samples/Trader/conf/">
+ <include name="**/**.properties"/>
+ </fileset>
+ </delete>
+
+ <delete failonerror="false">
+ <fileset dir="${dist.temp.dir}/samples/JavascriptService/conf/">
+ <include name="**/**.properties"/>
+ </fileset>
+ </delete>
+
<copy tofile="${dist.temp.dir}/samples/CommodityQuote/conf/default_epr.properties"
- file="../../samples/CommodityQuote/conf/default_epr_web.properties"
- overwrite="true"/>
+ file="../../samples/CommodityQuote/conf/default_epr_web.properties"/>
<copy tofile="${dist.temp.dir}/samples/Trader/conf/default_epr.properties"
- file="../../samples/Trader/conf/default_epr_web.properties"
- overwrite="true"/>
+ file="../../samples/Trader/conf/default_epr_web.properties"/>
<copy tofile="${dist.temp.dir}/samples/JavascriptService/conf/default_epr.properties"
- file="../../samples/JavascriptService/conf/default_epr_web.properties"
- overwrite="true"/>
+ file="../../samples/JavascriptService/conf/default_epr_web.properties"/>
<copy todir="${dist.temp.dir}/bin" filtering="on"
overwrite="true">
Modified: wsas/java/trunk/modules/integration/maven.xml
==============================================================================
--- wsas/java/trunk/modules/integration/maven.xml (original)
+++ wsas/java/trunk/modules/integration/maven.xml Fri Jan 5 05:38:36 2007
@@ -48,7 +48,7 @@
<ant:copy todir="target/repository/modules">
<ant:fileset
file="${maven.repo.local}/org.apache.axis2/mars/addressing-${addressing.version}.mar"/>
- <ant:fileset file="../admin/target/wso2wsas_admin-${wso2wsas.version}.mar"/>
+ <ant:fileset file="../admin/target/wso2wsas-admin-${wso2wsas.version}.mar"/>
</ant:copy>
<ant:copy tofile="target/test-classes/wso2wsas.hibernate.cfg.xml">
<ant:fileset file="../core/conf/hibernate/test-hibernate.cfg.xml"/>
Modified: wsas/java/trunk/modules/integration/pom.xml
==============================================================================
--- wsas/java/trunk/modules/integration/pom.xml (original)
+++ wsas/java/trunk/modules/integration/pom.xml Fri Jan 5 05:38:36 2007
@@ -189,7 +189,7 @@
</copy>
<copy todir="target/repository/modules">
<fileset
- file="../admin/target/wso2wsas_admin-${wso2wsas.version}.mar"/>
+ file="../admin/target/wso2wsas-admin-${wso2wsas.version}.mar"/>
</copy>
<copy tofile="target/test-classes/wso2wsas.hibernate.cfg.xml">
<fileset file="../core/conf/hibernate/test-hibernate.cfg.xml"/>
Modified: wsas/java/trunk/modules/samples/pom.xml
==============================================================================
--- wsas/java/trunk/modules/samples/pom.xml (original)
+++ wsas/java/trunk/modules/samples/pom.xml Fri Jan 5 05:38:36 2007
@@ -54,7 +54,7 @@
<echo>Generating skeletons for Generic Services</echo>
<java classname="org.wso2.wsf.common.tools.codegen.CodegenHelper"
fork="true">
- <arg value="conf/wsas-samples-codegen.xml"/>
+ <arg value="./conf/wsas-samples-codegen.xml"/>
<classpath refid="maven.dependency.classpath"/>
<classpath refid="maven.compile.classpath"/>
<classpath refid="maven.runtime.classpath"/>
Modified: wsas/java/trunk/modules/servlet-edition/conf/axis2.xml
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/conf/axis2.xml (original)
+++ wsas/java/trunk/modules/servlet-edition/conf/axis2.xml Fri Jan 5 05:38:36 2007
@@ -4,8 +4,8 @@
<!-- Globally engaged modules -->
<!-- ================================================= -->
<module ref="addressing"/>
- <module ref="statistics"/>
- <module ref="tracer"/>
+ <module ref="wso2wsf-statistics"/>
+ <module ref="wso2wsf-tracer"/>
<!-- ================================================= -->
<!-- Parameters -->
Modified: wsas/java/trunk/modules/wsf-common-core/maven.xml
==============================================================================
--- wsas/java/trunk/modules/wsf-common-core/maven.xml (original)
+++ wsas/java/trunk/modules/wsf-common-core/maven.xml Fri Jan 5 05:38:36 2007
@@ -26,12 +26,12 @@
<mkdir dir="${statistics.module.dir}/META-INF"/>
<copy tofile="${statistics.module.dir}/META-INF/module.xml"
file="src/org/wso2/wsf/common/statistics/module/META-INF/module.xml"/>
- <jar jarfile="target/statistics-${wso2wsas.version}.mar"
+ <jar jarfile="target/wso2wsf-statistics-${wso2wsas.version}.mar"
basedir="${statistics.module.dir}">
<include name="**"/>
</jar>
- <copy file="target/statistics-${wso2wsas.version}.mar"
- tofile="${maven.repo.local}/org.wso2.wsf/mars/statistics-${wso2wsas.version}.mar"/>
+ <copy file="target/wso2wsf-statistics-${wso2wsas.version}.mar"
+ tofile="${maven.repo.local}/org.wso2.wsf/mars/wso2wsf-statistics-${wso2wsas.version}.mar"/>
<!-- throttle module -->
<property name="throttle.module.dir" value="target/throttle/module"/>
@@ -50,12 +50,12 @@
<mkdir dir="${tracer.module.dir}/META-INF"/>
<copy tofile="${tracer.module.dir}/META-INF/module.xml"
file="src/org/wso2/wsf/common/tracer/module/META-INF/module.xml"/>
- <jar jarfile="target/tracer-${wso2wsas.version}.mar"
+ <jar jarfile="target/wso2wsf-tracer-${wso2wsas.version}.mar"
basedir="${tracer.module.dir}">
<include name="**"/>
</jar>
<copy file="target/tracer-${wso2wsas.version}.mar"
- tofile="${maven.repo.local}/org.wso2.wsf/mars/tracer-${wso2wsas.version}.mar"/>
+ tofile="${maven.repo.local}/org.wso2.wsf/mars/wso2wsf-tracer-${wso2wsas.version}.mar"/>
<!-- MEX module -->
Modified: wsas/java/trunk/pom.xml
==============================================================================
--- wsas/java/trunk/pom.xml (original)
+++ wsas/java/trunk/pom.xml Fri Jan 5 05:38:36 2007
@@ -703,6 +703,7 @@
<wso2.adminui.version>1.1</wso2.adminui.version>
<server.short.name>WSO2 WSAS</server.short.name>
+ <server.name>WSO2 Web Services Application Server</server.name>
<!-- properties needed in building binary distribution -->
<dist.dir>target/dist</dist.dir>
More information about the Wsas-java-dev
mailing list