[wsas-java-dev] svn commit r643 - in wsas/java/trunk: . modules/admin/src/org/wso2/wsas/admin/service modules/admin/src/org/wso2/wsas/admin/service/util modules/core/bin modules/core/conf modules/core/conf/hibernate modules/core/conf/keystores modules/core/src/org/wso2/wsas modules/core/src/org/wso2/wsas/transport/jetty modules/core/src/org/wso2/wsas/transport/util modules/core/src/org/wso2/wsas/util modules/core/test/org/wso2/wsas modules/distribution modules/distribution/common modules/distribution/common/src/assemble modules/distribution/release modules/distribution/release/src/assemble modules/distribution/standalone modules/distribution/standalone/src modules/distribution/standalone/src/assemble modules/distribution/webapp modules/servlet-edition/legal modules/servlet-edition/src/org/wso2/wsas modules/standalone-edition modules/standalone-edition/bin modules/standalone-edition/conf modules/standalone-edition/conf/hibernate modules/standalone-edition/legal modules/standalone-edition/src modules/standalone-edition/src/org modules/standalone-edition/src/org/wso2 modules/standalone-edition/src/org/wso2/wsas modules/standalone-edition/src/org/wso2/wsas/transport modules/standalone-edition/src/org/wso2/wsas/transport/jetty modules/standalone-edition/test modules/standalone-edition/test-resources modules/standalone-edition/test/org modules/standalone-edition/test/org/wso2 modules/standalone-edition/test/org/wso2/wsas

svn at wso2.com svn at wso2.com
Mon Jan 29 07:52:37 PST 2007


Author: azeez
Date: Mon Jan 29 07:50:34 2007
New Revision: 643

Added:
   wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/HttpGetRequestProcessor.java
      - copied, changed from r614, wsas/java/trunk/modules/core/src/org/wso2/wsas/util/HttpGetRequestProcessor.java
   wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/ServiceHTMLProcessor.java
      - copied, changed from r617, wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ServiceHTMLProcessor.java
   wsas/java/trunk/modules/core/src/org/wso2/wsas/util/Restartable.java
      - copied, changed from r614, wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/Restartable.java
   wsas/java/trunk/modules/core/src/org/wso2/wsas/util/SystemRestarter.java
      - copied, changed from r614, wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/SystemRestarter.java
   wsas/java/trunk/modules/distribution/standalone/src/
   wsas/java/trunk/modules/distribution/standalone/src/assemble/
   wsas/java/trunk/modules/distribution/standalone/src/assemble/dist-standalone-assembly.xml
   wsas/java/trunk/modules/servlet-edition/legal/
   wsas/java/trunk/modules/standalone-edition/
   wsas/java/trunk/modules/standalone-edition/README.txt
      - copied, changed from r614, wsas/java/trunk/README.txt
   wsas/java/trunk/modules/standalone-edition/bin/
   wsas/java/trunk/modules/standalone-edition/bin/shutdown.bat
   wsas/java/trunk/modules/standalone-edition/bin/shutdown.sh
   wsas/java/trunk/modules/standalone-edition/bin/startup.bat
   wsas/java/trunk/modules/standalone-edition/bin/startup.sh
   wsas/java/trunk/modules/standalone-edition/bin/version.txt
   wsas/java/trunk/modules/standalone-edition/bin/wso2wsas.bat
   wsas/java/trunk/modules/standalone-edition/bin/wso2wsas.sh   (contents, props changed)
   wsas/java/trunk/modules/standalone-edition/conf/
   wsas/java/trunk/modules/standalone-edition/conf/axis2.xml
   wsas/java/trunk/modules/standalone-edition/conf/hibernate/
   wsas/java/trunk/modules/standalone-edition/conf/hibernate/wso2wsas.hibernate.cfg.xml
      - copied, changed from r614, wsas/java/trunk/modules/core/conf/hibernate/wso2wsas.hibernate.cfg.xml
   wsas/java/trunk/modules/standalone-edition/conf/server-web.xml
   wsas/java/trunk/modules/standalone-edition/conf/server.xml
      - copied, changed from r614, wsas/java/trunk/modules/core/conf/server.xml
   wsas/java/trunk/modules/standalone-edition/legal/
   wsas/java/trunk/modules/standalone-edition/pom.xml
   wsas/java/trunk/modules/standalone-edition/src/
   wsas/java/trunk/modules/standalone-edition/src/org/
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/Main.java
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/ServerController.java
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/Axis2FileDownloadHandler.java
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/Axis2FileUploadHandler.java
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/Axis2Handler.java
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/Axis2RestHandler.java
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/Axis2SOAPHandler.java
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/HttpTransportListener.java
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/HttpsTransportListener.java
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/JettyHTTPOutTransportInfo.java
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/JettyServer.java
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/ManagementConsoleRequestHandler.java
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/ServerDefaultHandler.java
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/ServerHandler.java
   wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/favicon.ico   (contents, props changed)
   wsas/java/trunk/modules/standalone-edition/test/
   wsas/java/trunk/modules/standalone-edition/test-resources/
   wsas/java/trunk/modules/standalone-edition/test-resources/axis2.xml
   wsas/java/trunk/modules/standalone-edition/test/org/
   wsas/java/trunk/modules/standalone-edition/test/org/wso2/
   wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/
   wsas/java/trunk/modules/standalone-edition/test/org/wso2/wsas/JettyServerTest.java
Removed:
   wsas/java/trunk/README.txt
   wsas/java/trunk/modules/core/bin/shutdown.bat
   wsas/java/trunk/modules/core/bin/shutdown.sh
   wsas/java/trunk/modules/core/bin/startup.bat
   wsas/java/trunk/modules/core/bin/startup.sh
   wsas/java/trunk/modules/core/bin/version.txt
   wsas/java/trunk/modules/core/bin/wso2wsas.bat
   wsas/java/trunk/modules/core/bin/wso2wsas.sh
   wsas/java/trunk/modules/core/conf/axis2.xml
   wsas/java/trunk/modules/core/conf/hibernate/wso2wsas.hibernate.cfg.xml
   wsas/java/trunk/modules/core/conf/keystores/
   wsas/java/trunk/modules/core/conf/server-web.xml
   wsas/java/trunk/modules/core/conf/server.xml
   wsas/java/trunk/modules/core/src/org/wso2/wsas/Main.java
   wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/
   wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/Restartable.java
   wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/SystemRestarter.java
   wsas/java/trunk/modules/core/src/org/wso2/wsas/util/HttpGetRequestProcessor.java
   wsas/java/trunk/modules/core/src/org/wso2/wsas/util/ServerController.java
   wsas/java/trunk/modules/core/test/org/wso2/wsas/JettyServerTest.java
Modified:
   wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java
   wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java
   wsas/java/trunk/modules/core/src/org/wso2/wsas/util/AdminServicesFilter.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/pom.xml
   wsas/java/trunk/modules/distribution/release/pom.xml
   wsas/java/trunk/modules/distribution/release/src/assemble/src-release-assembly.xml
   wsas/java/trunk/modules/distribution/standalone/pom.xml
   wsas/java/trunk/modules/distribution/webapp/pom.xml
   wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java
   wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/SOAPServlet.java
   wsas/java/trunk/pom.xml
