Merge pull request #284 from nirmal070125/master

Updating version to 110 in release note, readme and remove install.txt
wso2-attic · Dec 19, 2015 · 5762bc2 · 5762bc2
2 parents 62a6a54 + dfe7261
commit 5762bc2
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 93 deletions.
diff --git a/docs/xdoc/index.xml b/docs/xdoc/index.xml
@@ -58,17 +58,19 @@
             other WSO2 products.
         </p>
 
-        <h2>Key Features</h2>
+        <h2>New Features in this release</h2>
 
             <ul>
-                <li>Wizard like pipeline</li>
-                <li>Assisted model building</li>
-                <li>Data exploration utility</li>
+		<li>Deep learning algorithm support.</li>
+		<li>Anomaly detection algorithm support.</li>
+		<li>Recommendation algorithm support.</li>
+		<li>Supports the PMML format when downloading models</li>
+		<li>UI improvements.</li>
             </ul>
 
         <h2>@product.name@ - Documentation</h2>
 
-        <p>See the <a href="http://docs.wso2.org/display/ML100/">Wiki docs of v@product.version@</a>for instructions on
+        <p>See the <a href="http://docs.wso2.org/display/ML110/">Wiki docs of v@product.version@</a>for instructions on
             installation, administration and running samples with @product.name@, v@product.version@</p>
 
     </body>

diff --git a/modules/distribution/INSTALL.txt b/modules/distribution/INSTALL.txt
diff --git a/modules/distribution/README.txt b/modules/distribution/README.txt
@@ -1,8 +1,8 @@
 ================================================================================
-                        WSO2 Machine Learner 1.0.0
+                        WSO2 Machine Learner 1.1.0
 ================================================================================
 
-Welcome to the WSO2 Machine Learner 1.0.0 release
+Welcome to the WSO2 Machine Learner 1.1.0 release
 
 WSO2 Machine Learner provides a user friendly wizard like interface, which guides users through
 a set of steps to find and configure machine learning algorithms. The outcome of this process is a
@@ -33,7 +33,7 @@ System Requirements
 Installation & Running
 ======================
 
-1. Extract the wso2ml-1.0.0.zip and go to the extracted directory
+1. Extract the wso2ml-1.1.0.zip and go to the extracted directory
 2. Run the wso2server.sh or wso2server.bat as appropriate
 3. Point your favourite browser to
 
@@ -45,7 +45,7 @@ Installation & Running
     password : admin
 
 
-WSO2 Machine Learner 1.0.0 distribution directory structure
+WSO2 Machine Learner 1.1.0 distribution directory structure
 ===========================================================
 
 	CARBON_HOME
@@ -115,11 +115,8 @@ WSO2 Machine Learner 1.0.0 distribution directory structure
     - README.txt
       This document.
 
-    - INSTALL.txt
-      This document will contain information on installing WSO2 Machine Learner.
-
     - release-notes.html
-      Release information for WSO2 Machine Learner 1.0.0
+      Release information for WSO2 Machine Learner 1.1.0
 
 Support
 ==================================

diff --git a/modules/distribution/release-notes.html b/modules/distribution/release-notes.html
@@ -16,14 +16,14 @@
 <html>
     <head>
         <meta http-equiv="content-type" content=""/>
-        <title>WSO2 Machine Learner 1.0.0 Release
+        <title>WSO2 Machine Learner 1.1.0 Release
             Notes</title>
     </head>
 
     <body>
-        <h1>WSO2 Machine Learner 1.0.0 Release Notes</h1>
+        <h1>WSO2 Machine Learner 1.1.0 Release Notes</h1>
 
-        <p>The WSO2 Machine Learner team is pleased to announce the 1.0.0
+        <p>The WSO2 Machine Learner team is pleased to announce the 1.1.0
             release of the WSO2 Machine Learner.
 
             The WSO2 Machine Learner provides a user friendly wizard like interface, which guides users through
@@ -37,13 +37,14 @@ <h1>WSO2 Machine Learner 1.0.0 Release Notes</h1>
         We are striving for a simple and happy first time user experience as well as a
         satisfying experienced user experience with this release.
 
