Merge lp:~umasv1987/charms/trusty/was-nd/was-ndfix into lp:~ibmcharmers/charms/trusty/was-nd/devel

[Uma]

WAS ND Charm

[lp:~umasv1987/charms/trusty/was-nd/was-ndfix]

2. By Uma on 2015-04-17

Commiting Test suite

=== added file 'README.md'
--- README.md	1970-01-01 00:00:00 +0000
+++ README.md	2015-04-17 07:59:54 +0000
@@ -0,0 +1,83 @@
+# Overview
+
+WebSphere Application Server Network Deployment
+ 
+
+WebSphere Application Server is a proven, high-performance transaction engine that can help build, run, integrate, and manage dynamic web applications.
+
+
+#Creating the repositories
+Run steps below with admin access
+
+Install needed packages
+    apt-get install dpkg-dev apache2
+
+Create the repository on apache server
+Under your apache repository directory
+    cd <apache-repository-directory>
+Configure apache server to allow access to the repository
+Configure config.yaml with the repository url
+	was_url: "http://<server-name>/debs/"
+
+# Usage
+Download your licensed IBM Installation Manager software version 1.5 and above and upload to your apache repository 
+
+Download your licensed IBM Websphere ND software 8.5.5.0 and upload to your apache repository 
+
+Download your licensed IBM Websphere ND software WAS fixpack version 8.5.5.4 version and upload to your apache repository 
+
+For WAS 8.5.5.0 Download refer : http://www-01.ibm.com/support/knowledgecenter/SSAW57_8.5.5/com.ibm.websphere.nd.doc/ae/welcome_nd.html
+for WAS 8.5.5.4 fixpack download refer : http://www-01.ibm.com/support/docview.wss?uid=swg24038539 link
+
+To download and install the code contained in this charm you must agree to the 
+IBM license. The license file(s) can be found in the product binaries you downloaded.
+
+Run the following to deploy this charm:
+
+    juju deploy was-base
+
+At this point the charm will wait until the user accepts the license.  If you 
+agree to the license, run the following command:
+
+    juju set was-base accept-ibm-im-license=True
+    juju set was-base accept-ibm-websphere-license=True
+
+
+You can then browse to http://ip-address:9060 to view WAS Console. 
+
+# Configuration
+
+`was_url`
+Apache Repository URL where WAS packages are placed
+
+`im_install_path`
+Installation Manager Installation path , This si the path where Installation Manager will get installed'
+
+`im_file_name`
+Downloaded Installation Manager Package Name
+
+`accept-ibm-im-license`  
+The IBM Installation Manager software comes with special terms and conditions from IBM.
+The IBM Installation Manager software can only be used by accepting the terms and 
+conditions found in the IBM-Installation-Manager-license.txt file.  
+
+Setting this option to True indicates that you have read and accept the 
+IBM  Installation Manager terms and conditions found in the license file.  
+The license file(s) can be found in the product binaries you downloaded. 
+
+`accept-ibm-was-nd-license`
+Before you can use, extract, or install IBM WebSphere Application Server
+for Developers V8.5.5, you must accept the terms of International License
+Agreement for Non-Warranted Programs and additional license information.
+Please read the license agreement carefully.
+
+The license file can be found in the root directory of the charm source
+in the IBM-WebSphere-license.txt file
+
+**The WebSphere software cannot be installed until the terms and
+contions are accepted.  The charm will not function correctly until the
+this configuration option is set to True.**
+
+# Contact Information
+
+For issues with this charm, please contact [e-mail]