Log:
Introducing standalone module

Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java	(original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java	Mon Jan 29 07:50:34 2007
@@ -24,7 +24,7 @@
 import org.wso2.wsas.ServerManager;
 import org.wso2.wsas.admin.service.util.*;
 import org.wso2.wsas.persistence.FileBasedConfigSerializer;
-import org.wso2.wsas.transport.util.Restartable;
+import org.wso2.wsas.util.Restartable;
 
 
 /**

Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java	(original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java	Mon Jan 29 07:50:34 2007
@@ -23,6 +23,7 @@
 import org.apache.axis2.engine.AxisConfiguration;
 import org.wso2.utils.ServerConfiguration;
 import org.wso2.wsas.ServerConstants;
+import org.wso2.wsas.util.AdminServicesFilter;
 import org.wso2.wsas.admin.service.StatisticsClient;
 
 import java.text.SimpleDateFormat;
@@ -52,7 +53,7 @@
 
     private StatisticsClient statClient;
 
-    public ServerStatus(ConfigurationContext configCtx) throws AxisFault{
+    public ServerStatus(ConfigurationContext configCtx) throws AxisFault {
         try {
             statClient = new StatisticsClient(configCtx);
         } catch (Exception e) {
@@ -85,29 +86,18 @@
 
         wso2wsasVersion = ServerConfiguration.getInstance().getFirstProperty("Version");
 
-        AxisServiceGroup asg =
-                axisConfig.getServiceGroup(org.wso2.wsas.ServerConstants.ADMIN_SERVICE_GROUP);
-        int adminServiceCount = 0;
-
-        for (Iterator serviceIter = asg.getServices(); serviceIter.hasNext();) {
-            serviceIter.next();
-            adminServiceCount++;
-        }
         int activeServices = 0;
         for (Iterator services = axisConfig.getServices().values().iterator();
              services.hasNext();) {
             AxisService axisService = (AxisService) services.next();
-
-            if (axisService.isClientSide()) {
+            if (!axisService.isActive() || axisService.isClientSide() ||
+                AdminServicesFilter.isFiltered((AxisServiceGroup) axisService.getParent())) {
                 continue;
             }
-
-            if (axisService.isActive()) {
-                activeServices++;
-            }
+            activeServices++;
         }
 
-        this.services = activeServices - adminServiceCount;
+        this.services = activeServices;
         serverName = ServerConstants.WSO2WSAS_INSTANCE;
     }
 

Copied: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/HttpGetRequestProcessor.java (from r614, wsas/java/trunk/modules/core/src/org/wso2/wsas/util/HttpGetRequestProcessor.java)
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/HttpGetRequestProcessor.java	(original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/HttpGetRequestProcessor.java	Mon Jan 29 07:50:34 2007
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and         
  * limitations under the License.                                              
  */
-package org.wso2.wsas.util;
+package org.wso2.wsas.transport.util;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;
@@ -35,13 +35,15 @@
 import org.apache.ws.commons.schema.XmlSchema;
 import org.wso2.wsas.ServerConstants;
 import org.wso2.wsas.ServerManager;
+import org.wso2.wsas.util.HibernateConfigFactory;
+import org.wso2.wsas.util.KeyStoreUtil;
 import org.wso2.wsas.feed.FeedConstants;
 import org.wso2.wsas.feed.atom.AtomFeed;
 import org.wso2.wsas.feed.rss.RSSFeed;
 import org.wso2.wsas.persistence.PersistenceManager;
 import org.wso2.wsas.persistence.dataobject.KeyStoreDO;
 import org.wso2.wsas.persistence.dataobject.ServiceDO;
-import org.wso2.wsas.transport.jetty.ServiceHTMLProcessor;
+import org.wso2.wsas.transport.util.ServiceHTMLProcessor;
 import org.wso2.utils.NetworkUtils;
 import org.wso2.utils.ServerConfiguration;
 import org.wso2.utils.ServerException;

Copied: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/ServiceHTMLProcessor.java (from r617, wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ServiceHTMLProcessor.java)
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ServiceHTMLProcessor.java	(original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/ServiceHTMLProcessor.java	Mon Jan 29 07:50:34 2007
@@ -14,7 +14,7 @@
 * limitations under the License.
 *
 */
-package org.wso2.wsas.transport.jetty;
+package org.wso2.wsas.transport.util;
 
 import org.wso2.wsas.ServerConstants;
 import org.apache.axis2.AxisFault;

Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/AdminServicesFilter.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/AdminServicesFilter.java	(original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/AdminServicesFilter.java	Mon Jan 29 07:50:34 2007
@@ -16,12 +16,17 @@
 package org.wso2.wsas.util;
 
 import org.wso2.wsas.ServerConstants;
+import org.apache.axis2.description.AxisServiceGroup;
 
 /**
  * 
  */
 public class AdminServicesFilter {
-    
+
+    public static boolean isFiltered(AxisServiceGroup axisServiceGroup) {
+        return isFiltered(axisServiceGroup.getServiceGroupName());
+    }
+
     public static boolean isFiltered(String serviceGroupName) {
         return ServerConstants.ADMIN_SERVICE_GROUP.equals(serviceGroupName) ||
                serviceGroupName.endsWith(ServerConstants.STATISTICS_SERVICE_GROUP) ||

Copied: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/Restartable.java (from r614, wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/Restartable.java)
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/Restartable.java	(original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/Restartable.java	Mon Jan 29 07:50:34 2007
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and         
  * limitations under the License.                                              
  */
-package org.wso2.wsas.transport.util;
+package org.wso2.wsas.util;
 
 import org.wso2.utils.ServerException;
 import org.wso2.wsas.util.Monitor;

Copied: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/SystemRestarter.java (from r614, wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/SystemRestarter.java)
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/SystemRestarter.java	(original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/SystemRestarter.java	Mon Jan 29 07:50:34 2007
@@ -16,10 +16,11 @@
 *
 */
 
-package org.wso2.wsas.transport.util;
+package org.wso2.wsas.util;
 
 import org.wso2.utils.ServerException;
 import org.wso2.wsas.util.Monitor;
+import org.wso2.wsas.util.Restartable;
 import org.apache.log4j.Logger;
 
 public class SystemRestarter implements Runnable {

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	Mon Jan 29 07:50:34 2007
@@ -13,7 +13,7 @@
     <packaging>pom</packaging>
     <version>1.2-SNAPSHOT</version>
     <name>WSO2 Web Services Application Server - Distribution/Common</name>
-
+    
     <profiles>
         <profile>
             <id>common</id>
@@ -98,6 +98,16 @@
                                             <outputDirectory>
                                                 ${dist.dir}/temp/wso2wsas-${wso2wsas.version}/lib</outputDirectory>
                                         </artifactItem>
+                                        
+                                        <artifactItem>
+                                            <groupId>org.wso2.wsas</groupId>
+                                            <artifactId>wso2wsas-standalone-edition</artifactId>
+                                            <version>${pom.version}</version>
+                                            <type>jar</type>
+                                            <overWrite>true</overWrite>
+                                            <outputDirectory>
+                                                ${dist.dir}/temp/wso2wsas-${wso2wsas.version}/lib</outputDirectory>
+                                        </artifactItem>                                        
 
                                         <artifactItem>
                                             <groupId>org.wso2.wsas</groupId>
@@ -134,8 +144,6 @@
                             </execution>
                         </executions>
                     </plugin>
-
-
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
@@ -161,6 +169,7 @@
                                                     <include name="**/admin/src"/>
                                                     <include name="**/core/src"/>
                                                     <include name="**/servlet-edition/src"/>
+                                                    <include name="**/standalone-edition/src"/>
                                                 </dirset>
                                             </sourcepath>
 
@@ -182,7 +191,7 @@
                                 <phase>package</phase>
                                 <configuration>
                                     <tasks>
-                                        <!-- ############################################################## -->
+                                        <echo message="############## Initialize filter tokens #################"/>
                                         <filter token="wso2wsas_version"
                                                 value="${wso2wsas.version}"/>
                                         <filter token="axis2_version" value="${axis2.version}"/>
@@ -235,24 +244,19 @@
                                                 value="${server.name} v${wso2wsas.version}"/>
                                         <filter token="server_short_name"
                                                 value="${server.short.name}"/>
-                                        <!-- ############################################################## -->
-
+                                        <echo message="######################### END ################################"/>
 
+                                        <echo message="############### Create common directories ###################" />
                                         <mkdir dir="${dist.temp.dir}/bin"/>
                                         <mkdir dir="${dist.temp.dir}/docs"/>
-                                        <mkdir dir="${dist.temp.dir}/lib/www"/>
-                                        <mkdir dir="${dist.temp.dir}/lib/endorsed"/>
                                         <mkdir dir="${dist.temp.dir}/conf"/>
                                         <mkdir dir="${dist.temp.dir}/conf/rampart"/>
                                         <mkdir dir="${dist.temp.dir}/repository/modules"/>
                                         <mkdir dir="${dist.temp.dir}/repository/services"/>
-                                        <mkdir dir="${dist.temp.dir}/logs"/>
                                         <mkdir dir="${dist.temp.dir}/database"/>
-                                        <mkdir dir="${dist.temp.dir}/samples"/>
-
-                                        <mkdir dir="${dist.dir.temp.www}"/>
+                                        <echo message="######################### END ################################"/>
 
-                                        <!--copy all the scripts in to the bin-->
+                                        <echo message="############ Copy all core/bin scripts in to bin ##############"/>
                                         <copy todir="${dist.temp.dir}/bin" filtering="on">
                                             <fileset dir="../../core/bin">
                                                 <exclude name="**/*.bat"/>
@@ -263,8 +267,9 @@
                                                 <include name="**/*.bat"/>
                                             </fileset>
                                         </copy>
+                                        <echo message="######################### END ################################"/>
 
-                                        <!--copy samples in to the dist -->
+                                        <echo message="######################### Copy samples #######################"/>
                                         <copy todir="${dist.temp.dir}/samples" filtering="on">
                                             <fileset dir="../../samples">
                                                 <exclude name="**/target/**"/>
@@ -302,8 +307,9 @@
                                                 <exclude name="**/pom.xml"/>
                                             </fileset>
                                         </copy>
+                                        <echo message="######################### END ################################"/>
 
-                                        <!--copy docs in the xdocs in to the dist -->
+                                        <echo message="################## Copy docs in the xdocs ####################"/>
                                         <copy todir="${dist.temp.dir}/docs">
                                             <fileset dir="../../../xdocs">
                                                 <exclude name="**/**.html"/>
@@ -318,30 +324,27 @@
                                                 <include name="**/**.js"/>
                                             </fileset>
                                         </copy>
+                                        <echo message="######################### END ################################"/>
 
-                                        <!--copy configuration files in to the dist-->
+                                        <echo message="##################### Copy core/conf files ###################"/>
                                         <copy todir="${dist.temp.dir}/conf/rampart" filtering="on">
                                             <fileset dir="../../core/conf/rampart"/>
                                         </copy>
 
                                         <copy todir="${dist.temp.dir}/conf" filtering="on"
                                               overwrite="true">
-                                            <fileset file="../../core/conf/server.xml"/>
-                                            <fileset file="../../core/conf/server-web.xml"/>
                                             <fileset file="../../core/conf/mime-mappings.xml"/>
-                                            <fileset file="../../core/conf/axis2.xml"/>
                                             <fileset
                                                     file="../../core/conf/ui-extensions-config.xml"/>
                                             <fileset file="../../core/conf/derby.properties"/>
                                             <fileset file="../../core/conf/log4j.properties"/>
                                             <fileset
-                                                    file="../../core/conf/hibernate/wso2wsas.hibernate.cfg.xml"/>
-                                            <fileset
                                                     file="../../core/conf/hibernate/wso2wsas.hbm.xml"/>
                                             <fileset file="../../core/conf/wso2wsas.policy"/>
                                         </copy>
+                                        <echo message="######################### END ################################"/>
 
-                                        <!--prepare keystores for https-->
+                                        <echo message="##################### Create WSAS Keystore ###################"/>
                                         <delete file="${dist.temp.dir}/conf/wso2wsas.jks"/>
 
                                         <genkey alias="wso2wsas" storepass="wso2wsas" keyalg="RSA"
@@ -354,103 +357,9 @@
                                                 <param name="C" value="LK"/>
                                             </dname>
                                         </genkey>
+                                        <echo message="######################### END ################################"/>
 
-                                        <!-- Copy all licenses to lib -->
-                                        <copy todir="${dist.temp.dir}/lib">
-                                            <fileset dir="../../../legal">
-                                                <include name="**/*.txt"/>
-                                            </fileset>
-                                        </copy>
-
-                                        <!-- Copy all the services -->
-                                        <copy todir="${dist.temp.dir}/repository/services">
-                                            <fileset file="../../admin/target/*.aar"/>
-                                            <fileset file="../../core/target/*.aar"/>
-                                        </copy>
-
-                                        <!--copy admin web app-->
-                                        <copy todir="${dist.temp.dir}/lib/www">
-                                            <fileset dir="../../www">
-                                                <exclude name=".svn"/>
-                                                <exclude name="**/**.iml"/>
-                                                <exclude name="**/**.html"/>
-                                                <exclude name="**/**.css"/>
-                                                <exclude name="**/**.xsl"/>
-                                                <exclude name="**/**.js"/>
-                                            </fileset>
-                                        </copy>
-
-                                        <copy todir="${dist.temp.dir}/lib/www" filtering="on">
-                                            <fileset dir="../../www">
-                                                <include name="**/**.html"/>
-                                                <include name="**/**.css"/>
-                                                <include name="**/**.xsl"/>
-                                                <include name="**/**.js"/>
-                                            </fileset>
-                                        </copy>
-
-                                        <unzip src="target/zips/wso2adminui-${wso2.adminui.version}.zip"
-                                               dest="${dist.dir.temp.www}"/>
-                                        <!-- unzip javascript related to Plotkit graphs -->
-                                        <unzip src="target/zips/wso2-adminui-graphs-zip-${wso2.adminui.version.graphs}.zip"
-                                               dest="${dist.dir.temp.www}"/>
-
-                                        <delete dir="target/zips"/>
-
-                                        <!--copy admin web app using ZIP-->
-                                        <copy todir="${dist.temp.dir}/lib/www">
-                                            <fileset dir="${dist.dir.temp.www}">
-                                                <exclude name=".svn"/>
-                                                <exclude name="**/**.html"/>
-                                                <exclude name="**/**.css"/>
-                                                <exclude name="**/**.xsl"/>
-                                                <exclude name="**/**.js"/>
-                                            </fileset>
-                                        </copy>
-
-                                        <copy todir="${dist.temp.dir}/lib/www" filtering="on">
-                                            <fileset dir="${dist.dir.temp.www}">
-                                                <include name="**/**.html"/>
-                                                <include name="**/**.css"/>
-                                                <include name="**/**.xsl"/>
-                                                <include name="**/**.js"/>
-                                            </fileset>
-                                        </copy>
-
-                                        <mkdir dir="${dist.temp.dir}/lib/styles"/>
-
-                                        <move toDir="${dist.temp.dir}/lib/styles">
-                                            <fileset dir="${dist.temp.dir}/lib/www/styles">
-                                                <include name="**"/>
-                                            </fileset>
-                                        </move>
-
-                                        <!-- Coping to main www stuff to Chad folder -->
-                                        <mkdir dir="${dist.temp.dir}/samples/Chad/main_www"/>
-                                        <mkdir dir="${dist.temp.dir}/samples/Chad/extensions_www"/>
-
-                                        <copy todir="${dist.temp.dir}/samples/Chad/extensions_www">
-                                            <fileset dir="../../www">
-                                                <include name="**/**.jpg"/>
-                                                <include name="**/**.css"/>
-                                                <exclude name="**/*wsdl_view.css"/>
-                                            </fileset>
-                                        </copy>
-
-                                        <copy todir="${dist.temp.dir}/samples/Chad/main_www">
-                                            <fileset dir="${dist.dir.temp.www}">
-                                                <include name="**/**.css"/>
-                                                <include name="**/**.js"/>
-                                            </fileset>
-                                        </copy>
-
-                                        <copy todir="${dist.temp.dir}/samples/Chad/main_www/images">
-                                            <fileset dir="${dist.dir.temp.www}/images">
-                                                <include name="**/**.*"/>
-                                            </fileset>
-                                        </copy>
-
-                                        <!-- ======================== Create Database ============================== -->
+                                        <echo message="###################### Create Database #########################"/>
                                         <property name="sqlOutput"
                                                   value="target/schema-export.sql"/>
                                         <property name="dbURL"
@@ -499,9 +408,7 @@
                                         </macrodef>
 
                                         <create-database sqlOutput="${sqlOutput}" dbURL="${dbURL}"/>
-
-
-                                        <!-- ========================================================================-->
+                                        <echo message="######################### END ################################"/>
 
 
                                     </tasks>
@@ -515,13 +422,12 @@
                                 <phase>install</phase>
                                 <configuration>
                                     <tasks>
-                                        <unzip src="target/dist-bin.zip" dest="target/dist-bin"/>
+                                        <unzip src="target/dist-bin.zip" dest="target/dist"/>
                                     </tasks>
                                 </configuration>
                                 <goals>
                                     <goal>run</goal>
                                 </goals>
-
                             </execution>
                         </executions>
                     </plugin>
@@ -530,6 +436,4 @@
             </build>
         </profile>
     </profiles>
-
-
 </project>

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 29 07:50:34 2007
@@ -6,25 +6,30 @@
     </formats>
     <fileSets>
         <fileSet>
-            <directory>../../..</directory>
-            <outputDirectory>${dist.temp.assembly.bin.dir}</outputDirectory>
+            <directory>../../admin/target</directory>
+            <outputDirectory>temp/wso2wsas-${wso2wsas.version}/repository/modules</outputDirectory>
             <includes>
-                <include>README.txt</include>
-                <include>NOTICE.txt</include>
-                <include>LICENSE.txt</include>
-                <include>release-notes.html</include>
+                <include>wso2wsas-admin-${wso2wsas.version}.mar</include>
             </includes>
         </fileSet>
         <fileSet>
             <directory>../../admin/target</directory>
-            <outputDirectory>${dist.temp.assembly.bin.dir}/repository/modules</outputDirectory>
+            <outputDirectory>temp/wso2wsas-${wso2wsas.version}/repository/services</outputDirectory>
             <includes>
-                <include>wso2wsas-admin-${wso2wsas.version}.mar</include>
+                <include>wso2wsas-administration.aar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../../core/target</directory>
+            <outputDirectory>temp/wso2wsas-${wso2wsas.version}/repository/services</outputDirectory>
+            <includes>
+                <include>echo.aar</include>
+                <include>version.aar</include>
             </includes>
         </fileSet>
     </fileSets>
     <dependencySets>
-        <dependencySet>
+        <!--<dependencySet>
             <outputDirectory>${dist.temp.assembly.bin.dir}/lib</outputDirectory>
             <excludes>
                 <exclude>xerces:xml-apis:jar</exclude>
@@ -45,9 +50,9 @@
                 <exclude>org.wso2.adminui:wso2adminui:zip</exclude>
                 <exclude>org.wso2.adminui:wso2-adminui-graphs-zip:zip</exclude>
             </excludes>
-        </dependencySet>
+        </dependencySet>-->
         <dependencySet>
-            <outputDirectory>${dist.temp.assembly.bin.dir}/repository/modules</outputDirectory>
+            <outputDirectory>temp/wso2wsas-${wso2wsas.version}/repository/modules</outputDirectory>
             <includes>
                 <include>org.wso2.mex:wso2mex:mar</include>
                 <include>org.wso2.xfer:wso2xfer:mar</include>
@@ -61,18 +66,18 @@
             </includes>
         </dependencySet>
         <dependencySet>
-            <outputDirectory>${dist.temp.assembly.bin.dir}/repository/services</outputDirectory>
+            <outputDirectory>temp/wso2wsas-${wso2wsas.version}/repository/services</outputDirectory>
             <includes>
                 <include>org.wso2.codegen:wso2codegen:aar</include>
             </includes>
         </dependencySet>
-        <dependencySet>
-            <outputDirectory>${dist.temp.assembly.bin.dir}/lib/endorsed</outputDirectory>
+        <!-- <dependencySet>
+            <outputDirectory>lib/endorsed</outputDirectory>
             <includes>
                 <include>xerces:xml-apis:jar</include>
                 <include>xerces:xercesImpl:jar</include>
                 <include>xerces:resolver:jar</include>
             </includes>
-        </dependencySet>
+        </dependencySet>-->
     </dependencySets>
 </assembly>
\ No newline at end of file

Modified: wsas/java/trunk/modules/distribution/pom.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/pom.xml	(original)
+++ wsas/java/trunk/modules/distribution/pom.xml	Mon Jan 29 07:50:34 2007
@@ -31,6 +31,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-servlet-edition</artifactId>
             <version>${pom.version}</version>
         </dependency>

Modified: wsas/java/trunk/modules/distribution/release/pom.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/release/pom.xml	(original)
+++ wsas/java/trunk/modules/distribution/release/pom.xml	Mon Jan 29 07:50:34 2007
@@ -57,8 +57,10 @@
                                 <configuration>
                                     <tasks>
                                         <mkdir dir="target"/>
-                                        <copy tofile="target/wso2wsas-standalone-edition-java-${wso2wsas.version}.zip" file="../standalone/target/wso2wsas-standalone-edition-java-${wso2wsas.version}.zip"/>
-                                        <copy tofile="target/wso2wsas-servlet-edition-java-${wso2wsas.version}.zip" file="../webapp/target/wso2wsas-servlet-edition-java-${wso2wsas.version}.zip"/>
+                                        <copy tofile="target/wso2wsas-standalone-edition-java-${wso2wsas.version}.zip"
+                                              file="../standalone/target/wso2wsas-standalone-edition-java-${wso2wsas.version}.zip"/>
+                                        <copy tofile="target/wso2wsas-servlet-edition-java-${wso2wsas.version}.zip"
+                                              file="../webapp/target/wso2wsas-servlet-edition-java-${wso2wsas.version}.zip"/>
                                     </tasks>
                                 </configuration>
                                 <goals>

Modified: wsas/java/trunk/modules/distribution/release/src/assemble/src-release-assembly.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/release/src/assemble/src-release-assembly.xml	(original)
+++ wsas/java/trunk/modules/distribution/release/src/assemble/src-release-assembly.xml	Mon Jan 29 07:50:34 2007
@@ -26,6 +26,7 @@
                 <include>**/integration/**</include>
                 <include>**/samples/**</include>
                 <include>**/servlet-edition/**</include>
+                <include>**/standalone-edition/**</include>
                 <include>**/www/**</include>
                 <include>**/**pom.xml</include>
             </includes>

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 29 07:50:34 2007
@@ -26,31 +26,87 @@
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.1</version>
+                        <executions>
+                            <execution>
+                                <id>distribution-package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>attached</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>
+                                            src/assemble/dist-standalone-assembly.xml</descriptor>
+                                    </descriptors>
+                                    <finalName>dist</finalName>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>2.0-alpha-1-SNAPSHOT</version>
+                        <executions>
+                            <execution>
+                                <id>initialize-copy</id>
+                                <phase>initialize</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <!-- Adminui related zips -->
+                                        <artifactItem>
+                                            <groupId>org.wso2.adminui</groupId>
+                                            <artifactId>wso2adminui</artifactId>
+                                            <version>${wso2.adminui.version}</version>
+                                            <type>zip</type>
+                                            <overWrite>true</overWrite>
+                                            <outputDirectory>target/zips</outputDirectory>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.wso2.adminui</groupId>
+                                            <artifactId>wso2-adminui-graphs-zip</artifactId>
+                                            <version>${wso2.adminui.version.graphs}</version>
+                                            <type>zip</type>
+                                            <overWrite>true</overWrite>
+                                            <outputDirectory>target/zips</outputDirectory>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
                         <version>1.1</version>
                         <executions>
-                            <execution>
+
+                            <!--<execution>
                                 <id>install</id>
                                 <phase>install</phase>
                                 <configuration>
                                     <tasks>
-                                        <!-- Creating the distribution -->
                                         <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 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"/>
                                         <copy tofile="${dist.temp.dir}/samples/JavascriptService/conf/default_epr.properties"
-                                              file="../../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">
                                                 <exclude name="**/CommodityQuote/**/*.properties"/>
                                                 <exclude name="**/Trader/**/*.properties"/>
-                                                <exclude name="**/JavascriptService/**/*.properties"/>
+                                                <exclude
+                                                        name="**/JavascriptService/**/*.properties"/>
                                             </fileset>
                                             <fileset dir="../common/target/dist-bin/temp"/>
                                             <fileset dir="target/dist/temp"/>
@@ -60,6 +116,113 @@
                                 <goals>
                                     <goal>run</goal>
                                 </goals>
+                            </execution>-->
+                            <execution>
+                                <id>package</id>
+                                <phase>package</phase>
+                                <configuration>
+                                    <tasks>
+                                        <filter token="server_name"
+                                                value="${server.name} v${wso2wsas.version}"/>
+                                        <filter token="server_short_name"
+                                                value="${server.short.name}"/>
+
+                                        <echo message="########## Copy common dist ##############"/>
+                                        <mkdir dir="${dist.temp.dir}/lib/www"/>
+                                        <copy todir="${dist.temp.dir}">
+                                            <fileset dir="../common/${dist.temp.dir}"/>
+                                        </copy>
+                                        <echo message="################ END ####################"/>
+
+                                        <echo message="############## Copy bin #################"/>
+                                        <copy todir="${dist.temp.dir}/bin" filtering="on">
+                                            <fileset dir="../../standalone-edition/bin">
+                                                <include name="**/*.sh"/>
+                                                <include name="**/version.txt"/>
+                                            </fileset>
+                                        </copy>
+                                        <copy todir="${dist.temp.dir}/bin">
+                                            <fileset dir="../../standalone-edition/bin">
+                                                <include name="**/*.bat"/>
+                                            </fileset>
+                                        </copy>
+                                        <echo message="################ END ####################"/>
+
+                                        <echo message="############## Copy conf #################"/>
+                                        <copy todir="${dist.temp.dir}/conf" filtering="on">
+                                            <fileset dir="../../standalone-edition/conf">
+                                                <include name="server.xml"/>
+                                                <include name="server-web.xml"/>
+                                                <include name="axis2.xml"/>
+                                            </fileset>
+                                            <fileset dir="../../standalone-edition/conf/hibernate"/>
+                                        </copy>
+                                        <echo message="################ END ####################"/>
+
+                                        <echo message="############## Copy WWW #################"/>
+                                        <copy todir="${dist.temp.dir}/lib/www">
+                                            <fileset dir="../../www">
+                                                <exclude name=".svn"/>
+                                                <exclude name="**/**.iml"/>
+                                                <exclude name="**/**.html"/>
+                                                <exclude name="**/**.css"/>
+                                                <exclude name="**/**.xsl"/>
+                                                <exclude name="**/**.js"/>
+                                            </fileset>
+                                        </copy>
+                                        <copy todir="${dist.temp.dir}/lib/www" filtering="on">
+                                            <fileset dir="../../www">
+                                                <include name="**/**.html"/>
+                                                <include name="**/**.css"/>
+                                                <include name="**/**.xsl"/>
+                                                <include name="**/**.js"/>
+                                            </fileset>
+                                        </copy>
+                                        <unzip src="target/zips/wso2adminui-${wso2.adminui.version}.zip"
+                                               dest="${dist.dir.temp.www}"/>
+                                        <unzip src="target/zips/wso2-adminui-graphs-zip-${wso2.adminui.version.graphs}.zip"
+                                               dest="${dist.dir.temp.www}"/>
+                                        <copy todir="${dist.temp.dir}/lib/www">
+                                            <fileset dir="${dist.dir.temp.www}">
+                                                <exclude name=".svn"/>
+                                                <exclude name="**/**.html"/>
+                                                <exclude name="**/**.css"/>
+                                                <exclude name="**/**.xsl"/>
+                                                <exclude name="**/**.js"/>
+                                            </fileset>
+                                        </copy>
+                                        <copy todir="${dist.temp.dir}/lib/www" filtering="on">
+                                            <fileset dir="${dist.dir.temp.www}">
+                                                <include name="**/**.html"/>
+                                                <include name="**/**.css"/>
+                                                <include name="**/**.xsl"/>
+                                                <include name="**/**.js"/>
+                                            </fileset>
+                                        </copy>
+                                        <mkdir dir="${dist.temp.dir}/lib/styles"/>
+                                        <move toDir="${dist.temp.dir}/lib/styles">
+                                            <fileset dir="${dist.temp.dir}/lib/www/styles">
+                                                <include name="**"/>
+                                            </fileset>
+                                        </move>
+                                        <echo message="################ END ####################"/>
+                                    </tasks>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>unzip-dist-bin</id>
+                                <phase>install</phase>
+                                <configuration>
+                                    <tasks>
+                                        <unzip src="target/dist-bin.zip" dest="target/dist"/>
+                                    </tasks>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
                             </execution>
                         </executions>
                     </plugin>

Added: wsas/java/trunk/modules/distribution/standalone/src/assemble/dist-standalone-assembly.xml
==============================================================================
--- (empty file)
+++ wsas/java/trunk/modules/distribution/standalone/src/assemble/dist-standalone-assembly.xml	Mon Jan 29 07:50:34 2007
@@ -0,0 +1,57 @@
+<assembly>
+    <id>bin</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <directory>../../standalone-edition</directory>
+            <outputDirectory>${dist.temp.assembly.bin.dir}</outputDirectory>
+            <includes>
+                <include>README.txt</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../../..</directory>
+            <outputDirectory>${dist.temp.assembly.bin.dir}</outputDirectory>
+            <includes>
+                <include>release-notes.html</include>
+                <include>NOTICE.txt</include>
+                <include>LICENSE.txt</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>${dist.temp.assembly.bin.dir}/lib</outputDirectory>
+            <excludes>
+                <exclude>xerces:xml-apis:jar</exclude>
+                <exclude>xerces:xercesImpl:jar</exclude>
+                <exclude>xerces:resolver:jar</exclude>
+                <exclude>bouncycastle:bcprov-jdk13:jar</exclude>
+                <exclude>bouncycastle:bcprov-jdk15:jar</exclude>
+                <exclude>org.wso2.mex:wso2mex:mar</exclude>
+                <exclude>org.wso2.xfer:wso2xfer:mar</exclude>
+                <exclude>org.wso2.statistics:wso2statistics:mar</exclude>
+                <exclude>org.wso2.throttle:wso2throttle:mar</exclude>
+                <exclude>org.wso2.tracer:wso2tracer:mar</exclude>
+                <exclude>org.wso2.codegen:wso2codegen: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:wso2adminui:zip</exclude>
+                <exclude>org.wso2.adminui:wso2-adminui-graphs-zip:zip</exclude>
+            </excludes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>${dist.temp.assembly.bin.dir}/lib/endorsed</outputDirectory>
+            <includes>
+                <include>xerces:xml-apis:jar</include>
+                <include>xerces:xercesImpl:jar</include>
+                <include>xerces:resolver:jar</include>
+            </includes>
+        </dependencySet>
+    </dependencySets>
+</assembly>
\ No newline at end of file

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	Mon Jan 29 07:50:34 2007
@@ -94,7 +94,8 @@
                                             <version>${pom.version}</version>
                                             <type>jar</type>
                                             <overWrite>true</overWrite>
-                                            <outputDirectory>${war.temp.dir}/WEB-INF/lib</outputDirectory>
+                                            <outputDirectory>
+                                                ${war.temp.dir}/WEB-INF/lib</outputDirectory>
                                         </artifactItem>
 
                                         <artifactItem>
@@ -103,7 +104,8 @@
                                             <version>${pom.version}</version>
                                             <type>jar</type>
                                             <overWrite>true</overWrite>
-                                            <outputDirectory>${war.temp.dir}/WEB-INF/lib</outputDirectory>
+                                            <outputDirectory>
+                                                ${war.temp.dir}/WEB-INF/lib</outputDirectory>
                                         </artifactItem>
 
                                         <artifactItem>
@@ -112,7 +114,8 @@
                                             <version>${pom.version}</version>
                                             <type>jar</type>
                                             <overWrite>true</overWrite>
-                                            <outputDirectory>${war.temp.dir}/WEB-INF/lib</outputDirectory>
+                                            <outputDirectory>
+                                                ${war.temp.dir}/WEB-INF/lib</outputDirectory>
                                         </artifactItem>
                                     </artifactItems>
                                 </configuration>
@@ -220,7 +223,8 @@
                                         <mkdir dir="${dist.dir.temp.www}"/>
                                         <copy todir="${dist.temp.dir}">
                                             <fileset dir="../common/${dist.temp.dir}"/>
-                                            <fileset dir="../common/target/dist-bin/${dist.temp.assembly.bin.dir}"/>
+                                            <fileset
+                                                    dir="../common/target/dist-bin/${dist.temp.assembly.bin.dir}"/>
                                         </copy>
                                         <copy todir="${dist.dir.temp.www}">
                                             <fileset dir="../common/${dist.dir.temp.www}"/>
@@ -251,7 +255,8 @@
                                         </copy>
                                         <copy todir="${dist.temp.dir}/samples/Chad/js">
                                             <fileset file="${dist.dir.temp.www}/js/main.js"/>
-                                            <fileset file="${dist.dir.temp.www}/js/dhtmlHistory.js"/>
+                                            <fileset
+                                                    file="${dist.dir.temp.www}/js/dhtmlHistory.js"/>
                                             <fileset file="${dist.dir.temp.www}/js/breadcrumbs.js"/>
                                         </copy>
                                         <copy todir="${dist.temp.dir}/samples/Chad/images">
@@ -282,7 +287,8 @@
                                         <!-- Copy the sample default_epr.properties file -->
 
                                         <delete failonerror="false">
-                                            <fileset dir="${dist.temp.dir}/samples/CommodityQuote/conf/">
+                                            <fileset
+                                                    dir="${dist.temp.dir}/samples/CommodityQuote/conf/">
                                                 <include name="**/**.properties"/>
                                             </fileset>
                                         </delete>
@@ -294,7 +300,8 @@
                                         </delete>
 
                                         <delete failonerror="false">
-                                            <fileset dir="${dist.temp.dir}/samples/JavascriptService/conf/">
+                                            <fileset
+                                                    dir="${dist.temp.dir}/samples/JavascriptService/conf/">
                                                 <include name="**/**.properties"/>
                                             </fileset>
                                         </delete>

Modified: wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java	(original)
+++ wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java	Mon Jan 29 07:50:34 2007
@@ -18,8 +18,8 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.log4j.Logger;
 import org.wso2.adminui.AdminUIServletFilter;
-import org.wso2.wsas.transport.util.Restartable;
-import org.wso2.wsas.transport.util.SystemRestarter;
+import org.wso2.wsas.util.Restartable;
+import org.wso2.wsas.util.SystemRestarter;
 import org.wso2.wsas.util.*;
 import org.wso2.utils.FileManipulator;
 import org.wso2.utils.ServerException;

Modified: wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/SOAPServlet.java
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/SOAPServlet.java	(original)
+++ wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/SOAPServlet.java	Mon Jan 29 07:50:34 2007
@@ -15,7 +15,7 @@
  */
 package org.wso2.wsas;
 
-import org.wso2.wsas.util.HttpGetRequestProcessor;
+import org.wso2.wsas.transport.util.HttpGetRequestProcessor;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.addressing.AddressingHelper;

Copied: wsas/java/trunk/modules/standalone-edition/README.txt (from r614, wsas/java/trunk/README.txt)
==============================================================================

Added: wsas/java/trunk/modules/standalone-edition/bin/shutdown.bat
==============================================================================
--- (empty file)
+++ wsas/java/trunk/modules/standalone-edition/bin/shutdown.bat	Mon Jan 29 07:50:34 2007
@@ -0,0 +1,129 @@
+ at echo off
+
+REM ---------------------------------------------------------------------------
+REM  Copyright 2005,2006 WSO2, Inc. http://www.wso2.org 
+REM
+REM  Licensed under the Apache License, Version 2.0 (the "License");
+REM  you may not use this file except in compliance with the License.
+REM  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0  
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+
+rem ---------------------------------------------------------------------------
+rem Main Script for the WSO2 Web Services Application Server v1.1
+rem
+rem Environment Variable Prequisites
+rem
+rem   WSO2WSAS_HOME   Home of WSO2 WSAS installation. If not set I will  try
+rem                   to figure it out.
+rem
+rem   JAVA_HOME       Must point at your Java Development Kit installation.
+rem
+rem   JAVA_OPTS       (Optional) Java runtime options used when the commands
+rem                   is executed.
+rem ---------------------------------------------------------------------------
+
+rem ----- if JAVA_HOME is not set we're not happy ------------------------------
+:checkJava
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+goto checkServer
+
+:noJavaHome
+echo "You must set the JAVA_HOME variable before running WSO2 WSAS."
+goto end
+
+rem ----- Only set WSO2WSAS_HOME if not already set ----------------------------
+:checkServer
+rem %~sdp0 is expanded pathname of the current script under NT with spaces in the path removed
+if "%WSO2WSAS_HOME%"=="" set WSO2WSAS_HOME=%~sdp0..
+
+rem find WSO2WSAS_HOME if it does not exist due to either an invalid value passed
+rem by the user or the %0 problem on Windows 9x
+if not exist "%WSO2WSAS_HOME%\bin\version.txt" goto noServerHome
+
+set AXIS2_HOME=%WSO2WSAS_HOME%
+goto updateClasspath
+
+:noServerHome
+echo WSO2WSAS_HOME is set incorrectly or WSO2 WSAS could not be located. Please set WSO2WSAS_HOME.
+goto end
+
+rem ----- update classpath -----------------------------------------------------
+:updateClasspath
+
+setlocal EnableDelayedExpansion
+set WSO2WSAS_CLASSPATH=%WSO2WSAS_HOME%\conf
+FOR %%C in ("%WSO2WSAS_HOME%"\lib\*.jar) DO set WSO2WSAS_CLASSPATH=!WSO2WSAS_CLASSPATH!;./lib/%%~nC%%~xC
+
+set WSO2WSAS_CLASSPATH="%JAVA_HOME%\lib\tools.jar";%WSO2WSAS_CLASSPATH%;%CLASSPATH%
+
+rem ----- Process the input command -------------------------------------------
+
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of arguments (up to the command line limit, anyway).
+
+set CMD=STOP
+
+:doneStart
+if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
+
+rem ---------- Handle the SSL Issue with proper JDK version --------------------
+rem find the version of the jdk
+:findJdk
+
+"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.4" >NUL
+IF ERRORLEVEL 1 goto checkJdk15
+goto jdk14
+
+:checkJdk15
+"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.5" >NUL
+IF ERRORLEVEL 1 goto checkJdk16
+goto jdk15
+
+:checkJdk16
+"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.6" >NUL
+IF ERRORLEVEL 1 goto unknownJdk
+goto jdk16
+
+:unknownJdk
+echo Shutting down WSO2 Web Services Application Server v1.1
+echo [ERROR] WSO2 WSAS is supported only on JDK 1.4 and higher
+goto end
+
+:jdk14
+echo Shutting down WSO2 Web Services Application Server v1.1
+set WSO2WSAS_CLASSPATH=%WSO2WSAS_HOME%\lib\bcprov-jdk13-132.jar;%WSO2WSAS_CLASSPATH%
+goto runServer
+:jdk15
+echo Shutting down WSO2 Web Services Application Server v1.1
+set WSO2WSAS_CLASSPATH=%WSO2WSAS_HOME%\lib\bcprov-jdk15-132.jar;%WSO2WSAS_CLASSPATH%
+goto runServer
+:jdk16
+echo Shutting down WSO2 Web Services Application Server v1.1
+echo [WARNING] WSO2 WSAS has not been fully tested on JDK 1.6
+set WSO2WSAS_CLASSPATH=%WSO2WSAS_HOME%\lib\bcprov-jdk15-132.jar;%WSO2WSAS_CLASSPATH%
+goto runServer
+
+rem ----------------- Execute The Requested Command ----------------------------
+:runServer
+set WSO2WSAS_CLASSPATH="%WSO2WSAS_HOME%"\conf;%WSO2WSAS_CLASSPATH%
+
+cd %WSO2WSAS_HOME%
+echo  Using WSO2WSAS_HOME:   %WSO2WSAS_HOME%
+echo  Using JAVA_HOME:       %JAVA_HOME%
+
+set JAVA_ENDORSED = "%WSO2WSAS_HOME%\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
+"%JAVA_HOME%\bin\java" -classpath %WSO2WSAS_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dwso2wsas.home="%WSO2WSAS_HOME%" -Daxis2.xml=%WSO2WSAS_HOME%\conf\axis2.xml org.wso2.wsas.Main %CMD%
+
+:end
+endlocal
+

Added: wsas/java/trunk/modules/standalone-edition/bin/shutdown.sh
==============================================================================
--- (empty file)
+++ wsas/java/trunk/modules/standalone-edition/bin/shutdown.sh	Mon Jan 29 07:50:34 2007
@@ -0,0 +1,121 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Stop Script for WSO2 WSAS
+#
+# Environment Variable Prequisites
+#
+#   WSO2WSAS_HOME   Home of WSO2 WSAS installation. If not set I will  try
+#                   to figure it out.
+#
+#   JAVA_HOME       Must point at your Java Development Kit installation.
+#
+#   JAVA_OPTS       (Optional) Java runtime options used when the commands
+#                   is executed.
+#
+# NOTE: Borrowed generously from Apache Tomcat startup scripts.
+# -----------------------------------------------------------------------------
+
+# if JAVA_HOME is not set we're not happy
+if [ -z "$JAVA_HOME" ]; then
+  echo "You must set the JAVA_HOME variable before running WSO2 WSAS."
+  exit 1
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false
+os400=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
+esac
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+
+while [ -h "$PRG" ]; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '.*/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG=`dirname "$PRG"`/"$link"
+  fi
+done
+
+# Get standard environment variables
+PRGDIR=`dirname "$PRG"`
+
+# Only set WSO2WSAS_HOME if not already set
+[ -z "$WSO2WSAS_HOME" ] && WSO2WSAS_HOME=`cd "$PRGDIR/.." ; pwd`
+
+# Set AXIS2_HOME. Needed for One Click JAR Download
+AXIS2_HOME=$WSO2WSAS_HOME
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$WSO2WSAS_HOME" ] && WSO2WSAS_HOME=`cygpath --unix "$WSO2WSAS_HOME"`
+  [ -n "$AXIS2_HOME" ] && WSO2WSAS_HOME=`cygpath --unix "$WSO2WSAS_HOME"`
+  [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For OS400
+if $os400; then
+  # Set job priority to standard for interactive (interactive - 6) by using
+  # the interactive priority - 6, the helper threads that respond to requests
+  # will be running at the same priority as interactive jobs.
+  COMMAND='chgjob job('$JOBNAME') runpty(6)'
+  system $COMMAND
+
+  # Enable multi threading
+  export QIBM_MULTI_THREADED=Y
+fi
+
+# update classpath
+WSO2WSAS_CLASSPATH=""
+for f in "$WSO2WSAS_HOME"/lib/*.jar
+do
+  WSO2WSAS_CLASSPATH="$WSO2WSAS_CLASSPATH":$f
+done
+WSO2WSAS_CLASSPATH="$JAVA_HOME/lib/tools.jar":"$WSO2WSAS_CLASSPATH":"$CLASSPATH"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
+  WSO2WSAS_HOME=`cygpath --absolute --windows "$WSO2WSAS_HOME"`
+  AXIS2_HOME=`cygpath --absolute --windows "$WSO2WSAS_HOME"`
+  CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
+fi
+
+# ---------- Handle the SSL Issue with proper JDK version --------------------
+jdk_15=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.5`
+jdk_16=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.6`
+jdk_14=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.4`
+
+if [ "$jdk_15" ]; then
+   WSO2WSAS_CLASSPATH="$WSO2WSAS_HOME/lib/bcprov-jdk15- at bcprov_jdk15_version@.jar":$WSO2WSAS_CLASSPATH
+elif [ "$jdk_14" ]; then
+   echo " Using JDK 1.4"
+   WSO2WSAS_CLASSPATH="$WSO2WSAS_HOME/lib/bcprov-jdk13- at bcprov_jdk13_version@.jar":$WSO2WSAS_CLASSPATH
+elif [ "$jdk_16" ]; then
+   echo " [WARNING] WSO2 WSAS has not been fully tested on JDK 1.6"
+   WSO2WSAS_CLASSPATH="$WSO2WSAS_HOME/lib/bcprov-jdk15- at bcprov_jdk15_version@.jar":$WSO2WSAS_CLASSPATH
+else
+   echo " Unsupported JDK"
+   echo " [ERROR] WSO2 WSAS is supported only on JDK 1.4 and higher"
+   exit 1
+fi
+
+WSO2WSAS_CLASSPATH="$WSO2WSAS_HOME/conf":"$WSO2WSAS_CLASSPATH"
+
+# ----- Execute The Requested Command -----------------------------------------
+
+cd "$WSO2WSAS_HOME"
+echo " Shutting down WSO2 Web Services Application Server v at wso2wsas_version@"
+echo " Using WSO2WSAS_HOME:   $WSO2WSAS_HOME"
+echo " Using JAVA_HOME:       $JAVA_HOME"
+
+$JAVA_HOME/bin/java -classpath "$WSO2WSAS_CLASSPATH" \
+-Dwso2wsas.home="$WSO2WSAS_HOME" -Daxis2.xml="$WSO2WSAS_HOME/conf/axis2.xml" org.wso2.wsas.Main \
+stop
\ No newline at end of file

Added: wsas/java/trunk/modules/standalone-edition/bin/startup.bat
==============================================================================
--- (empty file)
+++ wsas/java/trunk/modules/standalone-edition/bin/startup.bat	Mon Jan 29 07:50:34 2007
@@ -0,0 +1,129 @@
+ at echo off
+
+REM ---------------------------------------------------------------------------
+REM  Copyright 2005,2006 WSO2, Inc. http://www.wso2.org
+REM
+REM  Licensed under the Apache License, Version 2.0 (the "License");
+REM  you may not use this file except in compliance with the License.
+REM  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0  
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and 
+REM  limitations under the License.
+
+rem ---------------------------------------------------------------------------
+rem Main Script for the WSO2 Web Services Application Server v1.1
+rem
+rem Environment Variable Prequisites
+rem
+rem   WSO2WSAS_HOME   Home of WSO2 WSAS installation. If not set I will  try
+rem                   to figure it out.
+rem
+rem   JAVA_HOME       Must point at your Java Development Kit installation.
+rem
+rem   JAVA_OPTS       (Optional) Java runtime options used when the commands
+rem                   is executed.
+rem ---------------------------------------------------------------------------
+
+rem ----- if JAVA_HOME is not set we're not happy ------------------------------
+:checkJava
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+goto checkServer
+
+:noJavaHome
+echo "You must set the JAVA_HOME variable before running WSO2 WSAS."
+goto end
+
+rem ----- Only set WSO2WSAS_HOME if not already set ----------------------------
+:checkServer
+rem %~sdp0 is expanded pathname of the current script under NT with spaces in the path removed
+if "%WSO2WSAS_HOME%"=="" set WSO2WSAS_HOME=%~sdp0..
+
+rem find WSO2WSAS_HOME if it does not exist due to either an invalid value passed
+rem by the user or the %0 problem on Windows 9x
+if not exist "%WSO2WSAS_HOME%\bin\version.txt" goto noServerHome
+
+set AXIS2_HOME=%WSO2WSAS_HOME%
+goto updateClasspath
+
+:noServerHome
+echo WSO2WSAS_HOME is set incorrectly or WSO2 WSAS could not be located. Please set WSO2WSAS_HOME.
+goto end
+
+rem ----- update classpath -----------------------------------------------------
+:updateClasspath
+
+setlocal EnableDelayedExpansion
+set WSO2WSAS_CLASSPATH=%WSO2WSAS_HOME%\conf
+FOR %%C in (%WSO2WSAS_HOME%\lib\*.jar) DO set WSO2WSAS_CLASSPATH=!WSO2WSAS_CLASSPATH!;./lib/%%~nC%%~xC
+
+set WSO2WSAS_CLASSPATH="%JAVA_HOME%\lib\tools.jar";%WSO2WSAS_CLASSPATH%;%CLASSPATH%
+
+rem ----- Process the input command -------------------------------------------
+
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of arguments (up to the command line limit, anyway).
+
+set CMD=START
+
+:doneStart
+if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
+
+rem ---------- Handle the SSL Issue with proper JDK version --------------------
+rem find the version of the jdk
+:findJdk
+
+"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.4" >NUL
+IF ERRORLEVEL 1 goto checkJdk15
+goto jdk14
+
+:checkJdk15
+"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.5" >NUL
+IF ERRORLEVEL 1 goto checkJdk16
+goto jdk15
+
+:checkJdk16
+"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.6" >NUL
+IF ERRORLEVEL 1 goto unknownJdk
+goto jdk16
+
+:unknownJdk
+echo Starting WSO2 Web Services Application Server v1.1 (in unsupported JDK)
+echo [ERROR] WSO2 WSAS is supported only on JDK 1.4 and higher
+goto end
+
+:jdk14
+echo Starting WSO2 Web Services Application Server v1.1 (in JDK 1.4)
+set WSO2WSAS_CLASSPATH=%WSO2WSAS_HOME%\lib\bcprov-jdk13-132.jar;%WSO2WSAS_CLASSPATH%
+goto runServer
+:jdk15
+echo Starting WSO2 Web Services Application Server v1.1 (in JDK 1.5)
+set WSO2WSAS_CLASSPATH=%WSO2WSAS_HOME%\lib\bcprov-jdk15-132.jar;%WSO2WSAS_CLASSPATH%
+goto runServer
+:jdk16
+echo Starting WSO2 Web Services Application Server v1.1 (in JDK 1.6)
+echo [WARNING] WSO2 WSAS has not been fully tested on JDK 1.6
+set WSO2WSAS_CLASSPATH=%WSO2WSAS_HOME%\lib\bcprov-jdk15-132.jar;%WSO2WSAS_CLASSPATH%
+goto runServer
+
+rem ----------------- Execute The Requested Command ----------------------------
+:runServer
+set WSO2WSAS_CLASSPATH=%WSO2WSAS_HOME%\conf;%WSO2WSAS_CLASSPATH%
+
+cd %WSO2WSAS_HOME%
+echo  Using WSO2WSAS_HOME:   %WSO2WSAS_HOME%
+echo  Using JAVA_HOME:       %JAVA_HOME%
+
+set JAVA_ENDORSED = "%WSO2WSAS_HOME%\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
+start "Web services application server" "%JAVA_HOME%\bin\java" -classpath %WSO2WSAS_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dwso2wsas.home="%WSO2WSAS_HOME%" -Daxis2.xml=%WSO2WSAS_HOME%\conf\axis2.xml org.wso2.wsas.Main %CMD%
+
+:end
+endlocal
+

Added: wsas/java/trunk/modules/standalone-edition/bin/startup.sh
==============================================================================
--- (empty file)
+++ wsas/java/trunk/modules/standalone-edition/bin/startup.sh	Mon Jan 29 07:50:34 2007
@@ -0,0 +1,125 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Startup Script for WSO2 WSAS
+#
+# Environment Variable Prequisites
+#
+#   WSO2WSAS_HOME   Home of WSO2 WSAS installation. If not set I will  try
+#                   to figure it out.
+#
+#   JAVA_HOME       Must point at your Java Development Kit installation.
+#
+#   JAVA_OPTS       (Optional) Java runtime options used when the commands
+#                   is executed.
+#
+# NOTE: Borrowed generously from Apache Tomcat startup scripts.
+# -----------------------------------------------------------------------------
+
+# if JAVA_HOME is not set we're not happy
+if [ -z "$JAVA_HOME" ]; then
+  echo "You must set the JAVA_HOME variable before running WSO2 WSAS."
+  exit 1
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false
+os400=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
+esac
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+
+while [ -h "$PRG" ]; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '.*/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG=`dirname "$PRG"`/"$link"
+  fi
+done
+
+# Get standard environment variables
+PRGDIR=`dirname "$PRG"`
+
+# Only set WSO2WSAS_HOME if not already set
+[ -z "$WSO2WSAS_HOME" ] && WSO2WSAS_HOME=`cd "$PRGDIR/.." ; pwd`
+
+# Set AXIS2_HOME. Needed for One Click JAR Download
+AXIS2_HOME=$WSO2WSAS_HOME
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$WSO2WSAS_HOME" ] && WSO2WSAS_HOME=`cygpath --unix "$WSO2WSAS_HOME"`
+  [ -n "$AXIS2_HOME" ] && WSO2WSAS_HOME=`cygpath --unix "$WSO2WSAS_HOME"`
+  [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For OS400
+if $os400; then
+  # Set job priority to standard for interactive (interactive - 6) by using
+  # the interactive priority - 6, the helper threads that respond to requests
+  # will be running at the same priority as interactive jobs.
+  COMMAND='chgjob job('$JOBNAME') runpty(6)'
+  system $COMMAND
+
+  # Enable multi threading
+  export QIBM_MULTI_THREADED=Y
+fi
+
+# update classpath
+WSO2WSAS_CLASSPATH=""
+for f in "$WSO2WSAS_HOME"/lib/*.jar
+do
+  WSO2WSAS_CLASSPATH="$WSO2WSAS_CLASSPATH":$f
+done
+WSO2WSAS_CLASSPATH="$JAVA_HOME/lib/tools.jar":"$WSO2WSAS_CLASSPATH":"$CLASSPATH"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
+  WSO2WSAS_HOME=`cygpath --absolute --windows "$WSO2WSAS_HOME"`
+  AXIS2_HOME=`cygpath --absolute --windows "$WSO2WSAS_HOME"`
+  CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
+fi
+
+# ---------- Handle the SSL Issue with proper JDK version --------------------
+jdk_15=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.5`
+jdk_16=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.6`
+jdk_14=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.4`
+
+if [ "$jdk_15" ]; then
+   echo " Starting WSO2 Web Services Application Server v at wso2wsas_version@ (in JDK 1.5)"
+   WSO2WSAS_CLASSPATH="$WSO2WSAS_HOME/lib/bcprov-jdk15- at bcprov_jdk15_version@.jar":$WSO2WSAS_CLASSPATH
+elif [ "$jdk_14" ]; then
+   echo " Starting WSO2 Web Services Application Server v at wso2wsas_version@ (in JDK 1.4)"
+   WSO2WSAS_CLASSPATH="$WSO2WSAS_HOME/lib/bcprov-jdk13- at bcprov_jdk13_version@.jar":$WSO2WSAS_CLASSPATH
+elif [ "$jdk_16" ]; then
+   echo " Starting WSO2 Web Services Application Server v at wso2wsas_version@ (in JDK 1.6)"
+   echo " [WARNING] WSO2 WSAS has not been fully tested on JDK 1.6"
+   WSO2WSAS_CLASSPATH="$WSO2WSAS_HOME/lib/bcprov-jdk15- at bcprov_jdk15_version@.jar":$WSO2WSAS_CLASSPATH
+else
+   echo " Starting WSO2 Web Services Application Server v at wso2wsas_version@ (in unsupported JDK)"
+   echo " [ERROR] WSO2 WSAS is supported only on JDK 1.4 and higher"
+   exit 1
+fi
+
+WSO2WSAS_CLASSPATH="$WSO2WSAS_HOME/conf":"$WSO2WSAS_CLASSPATH"
+
+# ----- Execute The Requested Command -----------------------------------------
+
+cd "$WSO2WSAS_HOME"
+echo " Using WSO2WSAS_HOME:   $WSO2WSAS_HOME"
+echo " Using JAVA_HOME:       $JAVA_HOME"
+echo " Start signal posted to WSO2 WSAS."
+echo " Please check the server's log file for startup status."
+
+$JAVA_HOME/bin/java -classpath "$WSO2WSAS_CLASSPATH" \
+$JAVA_OPTS \
+-Dwso2wsas.home="$WSO2WSAS_HOME" -Daxis2.xml="$WSO2WSAS_HOME/conf/axis2.xml" org.wso2.wsas.Main \
+start  >> "$WSO2WSAS_HOME"/logs/wsas.out 2>&1 &

Added: wsas/java/trunk/modules/standalone-edition/bin/version.txt
==============================================================================
--- (empty file)
+++ wsas/java/trunk/modules/standalone-edition/bin/version.txt	Mon Jan 29 07:50:34 2007
@@ -0,0 +1 @@
+WSO2 Web Services Application Server(WSO2 WSAS) v at wso2wsas_version@ - Standalone Edition for Java
\ No newline at end of file

Added: wsas/java/trunk/modules/standalone-edition/bin/wso2wsas.bat
==============================================================================
--- (empty file)
+++ wsas/java/trunk/modules/standalone-edition/bin/wso2wsas.bat	Mon Jan 29 07:50:34 2007
@@ -0,0 +1,215 @@
+ at echo off
+
+REM ---------------------------------------------------------------------------
+REM  Copyright 2005,2006 WSO2, Inc. http://www.wso2.org
+REM
+REM  Licensed under the Apache License, Version 2.0 (the "License");
+REM  you may not use this file except in compliance with the License.
+REM  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0  
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+
+rem ---------------------------------------------------------------------------
+rem Main Script for the WSO2 Web Services Application Server v1.1
+rem
+rem Environment Variable Prequisites
+rem
+rem   WSO2WSAS_HOME   Home of WSO2 WSAS installation. If not set I will  try
+rem                   to figure it out.
+rem
+rem   JAVA_HOME       Must point at your Java Development Kit installation.
+rem
+rem   JAVA_OPTS       (Optional) Java runtime options used when the commands
+rem                   is executed. 
+rem ---------------------------------------------------------------------------
+
+rem ----- if JAVA_HOME is not set we're not happy ------------------------------
+:checkJava
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+goto checkServer
+
+:noJavaHome
+echo "You must set the JAVA_HOME variable before running WSO2 WSAS."
+goto end
+
+rem ----- Only set WSO2WSAS_HOME if not already set ----------------------------
+:checkServer
+rem %~sdp0 is expanded pathname of the current script under NT with spaces in the path removed
+if "%WSO2WSAS_HOME%"=="" set WSO2WSAS_HOME=%~sdp0..
+
+rem find WSO2WSAS_HOME if it does not exist due to either an invalid value passed
+rem by the user or the %0 problem on Windows 9x
+if not exist "%WSO2WSAS_HOME%\bin\version.txt" goto noServerHome
+
+set AXIS2_HOME=%WSO2WSAS_HOME%
+goto updateClasspath
+
+:noServerHome
+echo WSO2WSAS_HOME is set incorrectly or WSO2 WSAS could not be located. Please set WSO2WSAS_HOME.
+goto end
+
+rem ----- update classpath -----------------------------------------------------
+:updateClasspath
+
+setlocal EnableDelayedExpansion
+set WSO2WSAS_CLASSPATH=%WSO2WSAS_HOME%\conf
+FOR %%C in (%WSO2WSAS_HOME%\lib\*.jar) DO set WSO2WSAS_CLASSPATH=!WSO2WSAS_CLASSPATH!;./lib/%%~nC%%~xC
+
+set WSO2WSAS_CLASSPATH="%JAVA_HOME%\lib\tools.jar";%WSO2WSAS_CLASSPATH%;%CLASSPATH%
+
+rem ----- Process the input command -------------------------------------------
+
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of arguments (up to the command line limit, anyway).
+
+set CMD=RUN
+
+:setupArgs
+if ""%1""=="""" goto doneStart
+if ""%1""==""-start""   goto commandLifecycle
+if ""%1""==""--start""   goto commandLifecycle
+if ""%1""==""start""   goto commandLifecycle
+
+if ""%1""==""-run""     goto commandLifecycle
+if ""%1""==""--run""     goto commandLifecycle
+if ""%1""==""run""     goto commandLifecycle
+
+if ""%1""==""-restart"" goto commandLifecycle
+if ""%1""==""--restart"" goto commandLifecycle
+if ""%1""==""restart"" goto commandLifecycle
+
+if ""%1""==""-stop""    goto commandLifecycle
+if ""%1""==""--stop""    goto commandLifecycle
+if ""%1""==""stop""    goto commandLifecycle
+
+if ""%1""==""debug""    goto commandDebug
+if ""%1""==""-debug""   goto commandDebug
+if ""%1""==""--debug""  goto commandDebug
+
+if ""%1""==""version"" goto commandVersion
+if ""%1""==""-version"" goto commandVersion
+if ""%1""==""--version"" goto commandVersion
+
+if ""%1""==""help""     goto getHelp
+if ""%1""==""-help""    goto getHelp
+if ""%1""==""--help""   goto getHelp
+if ""%1""==""?""        goto getHelp
+if ""%1""==""-?""       goto getHelp
+
+shift
+goto setupArgs
+
+rem ----- commandVersion -------------------------------------------------------
+:commandVersion
+shift
+echo WSO2 WSAS v 1.1 Standalone Edition
+goto end
+
+rem ----- commandDebug ---------------------------------------------------------
+:commandDebug
+shift
+set DEBUG_PORT=%1
+if "%DEBUG_PORT%"=="" goto noDebugPort
+echo Starting WSO2 Web Services Application Server v1.1 in debug mode
+set JAVA_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=%DEBUG_PORT%
+goto findJdk
+
+:noDebugPort
+echo Please specify the debug port after the --debug option
+goto end
+
+rem ----- commandLifecycle -----------------------------------------------------
+:commandLifecycle
+set CMD=%1
+goto findJdk
+
+rem ----- getHelp --------------------------------------------------------------
+:getHelp
+  echo Usage: wso2wsas.bat ( commands ... )
+  echo commands:
+  echo   --start        Start WSO2 WSAS as a background process
+  echo   --run          Run WSO2 WSAS
+  echo   --restart      Restart WSO2 WSAS
+  echo   --stop         Stop WSO2 WSAS
+  echo   --debug        Start WSO2 WSAS in remote debugging mode. You need to specify the debugging port after this argument.
+  echo   --version      What version of WSO2 WSAS are you running?
+goto end
+
+rem ----- doneStart ------------------------------------------------------------
+rem This label provides a place for the argument list loop to break out
+rem and for NT handling to skip to.
+
+:doneStart
+if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
+
+rem ---------- Handle the SSL Issue with proper JDK version --------------------
+rem find the version of the jdk
+:findJdk
+
+"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.4" >NUL
+IF ERRORLEVEL 1 goto checkJdk15
+goto jdk14
+
+:checkJdk15
+"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.5" >NUL
+IF ERRORLEVEL 1 goto checkJdk16
+goto jdk15
+
+:checkJdk16
+"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.6" >NUL
+IF ERRORLEVEL 1 goto unknownJdk
+goto jdk16
+
+:unknownJdk
+echo Starting WSO2 Web Services Application Server v1.1 (in unsupported JDK)
+echo [ERROR] WSO2 WSAS is supported only on JDK 1.4 and higher
+goto end
+
+:jdk14
+  echo Starting WSO2 Web Services Application Server v1.1 (in JDK 1.4)
+  set WSO2WSAS_CLASSPATH=%WSO2WSAS_HOME%\lib\bcprov-jdk13-132.jar;%WSO2WSAS_CLASSPATH%
+	goto runServer
+:jdk15
+  echo Starting WSO2 Web Services Application Server v1.1 (in JDK 1.5)
+  set WSO2WSAS_CLASSPATH=%WSO2WSAS_HOME%\lib\bcprov-jdk15-132.jar;%WSO2WSAS_CLASSPATH%
+	goto runServer
+:jdk16
+  echo Starting WSO2 Web Services Application Server v1.1 (in JDK 1.6)
+  echo [WARNING] WSO2 WSAS has not been fully tested on JDK 1.6
+  set WSO2WSAS_CLASSPATH=%WSO2WSAS_HOME%\lib\bcprov-jdk15-132.jar;%WSO2WSAS_CLASSPATH%
+	goto runServer
+
+rem ----------------- Execute The Requested Command ----------------------------
+
+:runServer
+set WSO2WSAS_CLASSPATH=%WSO2WSAS_HOME%\conf;%WSO2WSAS_CLASSPATH%
+
+cd %WSO2WSAS_HOME%
+echo  Using WSO2WSAS_HOME:   %WSO2WSAS_HOME%
+echo  Using JAVA_HOME:       %JAVA_HOME%
+
+set JAVA_ENDORSED = "%WSO2WSAS_HOME%\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
+
+if ""%1""==""-start""   goto startNewPrompt
+if ""%1""==""--start""   goto startNewPrompt
+if ""%1""==""start""   goto startNewPrompt
+
+"%JAVA_HOME%\bin\java" -classpath %WSO2WSAS_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Daxis2.xml=%WSO2WSAS_HOME%\conf\axis2.xml org.wso2.wsas.Main %CMD%
+
+:end
+endlocal
+
+:startNewPrompt
+start "Web Services Application Server" "%JAVA_HOME%\bin\java" -classpath %WSO2WSAS_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dwso2wsas.home="%WSO2WSAS_HOME%" -Daxis2.xml=%WSO2WSAS_HOME%\conf\axis2.xml org.wso2.wsas.Main %CMD%
+endlocal
+
+

Added: wsas/java/trunk/modules/standalone-edition/bin/wso2wsas.sh
==============================================================================
--- (empty file)
+++ wsas/java/trunk/modules/standalone-edition/bin/wso2wsas.sh	Mon Jan 29 07:50:34 2007
@@ -0,0 +1,176 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+#  Copyright 2005,2006 WSO2, Inc. http://www.wso2.org
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+# ----------------------------------------------------------------------------
+# Main Script for the WSO2 Web Services Application Server v at wso2wsas_version@
+#
+# Environment Variable Prequisites
+#
+#   WSO2WSAS_HOME   Home of WSO2 WSAS installation. If not set I will  try
+#                   to figure it out.
+#
+#   JAVA_HOME       Must point at your Java Development Kit installation.
+#
+#   JAVA_OPTS       (Optional) Java runtime options used when the commands
+#                   is executed.
+#
+# NOTE: Borrowed generously from Apache Tomcat startup scripts.
+# -----------------------------------------------------------------------------
+
+# if JAVA_HOME is not set we're not happy
+if [ -z "$JAVA_HOME" ]; then
+  echo "You must set the JAVA_HOME variable before running WSO2 WSAS."
+  exit 1
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false
+os400=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
+esac
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+
+while [ -h "$PRG" ]; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '.*/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG=`dirname "$PRG"`/"$link"
+  fi
+done
+
+# Get standard environment variables
+PRGDIR=`dirname "$PRG"`
+
+# Only set WSO2WSAS_HOME if not already set
+[ -z "$WSO2WSAS_HOME" ] && WSO2WSAS_HOME=`cd "$PRGDIR/.." ; pwd`
+
+# Set AXIS2_HOME. Needed for One Click JAR Download
+AXIS2_HOME=$WSO2WSAS_HOME
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$WSO2WSAS_HOME" ] && WSO2WSAS_HOME=`cygpath --unix "$WSO2WSAS_HOME"`
+  [ -n "$AXIS2_HOME" ] && WSO2WSAS_HOME=`cygpath --unix "$WSO2WSAS_HOME"`
+  [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For OS400
+if $os400; then
+  # Set job priority to standard for interactive (interactive - 6) by using
+  # the interactive priority - 6, the helper threads that respond to requests
+  # will be running at the same priority as interactive jobs.
+  COMMAND='chgjob job('$JOBNAME') runpty(6)'
+  system $COMMAND
+
+  # Enable multi threading
+  export QIBM_MULTI_THREADED=Y
+fi
+
+# update classpath
+WSO2WSAS_CLASSPATH=""
+for f in "$WSO2WSAS_HOME"/lib/*.jar
+do
+  WSO2WSAS_CLASSPATH="$WSO2WSAS_CLASSPATH":$f
+done
+WSO2WSAS_CLASSPATH="$JAVA_HOME/lib/tools.jar":"$WSO2WSAS_CLASSPATH":"$CLASSPATH"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
+  WSO2WSAS_HOME=`cygpath --absolute --windows "$WSO2WSAS_HOME"`
+  AXIS2_HOME=`cygpath --absolute --windows "$WSO2WSAS_HOME"`
+  CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
+fi
+
+export SERVER_NAME="WSO2 Web Services Application Server, Standalone Edition, v at wso2wsas_version@"
+
+# ----- Process the input command ----------------------------------------------
+if [ "$1" = "" ]; then
+ CMD="RUN"
+elif [ "$1" = "-help" ] || [ "$1" = "--help" ] || [ "$1" = "help" ] || [ "$1" = "?" ]; then
+  echo "Usage: wso2wsas.sh ( commands ... )"
+  echo "commands:"
+  echo "  --start        Start WSO2 WSAS as a background process"
+  echo "  --run          Run WSO2 WSAS"
+  echo "  --restart      Restart WSO2 WSAS"
+  echo "  --stop         Stop WSO2 WSAS"
+  echo "  --debug        Start WSO2 WSAS in remote debugging mode.\
+  You need to specify the debugging port after this argument."
+  echo "  -version       What version of WSO2 WSAS are you running?"
+  exit 1
+elif [ "$1" = "-version" ] || [ "$1" = "--version" ] || [ "$1" = "version" ]; then
+  echo " WSO2 WSAS v @wso2wsas_version@ Standalone Edition"
+  exit 0
+elif [ "$1" = "-stop" ]  || [ "$1" = "--stop" ] || [ "$1" = "stop" ]; then
+  sh "$WSO2WSAS_HOME"/bin/shutdown.sh
+  exit 0
+elif [ "$1" = "-start" ]  || [ "$1" = "--start" ] || [ "$1" = "start" ]; then
+  sh "$WSO2WSAS_HOME"/bin/startup.sh
+  exit 0
+elif [ "$1" = "-debug" ]  || [ "$1" = "--debug" ] || [ "$1" = "debug" ]; then
+  echo " Starting $SERVER_NAME in debug mode"
+  if [ "$2" = "" ]; then
+    echo " Please specify the debug port after the --debug option"
+    exit 1
+  fi
+  CMD="RUN"
+  JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=$2"
+else
+  CMD="$1"
+fi
+
+# ---------- Handle the SSL Issue with proper JDK version --------------------
+jdk_15=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.5`
+jdk_16=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.6`
+jdk_14=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.4`
+
+if [ "$jdk_15" ]; then
+   echo " Starting $SERVER_NAME  (in JDK 1.5)"
+   WSO2WSAS_CLASSPATH="$WSO2WSAS_HOME/lib/bcprov-jdk15- at bcprov_jdk15_version@.jar":$WSO2WSAS_CLASSPATH
+elif [ "$jdk_14" ]; then
+   echo " Starting $SERVER_NAME (in JDK 1.4)"
+   WSO2WSAS_CLASSPATH="$WSO2WSAS_HOME/lib/bcprov-jdk13- at bcprov_jdk13_version@.jar":$WSO2WSAS_CLASSPATH
+elif [ "$jdk_16" ]; then
+   echo " Starting $SERVER_NAME (in JDK 1.6)"
+   echo " [WARNING] WSO2 WSAS has not been fully tested on JDK 1.6"
+   WSO2WSAS_CLASSPATH="$WSO2WSAS_HOME/lib/bcprov-jdk15- at bcprov_jdk15_version@.jar":$WSO2WSAS_CLASSPATH
+else
+   echo " Starting $SERVER_NAME (in unsupported JDK)"
+   echo " [ERROR] WSO2 WSAS is supported only on JDK 1.4 and higher"
+   exit 1
+fi
+
+WSO2WSAS_CLASSPATH="$WSO2WSAS_HOME/conf":"$WSO2WSAS_CLASSPATH"
+
+# ----- Execute The Requested Command -----------------------------------------
+
+cd "$WSO2WSAS_HOME"
+echo " Using WSO2WSAS_HOME:   $WSO2WSAS_HOME"
+echo " Using JAVA_HOME:       $JAVA_HOME"
+
+$JAVA_HOME/bin/java -classpath "$WSO2WSAS_CLASSPATH" \
+$JAVA_OPTS \
+-Djava.endorsed.dirs="$WSO2WSAS_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
+-Dwso2wsas.home="$WSO2WSAS_HOME" -Daxis2.xml="$WSO2WSAS_HOME/conf/axis2.xml" org.wso2.wsas.Main \
+$CMD
\ No newline at end of file

Added: wsas/java/trunk/modules/standalone-edition/conf/axis2.xml
==============================================================================
--- (empty file)
+++ wsas/java/trunk/modules/standalone-edition/conf/axis2.xml	Mon Jan 29 07:50:34 2007
@@ -0,0 +1,288 @@
+<axisconfig name="AxisJava2.0">
+
+    <!-- ================================================= -->
+    <!-- Globally engaged modules -->
+    <!-- ================================================= -->
+    <module ref="addressing"/>
+    <module ref="wso2statistics"/>
+    <module ref="wso2tracer"/>
+
+    <!-- ================================================= -->
+    <!-- Parameters -->
+    <!-- ================================================= -->
+    <parameter name="hotdeployment" locked="false">true</parameter>
+    <parameter name="hotupdate" locked="false">false</parameter>
+    <parameter name="enableMTOM" locked="false">false</parameter>
+    <parameter name="cacheAttachments" locked="false">true</parameter>
+    <parameter name="attachmentDIR" locked="false">work/mtom</parameter>
+    <parameter name="sizeThreshold" locked="false">4000</parameter>
+    <parameter name="wso2wsf.tracer.trace.filter.impl" locked="false">
+        org.wso2.wsas.util.TraceFilterImpl
+    </parameter>
+    <parameter name="wso2wsf.tracer.trace.persister.impl" locked="false">
+        org.wso2.wsas.util.TracePersisterImpl
+    </parameter>
+
+     <!-- Following parameter will completely disable REST handling in both the servlets-->
+    <parameter name="disableREST" locked="true">false</parameter>
+
+    <!-- This will disable the separate servlet we have for REST handling. -->
+    <parameter name="disableSeparateEndpointForREST" locked="true">false</parameter>
+    
+    <parameter name="Sandesha2StorageManager" locked="false">inmemory</parameter>
+
+    <!-- This deployment interceptor will be called whenever before a module is initialized or
+     service is deployed -->
+    <listener class="org.wso2.wsas.deployment.DeploymentInterceptor"/>
+    <listener class="org.wso2.wsas.feed.FeedListener"/>
+
+    <!-- setting contextPath and servicePath-->
+    <parameter name="contextRoot" locked="false">/</parameter>
+    <parameter name="servicePath" locked="false">soap</parameter>
+    <parameter name="restPath" locked="false">rest</parameter>
+
+    <parameter name="userAgent" locked="true">WSO2 WSAS for Java - Version @wso2wsas_version@</parameter>
+    <parameter name="server" locked="true">WSO2 WSAS for Java - Version @wso2wsas_version@</parameter>
+
+    <!-- ========================================================================-->
+
+    <!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
+    <!--that behaviour.-->
+    <parameter name="sendStacktraceDetailsWithFaults" locked="false">true</parameter>
+
+    <!--If there aren't any information available to find out the fault reason, we set the message of the expcetion-->
+    <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be -->
+    <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag-->
+    <!--is set then, Axis2 tries to get the first exception and set its message as the faultreason/Reason.-->
+    <parameter name="DrillDownToRootCauseForFaultReason" locked="false">true</parameter>
+
+    <!--Set the flag to true if you want to enable transport level session mangment-->
+    <parameter name="manageTransportSession" locked="false">true</parameter>
+
+    <!-- ================================================= -->
+    <!-- Message Receivers -->
+    <!-- ================================================= -->
+    <!--This is the Default Message Receiver for the system , if you want to have MessageReceivers for -->
+    <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
+    <!--any operation -->
+    <!--Note : You can ovride this for particular service by adding the same element with your requirement-->
+    <messageReceivers>
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+    </messageReceivers>
+
+    <!-- ================================================= -->
+    <!-- In Transports -->
+    <!-- ================================================= -->
+    <transportReceiver name="http"
+                       class="org.wso2.wsas.transport.jetty.HttpTransportListener">
+        <parameter name="port" locked="false">9762</parameter>
+    </transportReceiver>
+
+    <transportReceiver name="https"
+                       class="org.wso2.wsas.transport.jetty.HttpsTransportListener">
+        <parameter name="port" locked="false">9443</parameter>
+        <parameter name="max.idle.time.ms" locked="false">30000</parameter>
+        <parameter name="low.resources" locked="false">30</parameter>
+        <parameter name="low.resource.persist.time.ms" locked="false">2000</parameter>
+        <parameter name="keystore" locked="false">
+            <wso2wsas:KeyStore xmlns:wso2wsas="http://www.wso2.org/products/wsas">
+                <!-- Key store file location-->
+                <wso2wsas:Location>conf/wso2wsas.jks</wso2wsas:Location>
+                <!-- Key store type (JKS/PKCS12 etc.)-->
+                <wso2wsas:Type>JKS</wso2wsas:Type>
+                <!-- Key store password-->
+                <wso2wsas:Password>wso2wsas</wso2wsas:Password>
+                <!-- Private Key password-->
+                <wso2wsas:KeyPassword>wso2wsas</wso2wsas:KeyPassword>
+            </wso2wsas:KeyStore>
+        </parameter>
+    </transportReceiver>
+
+    <!--
+       Uncomment the following to enable Apache2 mod_proxy. The port on the Apache server is 80
+       in this case.
+    -->
+    <!--transportReceiver name="mod_proxy/http"
+                       class="org.wso2.utils.transport.http.GenericHttpTransportListener">
+        <parameter name="port" locked="false">80</parameter>
+    </transportReceiver-->
+
+    <!--
+       Uncomment the following to enable Apache2 mod_proxy. The port on the Apache server is 443
+       in this case.
+    -->
+    <!--transportReceiver name="mod_proxy/https"
+                       class="rg.wso2.wsf.common.transport.http.GenericHttpsTransportListener">
+        <parameter name="port" locked="false">443</parameter>
+    </transportReceiver-->
+
+    <!--
+       Uncomment the following segment to enable TCP transport.
+       Note : Addressing module should be engaged for TCP transport to work
+    -->
+    <!--<transportReceiver name="tcp"
+                       class="org.apache.axis2.transport.tcp.TCPServer">
+        <parameter name="port" locked="false">6667</parameter>
+    </transportReceiver>-->
+
+    <!--
+     To Enable SimpleMailListener, please change the configuration
+     parameters and uncomment the following
+    -->
+    <!--<transportReceiver name="mailto" class="org.apache.axis2.transport.mail.SimpleMailListener">
+        <parameter name="mail.pop3.host" locked="false">localhost</parameter>
+        <parameter name="mail.pop3.user" locked="false">red</parameter>
+        <parameter name="mail.store.protocol" locked="false">pop3</parameter>
+        <parameter name="transport.mail.pop3.password" locked="false">red</parameter>
+        <parameter name="transport.mail.replyToAddress" locked="false">red at localhost</parameter>
+        <parameter name="transport.listener.interval">3000</parameter>
+    </transportReceiver>-->
+
+    <!--
+      Uncomment this and configure as appropriate for JMS transport support,
+      after setting up your JMS environment (e.g. ActiveMQ)
+    -->
+    <!--<transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
+        <parameter name="myTopicConnectionFactory" locked="false">
+        	<parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+        	<parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
+        	<parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter>
+        </parameter>
+
+        <parameter name="myQueueConnectionFactory" locked="false">
+        	<parameter name="java.naming.factory.initial" locked="false"