-        <h2>Key Features</h2>
+        <h2>New Features added in this release compared to 1.0.0</h2>
 
         <ul>
-            <li>Data exploration</li>
-            <li>Model generation</li>
-            <li>Model comparison</li>
-            <li>Prediction</li>
+		<li>Deep learning algorithm support.</li>
+		<li>Anomaly detection algorithm support.</li>
+		<li>Recommendation algorithm support.</li>
+		<li>Supports the PMML format when downloading models</li>
+		<li>UI improvements.</li>
         </ul>
 
         <h2>Project Resources</h2>
@@ -67,8 +68,7 @@ <h2>Installation and Running</h2>
                     <li>password : admin</li>
                 </ul>
             <li>For more information, see the Installation Guide: <br/>
-                <strong>Locally    : </strong>INSTALL.txt <br />
-                <strong>On the web : </strong><a href="http://docs.wso2.org/wiki/display/ML100/Getting+Started">http://docs.wso2.org/wiki/display/ML100/Installation</a></li>
+                <strong>On the web : </strong><a href="http://docs.wso2.org/wiki/display/ML110/Getting+Started">http://docs.wso2.com/display/ML110/Installing+the+Product</a></li>
         </ol>
 
         <h2>Reporting Problems</h2>

diff --git a/modules/distribution/src/main/assembly/bin.xml b/modules/distribution/src/main/assembly/bin.xml
@@ -228,12 +228,6 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>INSTALL.txt</source>
-            <outputDirectory>wso2ml-${pom.version}</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
         <file>
             <source>release-notes.html</source>
             <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>

diff --git a/modules/distribution/src/main/assembly/filter.properties b/modules/distribution/src/main/assembly/filter.properties
@@ -18,11 +18,11 @@
 
 product.name=WSO2 Machine Learner
 product.key=ML
-product.version=1.0.0-SNAPSHOT
-product.version.docs=ML100
+product.version=1.1.0
+product.version.docs=ML110
 
-carbon.version=4.4.0
-carbon.kernel.version=4.4.0
-ml.version=1.0.0-SNAPSHOT
+carbon.version=4.4.3
+carbon.kernel.version=4.4.3
+ml.version=1.1.0
 default.server.role=MachineLearner
 bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator
diff --git a/modules/distribution/src/main/conf/axis2.xml b/modules/distribution/src/main/conf/axis2.xml
@@ -58,8 +58,8 @@
     <parameter name="ModulesDirectory">axis2modules</parameter>
 
     <!-- User agent and the server details to be used in the http communication -->
-    <parameter name="userAgent" locked="true">WSO2 ML 1.0.0-SNAPSHOT</parameter>
-    <parameter name="server" locked="true">WSO2 ML 1.0.0-SNAPSHOT</parameter>
+    <parameter name="userAgent" locked="true">WSO2 ML 1.1.0</parameter>
+    <parameter name="server" locked="true">WSO2 ML 1.1.0</parameter>
 
     <!-- During a fault, stacktrace can be sent with the fault message. The following flag -->
     <!-- will control that behaviour -->

diff --git a/modules/styles/product/src/main/resources/web/product/about.html b/modules/styles/product/src/main/resources/web/product/about.html
@@ -20,13 +20,13 @@
 <link href="../admin/css/documentation.css" rel="stylesheet" type="text/css" media="all"/>
 </head>
 <body>
-<h1>Version 1.0.0</h1>
+<h1>Version 1.1.0</h1>
 <h2>About WSO2 Machine Learner </h2>
 <p>WSO2 Machine Learner (ML) is a fully open source, complete solution for
     building machine learning models and is ready for massively scalable deployments</p>
 
 
-<p>WSO2 ML 1.0.0 is developed on top of the revolutionary
+<p>WSO2 ML 1.1.0 is developed on top of the revolutionary
     <a href="http://wso2.org/projects/carbon">Carbon platform</a>
 and is based on the OSGi framework to achieve the
 better modularity for your SOA architecture.</p>