=== added file 'config.yaml'
--- config.yaml	1970-01-01 00:00:00 +0000
+++ config.yaml	2015-04-17 07:59:54 +0000
@@ -0,0 +1,27 @@
+options:
+  was_nd_url:
+    type: string
+    default: ""
+    description: "Download url for WAS ND packages"  
+  im_install_path:
+    type: string
+    default: "/opt/IBM/InstallationManager"
+    description: "Install Location for Installation Manager.Can be changed if IM needs to be installed at some other place"
+  im_file_name:
+    type: string
+    default: "Install_Mgr_v1.6.2_Lnx_WASv8.5.5.zip"
+    description: "Installation Manager installable Name" 
+  accept-ibm-was-nd-license:
+    type: boolean
+    default: False 
+    description: |
+        The IBM WebSphere Application ServerNetwork Deployment software comes with special terms and
+        conditions from IBM.  The WebSphere software can only be used by 
+        accepting the license terms and conditions.
+  accept-ibm-im-license:
+    type: boolean
+    default: False 
+    description: |
+        The IBM Installation Manager software comes with special terms and
+        conditions from IBM.  The Installation Manager software can only be used by
+        accepting the license  terms and conditions.

=== added file 'copyright'
--- copyright	1970-01-01 00:00:00 +0000
+++ copyright	2015-04-17 07:59:54 +0000
@@ -0,0 +1,17 @@
+Format: http://dep.debian.net/deps/dep5/
+
+Files: *
+Copyright: Copyright 2014, Canonical Ltd., All Rights Reserved.
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.

