Add the zanata.war location as a second argument to the script.

Also modify the as7.patch file to now make as7 accessible from outside localhost.
zanata · Sep 11, 2013 · e9037ce · e9037ce
1 parent b42c7ea
commit e9037ce
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/zanata-war/etc/public-package/patches/as7.patch b/zanata-war/etc/public-package/patches/as7.patch
@@ -12,7 +12,7 @@ diff -ru jboss-as-7.2.0.Final/modules/system/layers/base/sun/jdk/main/module.xml
 Only in jboss-as-7.2.0.Final.zanata/modules/system/layers/base/sun/jdk/main: module.xml~
 diff -ru jboss-as-7.2.0.Final/standalone/configuration/standalone.xml jboss-as-7.2.0.Final.zanata/standalone/configuration/standalone.xml
 --- jboss-as-7.2.0.Final/standalone/configuration/standalone.xml	2013-08-07 09:00:10.000000000 +1000
-+++ jboss-as-7.2.0.Final.zanata/standalone/configuration/standalone.xml	2013-08-23 16:29:11.284878227 +1000
++++ jboss-as-7.2.0.Final.zanata/standalone/configuration/standalone.xml	2013-09-11 09:47:17.613643411 +1000
 @@ -25,6 +25,10 @@
          <extension module="org.jboss.as.webservices"/>
          <extension module="org.jboss.as.weld"/>
@@ -54,6 +54,24 @@ diff -ru jboss-as-7.2.0.Final/standalone/configuration/standalone.xml jboss-as-7
                  <security-domain name="other" cache-type="default">
                      <authentication>
                          <login-module code="Remoting" flag="optional">
+@@ -279,7 +299,7 @@
+             <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+         </interface>
+         <interface name="public">
+-            <inet-address value="${jboss.bind.address:127.0.0.1}"/>
++            <inet-address value="${jboss.bind.address:0.0.0.0}"/>
+         </interface>
+         <!-- TODO - only show this if the jacorb subsystem is added  -->
+         <interface name="unsecure">
+@@ -287,7 +307,7 @@
+               ~  Used for IIOP sockets in the standard configuration.
+               ~                  To secure JacORB you need to setup SSL 
+               -->
+-            <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
++            <inet-address value="${jboss.bind.address.unsecure:0.0.0.0}"/>
+         </interface>
+     </interfaces>
+     <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
 @@ -304,4 +324,4 @@
              <remote-destination host="localhost" port="25"/>
          </outbound-socket-binding>
@@ -62,3 +80,4 @@ diff -ru jboss-as-7.2.0.Final/standalone/configuration/standalone.xml jboss-as-7
 \ No newline at end of file
 +</server>
 Only in jboss-as-7.2.0.Final.zanata/standalone/configuration: standalone.xml~
+Only in jboss-as-7.2.0.Final.zanata: zanata-as7.patch
diff --git a/zanata-war/etc/scripts/zanata-server-package.sh b/zanata-war/etc/scripts/zanata-server-package.sh
@@ -8,6 +8,7 @@
 #
 # Parameters:
 # 1. JBoss 7 zip distribution location.
+# 2. Zanata war location.
 #
 # Pre-requisites:
 # 1. Apache maven in the path
@@ -19,6 +20,10 @@ MYSQL_DRV_VERSION=5.1.18
 JBOSS_ZIP_LOC=$1
 JBOSS_ZIP_PARENT=${JBOSS_ZIP_LOC%/*}
 
+# Get the Zanata war location from parameters
+ZANATA_WAR=$2
+
+
 # Zanata War project Dir
 ZANATA_WAR_HOME=../..
 
@@ -41,7 +46,7 @@ rm -rf $JBOSS_TMP_DIR/bin/client
 rm -rf $JBOSS_TMP_DIR/docs
 
 # Add Zanata specific files
-cp $ZANATA_WAR_HOME/target/zanata-*.war $JBOSS_TMP_DIR/standalone/deployments/zanata.war
+cp $ZANATA_WAR $JBOSS_TMP_DIR/standalone/deployments/zanata.war
 cp $ZANATA_WAR_HOME/src/etc/zanata-ds.xml $JBOSS_TMP_DIR/standalone/deployments
 patch -p1 --verbose -d $JBOSS_TMP_DIR/ < $ZANATA_WAR_HOME/etc/public-package/patches/as7.patch