[wsas-java-dev] svn commit r103 - in wsas/java/trunk: . etc
modules/core/bin modules/www/extensions/core/js
svn at wso2.com
svn at wso2.com
Sat Dec 2 01:07:05 PST 2006
Author: azeez
Date: Sat Dec 2 01:07:04 2006
New Revision: 103
Modified:
wsas/java/trunk/etc/src-dist-project.properties
wsas/java/trunk/maven.xml
wsas/java/trunk/modules/core/bin/shutdown.bat
wsas/java/trunk/modules/core/bin/startup.bat
wsas/java/trunk/modules/core/bin/wso2wsas.bat
wsas/java/trunk/modules/www/extensions/core/js/registration.js
wsas/java/trunk/project.properties
wsas/java/trunk/project.xml
Log:
1. Updated registration page URL
2. Do not send bat files thru ant filters since if you do this on Linux, the bat files may not work on Windows since the EOL chars are different
3. Changed Woden version
Modified: wsas/java/trunk/etc/src-dist-project.properties
==============================================================================
--- wsas/java/trunk/etc/src-dist-project.properties (original)
+++ wsas/java/trunk/etc/src-dist-project.properties Sat Dec 2 01:07:04 2006
@@ -71,9 +71,9 @@
sandesha2.version=@sandesha2_version@
wss4j.version=@wss4j_version@
XmlSchema.version=@XmlSchema_version@
-axiom.version=@axiom_version@
-woden.version=@woden_version@
+axiom.version=1.2.1
+woden.version=1.0.0M6
neethi.version=2.0
ant.version=1.6.5
antlr.version=2.7.5H3
Modified: wsas/java/trunk/maven.xml
==============================================================================
--- wsas/java/trunk/maven.xml (original)
+++ wsas/java/trunk/maven.xml Sat Dec 2 01:07:04 2006
@@ -808,8 +808,20 @@
<!--copy all the scripts in to the bin-->
<ant:copy todir="${dist.temp.dir}/bin" filtering="on">
- <ant:fileset dir="modules/core/bin"/>
- <ant:fileset dir="modules/wsf-common-tools/bin"/>
+ <ant:fileset dir="modules/core/bin">
+ <ant:exclude name="**/*.bat"/>
+ </ant:fileset>
+ <ant:fileset dir="modules/wsf-common-tools/bin">
+ <ant:exclude name="**/*.bat"/>
+ </ant:fileset>
+ </ant:copy>
+ <ant:copy todir="${dist.temp.dir}/bin">
+ <ant:fileset dir="modules/core/bin">
+ <ant:include name="**/*.bat"/>
+ </ant:fileset>
+ <ant:fileset dir="modules/wsf-common-tools/bin">
+ <ant:include name="**/*.bat"/>
+ </ant:fileset>
</ant:copy>
<!--copy samples in to the dist -->
@@ -948,7 +960,7 @@
<ant:copy
tofile="${dist.temp.dir}/repository/modules/throttle-${wso2wsas.version}.mar"
file="modules/wsf-common-core/target/throttle-${wso2wsas.version}.mar"/>
- <ant:copy
+ <ant:copy
tofile="${dist.temp.dir}/repository/modules/mex-${wso2wsas.version}.mar"
file="modules/wsf-common-core/target/mex-${wso2wsas.version}.mar"/>
@@ -967,7 +979,8 @@
src="${dist.temp.dir}/lib/wso2-adminui-graphs-zip-${wso2.adminui.version}.zip"
dest="${dist.dir.temp.www}"/>
- <ant:delete file="${dist.temp.dir}/lib/wso2-adminui-graphs-zip-${wso2.adminui.version}.zip"/>
+ <ant:delete
+ file="${dist.temp.dir}/lib/wso2-adminui-graphs-zip-${wso2.adminui.version}.zip"/>
<ant:delete file="${dist.temp.dir}/lib/wso2-adminui-zip-${wso2.adminui.version}.zip"/>
<!--copy admin web app-->
Modified: wsas/java/trunk/modules/core/bin/shutdown.bat
==============================================================================
--- wsas/java/trunk/modules/core/bin/shutdown.bat (original)
+++ wsas/java/trunk/modules/core/bin/shutdown.bat Sat Dec 2 01:07:04 2006
@@ -16,7 +16,7 @@
REM limitations under the License.
rem ---------------------------------------------------------------------------
-rem Main Script for the WSO2 Web Services Application Server v at wso2wsas_version@
+rem Main Script for the WSO2 Web Services Application Server v1.1
rem
rem Environment Variable Prequisites
rem
@@ -95,20 +95,20 @@
goto jdk16
:unknownJdk
-echo Shutting down WSO2 Web Services Application Server v at wso2wsas_version@
+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 v at wso2wsas_version@
+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 v at wso2wsas_version@
+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 v at wso2wsas_version@
+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
Modified: wsas/java/trunk/modules/core/bin/startup.bat
==============================================================================
--- wsas/java/trunk/modules/core/bin/startup.bat (original)
+++ wsas/java/trunk/modules/core/bin/startup.bat Sat Dec 2 01:07:04 2006
@@ -16,7 +16,7 @@
REM limitations under the License.
rem ---------------------------------------------------------------------------
-rem Main Script for the WSO2 Web Services Application Server v at wso2wsas_version@
+rem Main Script for the WSO2 Web Services Application Server v1.1
rem
rem Environment Variable Prequisites
rem
@@ -95,20 +95,20 @@
goto jdk16
:unknownJdk
-echo Starting WSO2 Web Services Application Server v at wso2wsas_version@ (in unsupported JDK)
+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 v at wso2wsas_version@ (in JDK 1.4)
+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 v at wso2wsas_version@ (in JDK 1.5)
+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 v at wso2wsas_version@ (in JDK 1.6)
+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
Modified: wsas/java/trunk/modules/core/bin/wso2wsas.bat
==============================================================================
--- wsas/java/trunk/modules/core/bin/wso2wsas.bat (original)
+++ wsas/java/trunk/modules/core/bin/wso2wsas.bat Sat Dec 2 01:07:04 2006
@@ -16,7 +16,7 @@
REM limitations under the License.
rem ---------------------------------------------------------------------------
-rem Main Script for the WSO2 Web Services Application Server v at wso2wsas_version@
+rem Main Script for the WSO2 Web Services Application Server v1.1
rem
rem Environment Variable Prequisites
rem
@@ -110,7 +110,7 @@
rem ----- commandVersion -------------------------------------------------------
:commandVersion
shift
-echo WSO2 WSAS v @wso2wsas_version@ Standalone Edition
+echo WSO2 WSAS v 1.1 Standalone Edition
goto end
rem ----- commandDebug ---------------------------------------------------------
@@ -118,7 +118,7 @@
shift
set DEBUG_PORT=%1
if "%DEBUG_PORT%"=="" goto noDebugPort
-echo Starting WSO2 Web Services Application Server v at wso2wsas_version@ in debug mode
+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
@@ -170,20 +170,20 @@
goto jdk16
:unknownJdk
-echo Starting WSO2 Web Services Application Server v at wso2wsas_version@ (in unsupported JDK)
+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 v at wso2wsas_version@ (in JDK 1.4)
+ 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 v at wso2wsas_version@ (in JDK 1.5)
+ 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 v at wso2wsas_version@ (in JDK 1.6)
+ 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
Modified: wsas/java/trunk/modules/www/extensions/core/js/registration.js
==============================================================================
--- wsas/java/trunk/modules/www/extensions/core/js/registration.js (original)
+++ wsas/java/trunk/modules/www/extensions/core/js/registration.js Sat Dec 2 01:07:04 2006
@@ -7,10 +7,10 @@
var strHTML = "<h2>Register product</h2>" +
"<p>Thank you for downloading @server_name at .</p>" +
"<p>Technical information requested will help us improve the product and better serve customer needs. Registration will also help us provide fast and effective support services to our users.</p>" +
- "<p>All information will be sent directly to WSO2. Please note that you will be registered in the WSO2 developer portal <a href=\"http://www.wso2.net\" target=\"_blank\">Oxygen Tank</a> in the near future as well.</p>" +
+ "<p>All information will be sent directly to WSO2. Please note that you will be registered in the WSO2 developer portal <a href=\"http://www.wso2.org\" target=\"_blank\">Oxygen Tank</a> in the near future as well.</p>" +
"<p>Kindly use the form below for registration. Note that registration is entirely voluntary and failure to complete or submit this form will not diminish any rights.</p>" +
"<p>Also it is not mandatory to fill in all the fields in the form for submission.</p>" +
- "<div id='formset'>" + "<form method='post' action='https://tools.wso2.net/registerTungstenJava.php' target='_blank'>" +
+ "<div id='formset'>" + "<form method='post' action='https://www.wso2.org/projects/wsas/java/registration.php' target='_blank'>" +
"<fieldset style='border: 0px;'>" +
"<legend>The following information will be sent to WSO2</legend>" +
"<br/>" +
Modified: wsas/java/trunk/project.properties
==============================================================================
--- wsas/java/trunk/project.properties (original)
+++ wsas/java/trunk/project.properties Sat Dec 2 01:07:04 2006
@@ -71,9 +71,9 @@
sandesha2.version=1.1-SNAPSHOT
wss4j.version=SNAPSHOT
XmlSchema.version=SNAPSHOT
-axiom.version=1.2.1
-woden.version=SNAPSHOT
+axiom.version=1.2.1
+woden.version=1.0.0M6
neethi.version=2.0
ant.version=1.6.5
antlr.version=2.7.5H3
Modified: wsas/java/trunk/project.xml
==============================================================================
--- wsas/java/trunk/project.xml (original)
+++ wsas/java/trunk/project.xml Sat Dec 2 01:07:04 2006
@@ -30,9 +30,10 @@
<!-- repository></repository -->
<repository>
- <connection>scm:svn:https://www-lk.wso2.org/wso2/svn/proj/wso2wsas/trunk/java</connection>
+ <connection>scm:svn:http://wso2.org/repos/wso2/wsas/java/trunk</connection>
<developerConnection>
- scm:svn:https://www-lk.wso2.org/wso2/svn/proj/wso2wsas/trunk/java</developerConnection>
+ scm:svn:https://wso2.org/repos/wso2/wsas/java/trunk
+ </developerConnection>
<url></url>
</repository>
@@ -649,7 +650,7 @@
<artifactId>sandesha2</artifactId>
<version>${sandesha2.version}</version>
<type>mar</type>
- <url>http://www-lk.wso2.org/maven/</url>
+ <url>http://dist.wso2.org/maven/</url>
</dependency>
<dependency>
<groupId>org.apache.sandesha2</groupId>
More information about the Wsas-java-dev
mailing list