=== added directory 'files'
=== added directory 'files/archives'
=== added directory 'hooks'
=== added file 'hooks/config-changed'
--- hooks/config-changed	1970-01-01 00:00:00 +0000
+++ hooks/config-changed	2015-04-17 07:59:54 +0000
@@ -0,0 +1,202 @@
+#!/bin/bash
+# config-changed occurs everytime a new configuration value is updated (juju set)
+
+set -e
+
+WAS_ND_INSTALL_PATH=/root/IBM/WebSphere/AppServer/V85/ND
+# Check whether IM is installed
+is_im_installed()
+{
+ if [ -f $IM_INSTALL_PATH/eclipse/IBMIM ]; then
+     echo "True"
+  else
+     echo "False"
+  fi
+
+}
+
+
+# Check whether WAS ND  is installed
+is_was_nd_installed()
+{
+ if [ -d $WAS_ND_INSTALL_PATH/bin ]; then
+     echo "True"
+  else
+     echo "False"
+  fi
+
+}
+
+
+# Remove was nd, if installed
+remove_was_nd_software()
+{
+
+        was_nd_installed=`is_was_nd_installed`
+        if  [ $was_nd_installed == True ]; then
+           juju-log "Removing WAS ND Installation"
+           # Uninstalling WAS ND
+           cd $IM_INSTALL_PATH/eclipse/tools
+           sudo ./imcl uninstall com.ibm.websphere.liberty.ND.v85 -installationDirectory $WAS_ND_INSTALL_PATH
+        fi
+        juju-log "Uninstalling WAS ND software completed"
+}
+
+#Remove IM, if installed
+remove_im_software()
+{
+
+        im_installed=`is_im_installed`
+        if  [ $im_installed == True ]; then
+            juju-log "Removing IBM WebSphere IM software."
+            cd /root/var/ibm/InstallationManager/uninstall
+	#Uninstalling IM
+            ./uninstall --launcher.ini user-silent-uninstall.ini
+        fi
+
+}
+
+# Remove WAS ND if license not accpeted
+remove_unaccepted_software()
+{
+
+   if  [ $1 == False ]; then
+       juju-log "Removing IBM WebSphere  (if installed) as the license agreement is not accepted."
+	 if [ -f $IM_INSTALL_PATH/eclipse/IBMIM ]; then
+		juju-log "IM  exists "
+		remove_was_nd_software 
+	 else
+		juju-log "IM  not exists and hence exiting from WAS unistalling"
+		exit 0 
+         fi
+   fi
+
+
+   if  [ $2 == False ]; then
+    juju-log "Removing IBM IM (if installed) as the license agreement is not accepted."
+
+	#Check any dependent products exists like WAS
+
+	 if [ -d $WAS_ND_INSTALL_PATH/bin ]; then
+		 juju-log "Can not uninstall IM as its has WAS product installed"
+		 exit 0 
+	 else
+		juju-log "Uninstall IM software"
+    		remove_im_software
+	fi
+   fi
+
+}
+
+
+juju-log "Websphere WAS ND: Begin config-change hook"
+was_nd_license_accepted=`config-get accept-ibm-was-nd-license`
+im_license_accepted=`config-get accept-ibm-im-license`
+IM_INSTALL_PATH=`config-get im_install_path`
+# Remove IM and WAS if license not accepted and exit. Else install it
+remove_unaccepted_software $was_nd_license_accepted $im_license_accepted
+if [ $im_license_accepted == False ]; then
+        juju-log "Websphere IM License not accepted."
+
+elif [ $im_license_accepted == True ]; then
+
+        juju-log "License accepted"
+        im_inst=`is_im_installed`
+	if [ $im_inst == False ]; then	 
+		juju-log "IM installation start"
+	# Check IM package availability
+                        juju-log $CHARM_DIR
+                if [ -f  $CHARM_DIR/files/archives/IM/userinstc ];
+                then
+                        juju-log "IM Packages available for installation.";
+			 cp  $CHARM_DIR/files/archives/IM/install.xml $CHARM_DIR/files/archives/IM/silent_install.xml
+                        sed -i "2 a \<profile kind='self' installLocation='$IM_INSTALL_PATH' id='IBM Installation Manager'>\n <data key='eclipseLocation' value='$IM_INSTALL_PATH' />\n</profile>" $CHARM_DIR/files/archives/IM/silent_install.xml
+                         $CHARM_DIR/files/archives/IM/userinstc  -input  $CHARM_DIR/files/archives/IM/silent_install.xml -acceptlicense
+			 if [ $? == 0 ]
+                         then
+                               juju-log "IM Is installed successfully"
+                         else
+                               juju-log "Error while installing  IM"
+                               exit 1
+                         fi
+
+                else
+                        juju-log "IM Packages missing. Please check README file.";
+                        juju-log "Upgrade IM charm after adding the IM packages";
+                        exit 1
+                fi
+        fi
+else
+        juju-log " Acceptable values for license is 'True' or 'False'"
+
+fi
+
+if [ $was_nd_license_accepted == False ]; then
+        juju-log "Websphere ND License not accepted."
+
+elif [ $was_nd_license_accepted == True ]; then
+       juju-log "Check WAS ND package availability"
+	# check WAS package availability
+	if [ -d "$CHARM_DIR/files/archives/disk1" ]; then	
+		 juju-log "WAS ND Packages available for installation.";
+		#Check IM installation
+		 im_installed=`is_im_installed`
+                if  [ $im_installed == True ]; then
+			 juju-log "Installing WAS ND "
+			 cd $IM_INSTALL_PATH/eclipse/tools
+			 sudo ./imcl install com.ibm.websphere.ND.v85 -repositories  $CHARM_DIR/files/archives/ -installationDirectory $WAS_ND_INSTALL_PATH -sharedResourcesDirectory $IM_INSTALL_PATH/IMShared -acceptLicense -showProgress
+		  	if [ $? == 0 ]
+                  	then
+                               juju-log " WAS Base is installed successfully"
+                  	else
+                               juju-log "Error while installing  WAS"
+                               exit 1
+                  	fi
+		 else
+			juju-log "IM is not installaed to install WAS"
+			exit 0
+		 fi
+
+		juju-log "creating a profile"
+        	cd $WAS_ND_INSTALL_PATH/bin
+		#sh does not work in ubuntu so linking to bash
+
+		juju-log "Unlink /bin/sh"
+		sudo unlink /bin/sh
+ 		sudo ln -s /bin/bash /bin/sh
+		juju-log "creating a profile"
+
+		juju-log "updating /etc/hosts with hostname"
+		# Need to update hostname in /etc/hosts
+		private_address=`unit-get private-address`
+		juju-log "private_address : $private_address"
+		echo "$private_address `hostname`" >> /etc/hosts
+ 		if [ $? == 0 ]
+		then	
+        		juju-log "hostname updated"
+ 		else
+        		juju-log "Error while updating /etc/hosts"
+		fi
+
+		sudo  ./manageprofiles.sh -create -profileName "test" -profilePath "$WAS_ND_INSTALL_PATH/profiles/test" -templatePath "$WAS_ND_INSTALL_PATH/profileTemplates/default/" -nodeName "node1" -cellName "cell1" -serverName "server1" -adminUserName "wasadmin" -adminPassword "wasadmin"
+		juju-log "Profile creation completed"	
+
+		#Apply fixpack 8.5.5.4 to upgrade was nd version from 8.5.5.0 to 8.5.5.4
+		
+		juju-log "Upgrading WAS Base"
+		cd $IM_INSTALL_PATH/eclipse/tools	
+		sudo ./imcl  install com.ibm.websphere.ND.v85_8.5.5004.20141119_1746 -repositories  $CHARM_DIR/files/archives/was_fixpack/  -installationDirectory $WAS_ND_INSTALL_PATH -sharedResourcesDirectory $IM_INSTALL_PATH/IMShared -acceptLicense -showProgress
+		  if [ $? == 0 ]
+                  then
+                               juju-log " WAS fixpack installed successfully"
+                  else
+                               juju-log "Error while installing  WAS fixpack"
+                               exit 1
+                  fi
+
+	else
+		juju-log "WAS ND Packages are not available "
+	fi
+
+fi
+

