Merge pull request #47 from chirangaalwis/cf-is-pattern-2-package-refinements

Refinements to packages of WSO2 Identity Server deployment patterns

Author: chamithkumarage

pattern-1/bosh-release/jobs/wso2is_1/spec

@@ -28,6 +28,8 @@ properties:
 
   wso2is.user_ds.url:
     description: Connection URL of the user data source
+  wso2is.bps_ds.url:
+    description: Connection URL of the BPS data source
   wso2is.registry_ds.url:
     description: Connection URL of the registry data source
   wso2is.identity_ds.url:

pattern-1/bosh-release/jobs/wso2is_1/templates/config/datasources/bps-datasources.erb

@@ -31,7 +31,7 @@
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url><%=properties.wso2is.identity_ds.url%></url>
+                    <url><%=properties.wso2is.bps_ds.url%></url>
                     <username><%=properties.wso2is.db.username%></username>
                     <password><%=properties.wso2is.db.password%></password>
                     <driverClassName><%=properties.wso2is.db.driver%></driverClassName>

pattern-1/bosh-release/jobs/wso2is_1/templates/ctl.erb

@@ -71,7 +71,7 @@ case $1 in
     cd /var/vcap/packages/${wso2_product}/
     archive=`ls ${wso2_product}*zip`
     unzip ${archive}
-    cd wso2is*
+    cd ${wso2_product}*
     wso2_is_home=`pwd`
 
     log_debug "WSO2_IS_HOME: ${wso2_is_home}"

pattern-1/bosh-release/jobs/wso2is_2/spec

@@ -28,6 +28,8 @@ properties:
 
   wso2is.user_ds.url:
     description: Connection URL of the user data source
+  wso2is.bps_ds.url:
+    description: Connection URL of the BPS data source
   wso2is.registry_ds.url:
     description: Connection URL of the registry data source
   wso2is.identity_ds.url:

pattern-1/bosh-release/jobs/wso2is_2/templates/config/datasources/bps-datasources.erb

@@ -31,7 +31,7 @@
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url><%=properties.wso2is.identity_ds.url%></url>
+                    <url><%=properties.wso2is.bps_ds.url%></url>
                     <username><%=properties.wso2is.db.username%></username>
                     <password><%=properties.wso2is.db.password%></password>
                     <driverClassName><%=properties.wso2is.db.driver%></driverClassName>

pattern-1/bosh-release/jobs/wso2is_2/templates/ctl.erb

@@ -71,7 +71,7 @@ case $1 in
     cd /var/vcap/packages/${wso2_product}/
     archive=`ls ${wso2_product}*zip`
     unzip ${archive}
-    cd wso2is*
+    cd ${wso2_product}*
     wso2_is_home=`pwd`
 
     log_debug "WSO2_IS_HOME: ${wso2_is_home}"

pattern-1/bosh-release/manifests/wso2is-manifest.yml

@@ -54,14 +54,6 @@ properties:
     memory:
       max_heap: 1024
       min_heap: 1024
-    user_ds:
-      url: jdbc:mysql://192.168.50.1:3306/wso2is_db?autoReconnect=true
-    registry_ds:
-      url: jdbc:mysql://192.168.50.1:3306/wso2is_db?autoReconnect=true
-    identity_ds:
-      url: jdbc:mysql://192.168.50.1:3306/wso2is_db?autoReconnect=true
-    db:
-      driver: com.mysql.jdbc.Driver
 releases:
 - name: wso2is-release
   version: latest

pattern-2/bosh-release/config/blobs.yml

@@ -0,0 +1,12 @@
+mysqldriver/mysql-connector-java-5.1.34-bin.jar:
+  size: 960374
+  sha: 6df5bcec3970d71eaace2c5589077452c5e9ecfa
+oraclejdk/jdk-8u144-linux-x64.tar.gz:
+  size: 185515842
+  sha: d4c4f02908d39827393dd77f9eb8da348363efda
+wso2is/wso2is-5.4.0.zip:
+  size: 376088880
+  sha: 6f1ba157db5f73791fa862adc97586023ed31371
+wso2is_analytics/wso2is-analytics-5.4.0.zip:
+  size: 383665620
+  sha: 03e114ac4730990418e5f5ea02fb7d8dca1c8ae4

pattern-2/bosh-release/jobs/wso2is_1/spec

@@ -30,20 +30,14 @@ properties:
 
   wso2is.user_ds.url:
     description: Connection URL of the user data source
-  wso2is.user_ds.driver:
-    description: Database driver class name of the user data source
   wso2is.identity_ds.url:
     description: Connection URL of the identity data source
-  wso2is.identity_ds.driver:
-    description: Database driver class name of the identity data source
   wso2is.bps_ds.url:
     description: Connection URL of the BPS data source
-  wso2is.bps_ds.driver:
-    description: Database driver class name of the BPS data source
   wso2is.registry_ds.url:
     description: Connection URL of the Registry data source
-  wso2is.registry_ds.driver:
-    description: Database driver class name of the Registry data source
+  wso2is.db.driver:
+    description: Database driver class name of the data source
   wso2is.db.username:
     description: Username of the WSO2 Identity Server product database user
     default: root

pattern-2/bosh-release/jobs/wso2is_1/templates/config/conf/datasources/bps-datasources.erb

@@ -6,7 +6,7 @@
 
   <datasources>      
         <datasource>
-            <name>BPS_DS</name>
+            <name>WSO2_BPS_DS</name>
             <description></description>
             <jndiConfig>
                 <name>bpsds</name>
@@ -16,7 +16,7 @@
                     <url><%=properties.wso2is.bps_ds.url%></url>
                     <username><%=properties.wso2is.db.username%></username>
                     <password><%=properties.wso2is.db.password%></password>
-                    <driverClassName><%=properties.wso2is.bps_ds.driver%></driverClassName>
+                    <driverClassName><%=properties.wso2is.db.driver%></driverClassName>
                     <testOnBorrow>true</testOnBorrow>
                     <validationQuery>SELECT 1</validationQuery>
                     <validationInterval>30000</validationInterval>