=== added file 'hooks/install'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2015-04-17 07:59:54 +0000
@@ -0,0 +1,48 @@
+#!/bin/bash
+# Here do anything needed to install the service
+
+set +e
+juju-log "Downloading WASND Installable"
+was_repository=`config-get was_nd_url`
+im_file_name=`config-get im_file_name`
+juju-log "repository : $was_repository"
+if [ -z $was_repository ];then
+juju-log "Please enter Repository URL in config.yaml"
+fi
+
+juju-log "im_file_name : $im_file_name"
+if [ -z $im_file_name ];then
+	juju-log "Please enter IM Installation path or IM package Name"
+fi
+juju-log "Downloading and extracting WASND packages"
+sudo apt-get install unzip
+	juju-log "downloading and extracting IM packages"
+	cd $CHARM_DIR/files/archives
+	mkdir IM
+	cd IM
+	wget  $was_repository/$im_file_name
+	unzip $im_file_name
+
+cd $CHARM_DIR/files/archives
+wget  $was_repository/WASND_v8.5.5_1of3.zip
+wget  $was_repository/WASND_v8.5.5_2of3.zip
+wget  $was_repository/WASND_v8.5.5_3of3.zip
+
+#installing unzip  packages 
+unzip WASND_v8.5.5_1of3.zip 
+unzip WASND_v8.5.5_2of3.zip 
+unzip WASND_v8.5.5_3of3.zip 
+
+
+juju-log "Downloading and extracting WASND fixpack images"
+#Downloading was fixpack packages
+cd $CHARM_DIR/files/archives
+mkdir was_fixpack
+cd was_fixpack
+wget  $was_repository/8.5.5-WS-WAS-FP0000004-part1.zip
+wget  $was_repository/8.5.5-WS-WAS-FP0000004-part2.zip
+
+#Extracting the packages
+unzip 8.5.5-WS-WAS-FP0000004-part1.zip 
+unzip 8.5.5-WS-WAS-FP0000004-part2 
+juju-log "WASND Installables download complete"

=== added file 'hooks/start'
--- hooks/start	1970-01-01 00:00:00 +0000
+++ hooks/start	2015-04-17 07:59:54 +0000
@@ -0,0 +1,15 @@
+#!/bin/bash
+WAS_ND_INSTALL_PATH=/root/IBM/WebSphere/AppServer/V85/ND
+
+#starting the server
+cd $WAS_ND_INSTALL_PATH/profiles/test/bin/
+sudo  ./startServer.sh server1
+                if [ "$?" -ne "0" ]; then
+                        juju-log "Error while starting the server"
+                else
+                        juju-log "Server started successfully"
+
+                fi
+
+open-port 9060
+open-port 9443

=== added file 'hooks/stop'
--- hooks/stop	1970-01-01 00:00:00 +0000
+++ hooks/stop	2015-04-17 07:59:54 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+WAS_ND_INSTALL_PATH=/root/IBM/WebSphere/AppServer/V85/ND
+
+cd $WAS_ND_INSTALL_PATH/profiles/test/bin/
+ sudo  ./stopServer.sh server1
+                if [ "$?" -ne "0" ]; then
+                        juju-log "Error while stoping the server"
+                else
+                        juju-log "Server stopped successfully"
+                fi

=== added file 'icon.svg'
--- icon.svg	1970-01-01 00:00:00 +0000
+++ icon.svg	2015-04-17 07:59:54 +0000
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg6517"
+   version="1.1"
+   inkscape:version="0.48+devel r12274"
+   sodipodi:docname="Juju_charm_icon_template.svg">
+  <defs
+     id="defs6519">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Background"
+       id="linearGradient6461"
+       gradientUnits="userSpaceOnUse"
+       x1="0"
+       y1="970.29498"
+       x2="144"
+       y2="970.29498"
+       gradientTransform="matrix(0,-0.66666669,0.6660448,0,-866.25992,731.29077)" />
+    <linearGradient
+       id="Background">
+      <stop
+         id="stop4178"
+         offset="0"
+         style="stop-color:#b8b8b8;stop-opacity:1" />
+      <stop
+         id="stop4180"
+         offset="1"
+         style="stop-color:#c9c9c9;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Inner Shadow"
+       id="filter1121">
+      <feFlood
+         flood-opacity="0.59999999999999998"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood1123" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite1125" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur1127" />
+      <feOffset
+         dx="0"
+         dy="2"
+         result="offset"
+         id="feOffset1129" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite1131" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter950">
+      <feFlood
+         flood-opacity="0.25"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood952" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite954" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur956" />
+      <feOffset
+         dx="0"
+         dy="1"
+         result="offset"
+         id="feOffset958" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite960" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath873">
+      <g
+         transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
+         id="g875"
+         inkscape:label="Layer 1"
+         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
+        <path
+           style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
+           d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
+           id="path877"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssssssss" />
+      </g>
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter891"
+       inkscape:label="Badge Shadow">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.71999962"
+         id="feGaussianBlur893" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.0745362"
+     inkscape:cx="18.514671"
+     inkscape:cy="49.018169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     showborder="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid821" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="16,48"
+       id="guide823" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,80"
+       id="guide825" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="80,40"
+       id="guide827" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,16"
+       id="guide829" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6522">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="BACKGROUND"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(268,-635.29076)"
+     style="display:inline">
+    <path
+       style="fill:url(#linearGradient6461);fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
+       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
+       id="path6455"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssss" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="PLACE YOUR PICTOGRAM HERE"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="BADGE"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <g
+       style="display:inline"
+       transform="translate(-340.00001,-581)"
+       id="g4394"
+       clip-path="none">
+      <g
+         id="g855">
+        <g
+           inkscape:groupmode="maskhelper"
+           id="g870"
+           clip-path="url(#clipPath873)"
+           style="opacity:0.6;filter:url(#filter891)">
+          <path
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
+             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path844"
+             style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+        </g>
+        <g
+           id="g862">
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4398"
+             sodipodi:cx="252"
+             sodipodi:cy="552.36218"
+             sodipodi:rx="12"
+             sodipodi:ry="12"
+             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
+          <path
+             transform="matrix(1.25,0,0,1.25,33,-100.45273)"
+             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path4400"
+             style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="star"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4459"
+             sodipodi:sides="5"
+             sodipodi:cx="666.19574"
+             sodipodi:cy="589.50385"
+             sodipodi:r1="7.2431178"
+             sodipodi:r2="4.3458705"
+             sodipodi:arg1="1.0471976"
+             sodipodi:arg2="1.6755161"
+             inkscape:flatsided="false"
+             inkscape:rounded="0.1"
+             inkscape:randomized="0"
+             d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 C 669.9821,591.68426 670.20862,595.55064 669.8173,595.77657 Z"
+             transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'metadata.yaml'
--- metadata.yaml	1970-01-01 00:00:00 +0000
+++ metadata.yaml	2015-04-17 07:59:54 +0000
@@ -0,0 +1,11 @@
+name: was-nd
+summary: WebSphere Application Server Network Deployment 
+maintainer: [e-mail]
+description: |
+ WebSphere Application Server is a proven, high-performance transaction engine that can help build, run, integrate, and manage dynamic web applications.
+tags: ["applications"]
+subordinate: false
+provides:
+  website:
+    interface: http
+

=== added file 'revision'
--- revision	1970-01-01 00:00:00 +0000
+++ revision	2015-04-17 07:59:54 +0000
@@ -0,0 +1,1 @@
+1

=== added directory 'tests'
=== added file 'tests/00-setup'
--- tests/00-setup	1970-01-01 00:00:00 +0000
+++ tests/00-setup	2015-04-17 07:59:54 +0000
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo add-apt-repository ppa:juju/stable -y
+sudo apt-get update
+sudo apt-get install amulet python3-requests -y

=== added file 'tests/10-bundles-test.py'
--- tests/10-bundles-test.py	1970-01-01 00:00:00 +0000
+++ tests/10-bundles-test.py	2015-04-17 07:59:54 +0000
@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+
+# This amulet test deploys the bundles.yaml file in this directory.
+
+import os
+import unittest
+import yaml
+import amulet
+import requests
+
+# Lots of prereqs on this charm (eg: java), so give it a large timeout
+seconds_to_wait = 2400
+
+
+class BundleTest(unittest.TestCase):
+    """ Create a class for testing the charm in the unit test framework. """
+    @classmethod
+    def setUpClass(cls):
+        """ Set up an amulet deployment using the bundle. """
+        d = amulet.Deployment()
+        bundle_path = os.path.join(os.path.dirname(__file__), 'bundles.yaml')
+        with open(bundle_path, 'r') as bundle_file:
+            contents = yaml.safe_load(bundle_file)
+            d.load(contents)
+
+        # Software doesn't actually install until you accept the license
+        d.configure('was-nd', {'accept-ibm-was-nd-license': True, 'accept-ibm-im-license': True })
+        d.setup(seconds_to_wait)
+        cls.d = d
+
+    def test_deployed(self):
+        """ Test to see if the bundle deployed successfully. """
+        self.assertTrue(self.d.deployed)
+
+    def test_website(self):
+        unit = self.d.sentry.unit['was-nd/0']
+        url  = 'http://%s:9060/ibm/console' % unit.info['public-address']
+        response = requests.get(url)
+        # Raise an exception if the url was not a valid web page.
+        response.raise_for_status()
+
+if __name__ == '__main__':
+    unittest.main()

=== added file 'tests/bundles.yaml'
--- tests/bundles.yaml	1970-01-01 00:00:00 +0000
+++ tests/bundles.yaml	2015-04-17 07:59:54 +0000
@@ -0,0 +1,10 @@
+was-nd-bundle:
+  services:
+    "was-nd":
+      charm: "was-nd"
+      num_units: 1
+      annotations:
+        "gui-x": "300"
+        "gui-y": "300"
+  relations: []
+  series: trusty