From d2027b4f94ff8c2b5b929ef3cfef238ea7a905f7 Mon Sep 17 00:00:00 2001
From: "Carlos A. Munoz" <camunoz@redhat.com>
Date: Mon, 12 Aug 2013 10:11:15 +1000
Subject: [PATCH 1/4] Update zanata public package script to new JBoss AS 7
 config.

---
 .../layers/base/sun/jdk/main/module.xml       |  97 ++++++
 .../server/zanata/conf/login-config.xml       | 141 --------
 .../server/zanata/conf/zanata.properties      |  16 -
 .../standalone/configuration/standalone.xml   | 329 ++++++++++++++++++
 .../etc/scripts/zanata-server-package.sh      |  30 +-
 zanata-war/src/etc/zanata-ds.xml              | 227 +-----------
 6 files changed, 454 insertions(+), 386 deletions(-)
 create mode 100644 zanata-war/etc/public-package/modules/system/layers/base/sun/jdk/main/module.xml
 delete mode 100644 zanata-war/etc/public-package/server/zanata/conf/login-config.xml
 delete mode 100644 zanata-war/etc/public-package/server/zanata/conf/zanata.properties
 create mode 100644 zanata-war/etc/public-package/standalone/configuration/standalone.xml

diff --git a/zanata-war/etc/public-package/modules/system/layers/base/sun/jdk/main/module.xml b/zanata-war/etc/public-package/modules/system/layers/base/sun/jdk/main/module.xml
new file mode 100644
index 0000000000..2dcef2efb1
--- /dev/null
+++ b/zanata-war/etc/public-package/modules/system/layers/base/sun/jdk/main/module.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2010, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software 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
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<module xmlns="urn:jboss:module:1.1" name="sun.jdk">
+    <resources>
+        <!-- currently jboss modules has not way of importing services from
+        classes.jar so we duplicate them here -->
+        <resource-root path="service-loader-resources"/>
+    </resources>
+    <dependencies>
+        <system export="true">
+            <paths>
+                <path name="com/sun/management"/>
+                <path name="com/sun/script/javascript"/>
+                <path name="com/sun/image/codec/jpeg"/>
+                <path name="com/sun/imageio/plugins/bmp"/>
+                <path name="com/sun/imageio/plugins/common"/>
+                <path name="com/sun/imageio/plugins/gif"/>
+                <path name="com/sun/imageio/plugins/jpeg"/>
+                <path name="com/sun/imageio/plugins/png"/>
+                <path name="com/sun/imageio/plugins/wbmp"/>
+                <path name="com/sun/imageio/spi"/>
+                <path name="com/sun/imageio/stream"/>
+                <path name="com/sun/jndi/dns"/>
+                <path name="com/sun/jndi/ldap"/>
+                <path name="com/sun/jndi/url"/>
+                <path name="com/sun/jndi/url/dns"/>
+                <path name="com/sun/crypto/provider"/>
+                <path name="com/sun/org/apache/xml/internal/security/transforms/implementations"/>
+                <path name="com/sun/security/auth"/>
+                <path name="com/sun/security/auth/login"/>
+                <path name="com/sun/security/auth/module"/>
+                <path name="sun/awt"/>
+                <path name="sun/awt/color"/>
+                <path name="sun/awt/datatransfer"/>
+                <path name="sun/awt/dnd"/>
+                <path name="sun/awt/event"/>
+                <path name="sun/awt/geom"/>
+                <path name="sun/awt/im"/>
+                <path name="sun/awt/image"/>
+                <path name="sun/awt/image/codec"/>
+                <path name="sun/awt/motif"/>
+                <path name="sun/awt/resources"/>
+                <path name="sun/awt/shell"/>
+                <path name="sun/awt/util"/>
+                <path name="sun/awt/windows"/>
+                <path name="sun/awt/X11"/>
+                <path name="sun/print"/>
+                <path name="sun/print/resources"/>
+                <path name="sun/security/pkcs"/>
+                <path name="sun/security/x509"/>
+                <path name="sun/jdbc/odbc"/>
+                <path name="sun/jdbc/odbc/ee"/>
+                <path name="sun/font"/>
+                <path name="sun/misc"/>
+                <path name="sun/io"/>
+                <path name="sun/nio"/>
+                <path name="sun/nio/ch"/>
+                <path name="sun/security"/>
+                <path name="sun/security/krb5"/>
+                <path name="sun/util"/>
+                <path name="sun/util/calendar"/>
+                <path name="sun/util/locale"/>
+                <path name="sun/util/resources"/>
+                <path name="sun/security/pkcs11"/>
+                <path name="sun/security/provider"/>
+                <path name="sun/text"/>
+                <path name="META-INF/services"/>
+            </paths>
+            <exports>
+                <include-set>
+                    <path name="META-INF/services"/>
+                </include-set>
+            </exports>
+        </system>
+    </dependencies>
+</module>
diff --git a/zanata-war/etc/public-package/server/zanata/conf/login-config.xml b/zanata-war/etc/public-package/server/zanata/conf/login-config.xml
deleted file mode 100644
index dcca56ae92..0000000000
--- a/zanata-war/etc/public-package/server/zanata/conf/login-config.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version='1.0'?>
-
-<!-- The XML based JAAS login configuration read by the
-org.jboss.security.auth.login.XMLLoginConfig mbean. Add
-an application-policy element for each security domain.
-
-The outline of the application-policy is:
-<application-policy name="security-domain-name">
-  <authentication>
-    <login-module code="login.module1.class.name" flag="control_flag">
-      <module-option name = "option1-name">option1-value</module-option>
-      <module-option name = "option2-name">option2-value</module-option>
-      ...
-    </login-module>
-
-    <login-module code="login.module2.class.name" flag="control_flag">
-      ...
-    </login-module>
-    ...
-  </authentication>
-</application-policy>
-
-$Id: login-config.xml 87078 2009-04-09 14:23:47Z bstansberry@jboss.com $
-$Revision: 87078 $
--->
-
-<policy>
-    <!-- Used by clients within the application server VM such as
-    mbeans and servlets that access EJBs.
-    -->
-    <application-policy name="client-login">
-        <authentication>
-            <login-module code="org.jboss.security.ClientLoginModule"
-                          flag="required">
-                <!-- Any existing security context will be restored on logout -->
-                <module-option name="restore-login-identity">true</module-option>
-            </login-module>
-        </authentication>
-    </application-policy>
-
-    <!-- Security domains for testing new jca framework -->
-    <application-policy name="HsqlDbRealm">
-        <authentication>
-            <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
-                          flag="required">
-                <module-option name="principal">sa</module-option>
-                <module-option name="userName">sa</module-option>
-                <module-option name="password"></module-option>
-                <module-option name="managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
-            </login-module>
-        </authentication>
-    </application-policy>
-
-    <application-policy name="JmsXARealm">
-        <authentication>
-            <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
-                          flag="required">
-                <module-option name="principal">guest</module-option>
-                <module-option name="userName">guest</module-option>
-                <module-option name="password">guest</module-option>
-                <module-option name="managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
-            </login-module>
-        </authentication>
-    </application-policy>
-
-    <!-- A template configuration for the jmx-console web application. This
-      defaults to the UsersRolesLoginModule the same as other and should be
-      changed to a stronger authentication mechanism as required.
-    -->
-    <application-policy name="jmx-console">
-        <authentication>
-            <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
-                          flag="required">
-                <module-option name="usersProperties">props/jmx-console-users.properties</module-option>
-                <module-option name="rolesProperties">props/jmx-console-roles.properties</module-option>
-            </login-module>
-        </authentication>
-    </application-policy>
-
-    <!-- A template configuration for the web-console web application. This
-      defaults to the UsersRolesLoginModule the same as other and should be
-      changed to a stronger authentication mechanism as required.
-    -->
-    <application-policy name="web-console">
-        <authentication>
-            <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
-                          flag="required">
-                <module-option name="usersProperties">web-console-users.properties</module-option>
-                <module-option name="rolesProperties">web-console-roles.properties</module-option>
-            </login-module>
-        </authentication>
-    </application-policy>
-
-    <!--
-      A template configuration for the JBossWS security domain.
-      This defaults to the UsersRolesLoginModule the same as other and should be
-      changed to a stronger authentication mechanism as required.
-    -->
-    <application-policy name="JBossWS">
-        <authentication>
-            <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
-                          flag="required">
-                <module-option name="usersProperties">props/jbossws-users.properties</module-option>
-                <module-option name="rolesProperties">props/jbossws-roles.properties</module-option>
-                <module-option name="unauthenticatedIdentity">anonymous</module-option>
-            </login-module>
-        </authentication>
-    </application-policy>
-
-    <!-- Zanata Login configuration -->
-    <application-policy name="zanata">
-        <authentication>
-            <login-module
-                    code="org.jboss.seam.security.jaas.SeamLoginModule"
-                    flag="required">
-            </login-module>
-        </authentication>
-    </application-policy>
-
-    <!-- The default login configuration used by any security domain that
-    does not have a application-policy entry with a matching name
-    -->
-    <application-policy name="other">
-        <!-- A simple server login module, which can be used when the number
-        of users is relatively small. It uses two properties files:
-        users.properties, which holds users (key) and their password (value).
-        roles.properties, which holds users (key) and a comma-separated list of
-        their roles (value).
-        The unauthenticatedIdentity property defines the name of the principal
-        that will be used when a null username and password are presented as is
-        the case for an unuathenticated web client or MDB. If you want to
-        allow such users to be authenticated add the property, e.g.,
-        unauthenticatedIdentity="nobody"
-        -->
-        <authentication>
-            <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
-                          flag="required"/>
-        </authentication>
-    </application-policy>
-
-</policy>
diff --git a/zanata-war/etc/public-package/server/zanata/conf/zanata.properties b/zanata-war/etc/public-package/server/zanata/conf/zanata.properties
deleted file mode 100644
index 4429e67616..0000000000
--- a/zanata-war/etc/public-package/server/zanata/conf/zanata.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Zanata general configuration properties.
-#
-# Make sure this file is available on the server classpath when deploying.
-# (A good place is JBOSS_HOME/server/<profile>/conf)
-# If not, an Zanata won't be able to start
-
-# Zanata Authentication Policy names
-# The property key indicates the authentication type and the value
-# is the name of the security policy in login-config.xml
-# (Only one can be selected, excepted for internal and openid which
-# can be active simultaneously)
-# Valid key values: zanata.security.auth.policy.internal, .kerberos, .openid, .jaas
-zanata.security.auth.policy.internal = zanata
-
-# Users that should be made administrators upon bootstrap or registration.
-#zanata.security.admin.users = admin
\ No newline at end of file
diff --git a/zanata-war/etc/public-package/standalone/configuration/standalone.xml b/zanata-war/etc/public-package/standalone/configuration/standalone.xml
new file mode 100644
index 0000000000..a48708d822
--- /dev/null
+++ b/zanata-war/etc/public-package/standalone/configuration/standalone.xml
@@ -0,0 +1,329 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<server xmlns="urn:jboss:domain:1.4">
+
+    <extensions>
+        <extension module="org.jboss.as.clustering.infinispan"/>
+        <extension module="org.jboss.as.connector"/>
+        <extension module="org.jboss.as.deployment-scanner"/>
+        <extension module="org.jboss.as.ee"/>
+        <extension module="org.jboss.as.ejb3"/>
+        <extension module="org.jboss.as.jaxrs"/>
+        <extension module="org.jboss.as.jdr"/>
+        <extension module="org.jboss.as.jmx"/>
+        <extension module="org.jboss.as.jpa"/>
+        <extension module="org.jboss.as.jsf"/>
+        <extension module="org.jboss.as.logging"/>
+        <extension module="org.jboss.as.mail"/>
+        <extension module="org.jboss.as.naming"/>
+        <extension module="org.jboss.as.pojo"/>
+        <extension module="org.jboss.as.remoting"/>
+        <extension module="org.jboss.as.sar"/>
+        <extension module="org.jboss.as.security"/>
+        <extension module="org.jboss.as.threads"/>
+        <extension module="org.jboss.as.transactions"/>
+        <extension module="org.jboss.as.web"/>
+        <extension module="org.jboss.as.webservices"/>
+        <extension module="org.jboss.as.weld"/>
+    </extensions>
+
+    <system-properties>
+        <property name="javamelody.storage-directory" value="${user.home}/zanata/stats"/>
+        <property name="hibernate.search.default.indexBase" value="${user.home}/zanata/indexes"/>
+    </system-properties>
+
+    <management>
+        <security-realms>
+            <security-realm name="ManagementRealm">
+                <authentication>
+                    <local default-user="$local"/>
+                    <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
+                </authentication>
+            </security-realm>
+            <security-realm name="ApplicationRealm">
+                <authentication>
+                    <local default-user="$local" allowed-users="*"/>
+                    <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
+                </authentication>
+                <authorization>
+                    <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
+                </authorization>
+            </security-realm>
+        </security-realms>
+        <management-interfaces>
+            <native-interface security-realm="ManagementRealm">
+                <socket-binding native="management-native"/>
+            </native-interface>
+            <http-interface security-realm="ManagementRealm">
+                <socket-binding http="management-http"/>
+            </http-interface>
+        </management-interfaces>
+    </management>
+
+    <profile>
+        <subsystem xmlns="urn:jboss:domain:logging:1.2">
+            <console-handler name="CONSOLE">
+                <level name="INFO"/>
+                <formatter>
+                    <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+                </formatter>
+            </console-handler>
+            <periodic-rotating-file-handler name="FILE" autoflush="true">
+                <formatter>
+                    <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+                </formatter>
+                <file relative-to="jboss.server.log.dir" path="server.log"/>
+                <suffix value=".yyyy-MM-dd"/>
+                <append value="true"/>
+            </periodic-rotating-file-handler>
+            <logger category="com.arjuna">
+                <level name="WARN"/>
+            </logger>
+            <logger category="org.apache.tomcat.util.modeler">
+                <level name="WARN"/>
+            </logger>
+            <logger category="org.jboss.as.config">
+                <level name="DEBUG"/>
+            </logger>
+            <logger category="sun.rmi">
+                <level name="WARN"/>
+            </logger>
+            <logger category="jacorb">
+                <level name="WARN"/>
+            </logger>
+            <logger category="jacorb.config">
+                <level name="ERROR"/>
+            </logger>
+            <root-logger>
+                <level name="INFO"/>
+                <handlers>
+                    <handler name="CONSOLE"/>
+                    <handler name="FILE"/>
+                </handlers>
+            </root-logger>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:datasources:1.1">
+            <datasources>
+                <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
+                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
+                    <driver>h2</driver>
+                    <security>
+                        <user-name>sa</user-name>
+                        <password>sa</password>
+                    </security>
+                </datasource>
+                <drivers>
+                    <driver name="h2" module="com.h2database.h2">
+                        <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+                    </driver>
+                </drivers>
+            </datasources>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1">
+            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:ee:1.1">
+            <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
+            <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:ejb3:1.4">
+            <session-bean>
+                <stateless>
+                    <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+                </stateless>
+                <stateful default-access-timeout="5000" cache-ref="simple"/>
+                <singleton default-access-timeout="5000"/>
+            </session-bean>
+            <pools>
+                <bean-instance-pools>
+                    <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                    <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                </bean-instance-pools>
+            </pools>
+            <caches>
+                <cache name="simple" aliases="NoPassivationCache"/>
+                <cache name="passivating" passivation-store-ref="file" aliases="SimpleStatefulCache"/>
+            </caches>
+            <passivation-stores>
+                <file-passivation-store name="file"/>
+            </passivation-stores>
+            <async thread-pool-name="default"/>
+            <timer-service thread-pool-name="default">
+                <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
+            </timer-service>
+            <remote connector-ref="remoting-connector" thread-pool-name="default"/>
+            <thread-pools>
+                <thread-pool name="default">
+                    <max-threads count="10"/>
+                    <keepalive-time time="100" unit="milliseconds"/>
+                </thread-pool>
+            </thread-pools>
+            <default-security-domain value="other"/>
+            <default-missing-method-permissions-deny-access value="true"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:infinispan:1.4">
+            <cache-container name="web" aliases="standard-session-cache" default-cache="local-web" module="org.jboss.as.clustering.web.infinispan">
+                <local-cache name="local-web" batching="true">
+                    <file-store passivation="false" purge="false"/>
+                </local-cache>
+            </cache-container>
+            <cache-container name="hibernate" default-cache="local-query" module="org.jboss.as.jpa.hibernate:4">
+                <local-cache name="entity">
+                    <transaction mode="NON_XA"/>
+                    <eviction strategy="LRU" max-entries="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <local-cache name="local-query">
+                    <transaction mode="NONE"/>
+                    <eviction strategy="LRU" max-entries="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <local-cache name="timestamps">
+                    <transaction mode="NONE"/>
+                    <eviction strategy="NONE"/>
+                </local-cache>
+            </cache-container>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:jca:1.1">
+            <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
+            <bean-validation enabled="true"/>
+            <default-workmanager>
+                <short-running-threads>
+                    <core-threads count="50"/>
+                    <queue-length count="50"/>
+                    <max-threads count="50"/>
+                    <keepalive-time time="10" unit="seconds"/>
+                </short-running-threads>
+                <long-running-threads>
+                    <core-threads count="50"/>
+                    <queue-length count="50"/>
+                    <max-threads count="50"/>
+                    <keepalive-time time="10" unit="seconds"/>
+                </long-running-threads>
+            </default-workmanager>
+            <cached-connection-manager/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:jmx:1.2">
+            <expose-resolved-model/>
+            <expose-expression-model/>
+            <remoting-connector/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jpa:1.1">
+            <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:mail:1.1">
+            <mail-session jndi-name="java:jboss/mail/Default">
+                <smtp-server outbound-socket-binding-ref="mail-smtp"/>
+            </mail-session>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:naming:1.3">
+            <bindings>
+                <simple name="java:global/zanata/security/auth-policy-names/internal" value="zanata.internal"/>
+                <simple name="java:global/zanata/security/admin-users" value="admin"/>
+                <simple name="java:global/zanata/files/document-storage-directory" value="${user.home}/zanata/files"/>
+		        <simple name="java:global/zanata/email/default-from-address" value="no-reply@mydomain.com"/>
+            </bindings>
+            <remote-naming/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:remoting:1.1">
+            <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:resource-adapters:1.1"/>
+        <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:security:1.2">
+            <security-domains>
+                <security-domain name="zanata">
+                    <authentication>
+                        <login-module code="org.zanata.security.ZanataCentralLoginModule" flag="required"/>
+                    </authentication>
+                </security-domain>
+                <security-domain name="zanata.internal">
+                    <authentication>
+                        <login-module code="org.jboss.seam.security.jaas.SeamLoginModule" flag="required"/>
+                    </authentication>
+                </security-domain>
+                <security-domain name="other" cache-type="default">
+                    <authentication>
+                        <login-module code="Remoting" flag="optional">
+                            <module-option name="password-stacking" value="useFirstPass"/>
+                        </login-module>
+                        <login-module code="RealmDirect" flag="required">
+                            <module-option name="password-stacking" value="useFirstPass"/>
+                        </login-module>
+                    </authentication>
+                </security-domain>
+                <security-domain name="jboss-web-policy" cache-type="default">
+                    <authorization>
+                        <policy-module code="Delegating" flag="required"/>
+                    </authorization>
+                </security-domain>
+                <security-domain name="jboss-ejb-policy" cache-type="default">
+                    <authorization>
+                        <policy-module code="Delegating" flag="required"/>
+                    </authorization>
+                </security-domain>
+            </security-domains>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
+        <subsystem xmlns="urn:jboss:domain:transactions:1.3">
+            <core-environment>
+                <process-id>
+                    <uuid/>
+                </process-id>
+            </core-environment>
+            <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+            <coordinator-environment default-timeout="300"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:web:1.4" default-virtual-server="default-host" native="false">
+            <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/>
+            <virtual-server name="default-host" enable-welcome-root="true">
+                <alias name="localhost"/>
+                <alias name="example.com"/>
+            </virtual-server>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:webservices:1.2">
+            <modify-wsdl-address>true</modify-wsdl-address>
+            <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
+            <endpoint-config name="Standard-Endpoint-Config"/>
+            <endpoint-config name="Recording-Endpoint-Config">
+                <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
+                    <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
+                </pre-handler-chain>
+            </endpoint-config>
+            <client-config name="Standard-Client-Config"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+    </profile>
+
+    <interfaces>
+        <interface name="management">
+            <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}"/>
+        </interface>
+        <interface name="unsecure">
+            <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
+        </interface>
+    </interfaces>
+
+    <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
+        <socket-binding name="management-native" interface="management" port="${jboss.management.native.port:9999}"/>
+        <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
+        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
+        <socket-binding name="ajp" port="8009"/>
+        <socket-binding name="http" port="8080"/>
+        <socket-binding name="https" port="8443"/>
+        <socket-binding name="remoting" port="4447"/>
+        <socket-binding name="txn-recovery-environment" port="4712"/>
+        <socket-binding name="txn-status-manager" port="4713"/>
+        <outbound-socket-binding name="mail-smtp">
+            <remote-destination host="localhost" port="25"/>
+        </outbound-socket-binding>
+    </socket-binding-group>
+
+</server>
diff --git a/zanata-war/etc/scripts/zanata-server-package.sh b/zanata-war/etc/scripts/zanata-server-package.sh
index ac06069de9..144a18f21f 100755
--- a/zanata-war/etc/scripts/zanata-server-package.sh
+++ b/zanata-war/etc/scripts/zanata-server-package.sh
@@ -4,10 +4,10 @@
 # Author: camunoz@redhat.com
 
 # This script prepares a Zanata standalone server package
-# based on JBoss 5 Community version.
+# based on JBoss 7.2.0 AS Community version.
 #
 # Parameters:
-# 1. JBoss 5 zip distribution location.
+# 1. JBoss 7 zip distribution location.
 #
 # Pre-requisites:
 # 1. Apache maven in the path
@@ -15,7 +15,7 @@
 # Mysql Driver version to be used
 MYSQL_DRV_VERSION=5.1.18
 
-# Get the JBoss 5 zip location from parameters
+# Get the JBoss 7 zip location from parameters
 JBOSS_ZIP_LOC=$1
 JBOSS_ZIP_PARENT=${JBOSS_ZIP_LOC%/*}
 
@@ -37,39 +37,29 @@ JBOSS_TMP_DIR=$TMP_DIR/$(ls $TMP_DIR | sort -n | head -1)
 
 # Remove unnecessary files from the package
 echo 'Customizing JBoss release...'
-rm -rf $JBOSS_TMP_DIR/client
+rm -rf $JBOSS_TMP_DIR/bin/client
 rm -rf $JBOSS_TMP_DIR/docs
-rm -rf $JBOSS_TMP_DIR/server/all
-rm -rf $JBOSS_TMP_DIR/server/minimal
-rm -rf $JBOSS_TMP_DIR/server/standard
-rm -rf $JBOSS_TMP_DIR/server/web
-rm -rf $JBOSS_TMP_DIR/server/default/deploy/admin-console.war
-rm -rf $JBOSS_TMP_DIR/server/default/deploy/jmx-console.war
-rm -rf $JBOSS_TMP_DIR/server/default/deploy/ROOT.war
-
-# Rename files
-mv $JBOSS_TMP_DIR/server/default $JBOSS_TMP_DIR/server/zanata
 
 # Add Zanata specific files
-cp $ZANATA_WAR_HOME/target/zanata-*.war $JBOSS_TMP_DIR/server/zanata/deploy/zanata.war
-cp $ZANATA_WAR_HOME/src/etc/zanata-ds.xml $JBOSS_TMP_DIR/server/zanata/deploy
+cp $ZANATA_WAR_HOME/target/zanata-*.war $JBOSS_TMP_DIR/standalone/deployments/zanata.war
+cp $ZANATA_WAR_HOME/src/etc/zanata-ds.xml $JBOSS_TMP_DIR//standalone/deployments
 cp -r $ZANATA_WAR_HOME/etc/public-package/* $JBOSS_TMP_DIR/
 
 # Get Maven dependencies
 mvn dependency:get -DrepoUrl=http://repo1.maven.org -Dartifact=mysql:mysql-connector-java:$MYSQL_DRV_VERSION
-cp ~/.m2/repository/mysql/mysql-connector-java/$MYSQL_DRV_VERSION/mysql-connector-java-$MYSQL_DRV_VERSION.jar $JBOSS_TMP_DIR/server/zanata/lib
+cp ~/.m2/repository/mysql/mysql-connector-java/$MYSQL_DRV_VERSION/mysql-connector-java-$MYSQL_DRV_VERSION.jar $JBOSS_TMP_DIR/standalone/deployments/mysql-connector-java.jar
 
 # Create zanata start scripts
 
 echo "# Zanata start script" >> $JBOSS_TMP_DIR/bin/start-zanata.sh
-echo "./run.sh -c zanata" >> $JBOSS_TMP_DIR/bin/start-zanata.sh
-echo "run.bat -c zanata" >> $JBOSS_TMP_DIR/bin/start-zanata.bat
+echo "./standalone.sh" >> $JBOSS_TMP_DIR/bin/start-zanata.sh
+echo "standalone.bat" >> $JBOSS_TMP_DIR/bin/start-zanata.bat
 chmod a+x $JBOSS_TMP_DIR/bin/start-zanata.sh
 
 # Rename the JBoss temporary directory
 mv $JBOSS_TMP_DIR $TMP_DIR/zanata-server-$zanata_version
 
-# Pack the war again
+# Pack the distribution
 echo 'Building distributable archive...'
 cd $TMP_DIR
 zip -rq zanata-server-${zanata_version}.zip zanata-server-$zanata_version
diff --git a/zanata-war/src/etc/zanata-ds.xml b/zanata-war/src/etc/zanata-ds.xml
index 1117fce260..7933235a0b 100644
--- a/zanata-war/src/etc/zanata-ds.xml
+++ b/zanata-war/src/etc/zanata-ds.xml
@@ -1,212 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE datasources
-    PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
-    "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
-<datasources>
-  <local-tx-datasource>
-	<jndi-name>zanataDatasource</jndi-name>
-	<connection-url>jdbc:mysql://localhost:3306/zanata?characterEncoding=UTF-8</connection-url>
-    <driver-class>com.mysql.jdbc.Driver</driver-class>
-    <user-name>${mysql.user}</user-name>
-    <password>${mysql.password}</password>
-  </local-tx-datasource>
-</datasources>
-
+<!-- http://docs.jboss.org/ironjacamar/schema/datasources_1_0.xsd -->
 <!--
-The three transaction types you can use are:
-
-  local-tx-datasource : Identifies a data source that uses transactions, even distributed 
-                        transactions within the local application server, but does not use 
-                        distributed transactions among multiple application servers.
-                        
-  no-tx-datasource    : Identifies a data source that does not use transactions. This option is not 
-                        shown in the example, but would appear in place of the <local-tx-datasource> 
-                        tag. 
-  
-  xa-datasource       : Identifies a data source that uses distributed transaction among multiple 
-                        application servers. This option is not shown in the example, but would 
-                        appear in place of the <local-tx-datasource> tag. 
-                        
-                        So which transaction type should you use? In most cases you will use  
-                        <local-tx-datasource> because it handles transactions within a single 
-                        application server. If you are clustering your application servers, or want 
-                        to use distributed transactions among multiple application servers, then you 
-                        should use  <xa-datasource>. Note that both  <local-tx-datasource> and  
-                        <xa-datasource> handle distributed transactions which involve multiple 
-                        datasources. The difference is that  <local-tx-datasource> handles them only 
-                        within a single running application server, while  <xa-datasource> handles 
-                        them among many running application servers. On the other end of the 
-                        spectrum, if your applications only read from the database, then using 
-                        <no-tx-datasource> would be appropriate. 
-                        
-                        WHAT IS XA? 
-                        XA is an API defined by The Open Group's Distributed Transaction Processing 
-                        model. This model provides communications mechanisms between a Transaction 
-                        Monitor and several resource managers which perform updates against 
-                        databases. The Transaction Monitor is responsible for coordinating the 
-                        individual transactions handled by the resource managers to ensure 
-                        transactional semantics when multiple resource managers are involved in a 
-                        single transaction. 
-
-                        
-Within the transaction type, you can specify a wide variety of configuration options. The following
-describes the various configuration options in the *-ds.xml file. A complete set of configuration 
-options, along with a description of each option, can be found in the  docs/dtd/jboss-ds_1_5.dtd file.                         
-  
-  jndi-name           : The name used to reference the data source in your application configurations. 
-                        The name is used to look up the data source in the JNDI namespace. The 
-                        "java:" prefix is automatically added to this name, so datasources are not 
-                        available outside the virtual machine.
-                        
-  connection-url      : The database-specific URL to the server.
-                        
-  driver-class        : The driver you are using for your database.
-  
-  xa-datasource-class : The class name for the distributed transaction data source. 
-                        Valid only for xa-datasource
-                        
-  user-name           : The username that is defined to access this data source. In general,
-                        do not use the root username.
-                        
-  password            : The password for the corresponding username.
-  
-  min-pool-size       : The starting pool size for the number of database connections to be allowed 
-                        by the application server, default=0. Note that the application server does 
-                        not open any connections until the first request for a connection, at which 
-                        time it opens this many connections. One way of forcing the connections to be 
-                        established when the application server is started is to write a simple 
-                        service that does nothing but ask for a connection. 
-                        
-  max-pool-size       : The maximum number of open connections maintained by the application server,
-                        default=20. If the application server runs out of connections, it allocates 
-                        a new connection to fulfill that request, until it hits the maximum number of 
-                        connections. At that point it queues the requests until connections are freed. 
-                        Therefore, it is very important that applications close any connections that 
-                        they obtain.
-                        NOTE: The max-pool-zize value must not exceed the max-connections porperty
-                        value in MySql.
-                        
-  idle-timeout-minutes: The amount of time before the connection times out.
-                        If a surplus connection is not in use for this many minutes, then that 
-                        connection is closed. Note that the number of open connections never goes 
-                        below the <min-pool-size>, default=0
-  blocking-timeout-
-  millis              : The amount of time a thread waits on a connection, if all of the connections 
-                        are in use and the maximum connections have been allocated. On a timeout 
-                        the requestor will gett an exception.
-                        
-  track-statements    : A Boolean (true/false) that has the data source monitor for unclosed 
-                        Statements or ResultSets when the connection is returned to the pool, this 
-                        is a debugging feature that should be turned off in production.
-                        
-  new-connection-sql  : An sql statement that is executed against each new connection. 
-                        This can be used to set the connection schema, etc.
-  check-valid-
-  connection-sql      : Identifies a SQL to be executed when the connection is established to 
-                        verify that the connection is valid, e.g. SELECT 1
-                        JBoss will run the SQL statement before handing out the connection from 
-                        the pool. If the SQL fails, the connection will be destroyed/closed and 
-                        new ones will be created. 
-                        MySQLValidConnectionChecker is preferred for newer drivers. This will be run 
-                        before a managed connection is removed from the pool for use by a client. 
-                        See: valid-connection-checker-class-name
-  valid-connection-
-  checker-class-name  : A class that determines if a connection is valid before it is handed out 
-                        from the pool. Should only be used on drivers after 3.22.1 with "ping" 
-                        support. The class specified must implement the 
-                        org.jboss.resource.adapter.jdbc.ValidConnectionChecker interface. Use this 
-                        option instead of check-valid-connection-sql when you want to use more than 
-                        a single SQL statement to check the validity of the connection. Be aware 
-                        that any application making a connection request that causes a connection to 
-                        be established must wait until the connection checker is finished
-                        For MySql the class name is:
-                        org.jboss.resource.adapter.jdbc.vendor.MySQLValidConnectionChecker
-  exception-sorter-
-  class-name          : Identifies a class used to determine if an error number returned by the 
-                        database is fatal. For MySql the class name is:
-                        org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter
-                        
-  type-mapping        : Used by the container-managed persistence (CMP) code to identify the 
-                        database and adjust its database handling accordingly. The name use 
-                        must match one of the names in the standardjbosscmp-jdbc.xml file. 
-                        Additionally, you can add new entries to the standardjbosscmp-jdbc.xml 
-                        to customize the database interaction. 
-                        NOTE that this is used ONLY for EJB 2.1, NOT for EJB 3.
-                        
-  config-property:      Identifies a property to pass to the java.sql.Driver when establishing a 
-                        database connection. Refer to the documentation for your JDBC driver for the 
-                        valid properties. You can provide multiple config-property entries. Valid 
-                        only for local-tx-datasource and no-tx-datasource.    
-  xa-datasource-
-  property            : Identifies a property to pass to the javax.sql.DataSource when establishing 
-                        a database connection. Refer to the documentation for the JDBC driver for 
-                        the valid properties. You can provide multiple xa-datasource-property 
-                        entries. Valid only for xa-datasource.                        
-  prepared-statement-
-  cache-size          : The number of prepared statements to hold in the cache, default=0
-  
-  share-prepared-
-  statements          : If a request creates the same prepared statement more than once in a
-                        given request, should the same prepared statement object be used. Note
-                        that reusing the prepared statement in this case could cause the
-                        application to get unintended results if the application requested the result
-                        set from the first prepared statement after creating the second prepared
-                        statement, default=false
-  transaction-
-  isolation           : Specifies the java.sql.Connection transaction isolation level to use,
-                        unspecified means use the default provided by the database. 
-                        The constants defined in the Connection interface are the possible element 
-                        content values and include:
-                          TRANSACTION_READ_UNCOMMITTED
-                          TRANSACTION_READ_COMMITTED
-                          TRANSACTION_REPEATABLE_READ
-                          TRANSACTION_SERIALIZABLE
-                          TRANSACTION_NONE
-                          
-                        Refer to your database JDBC documentation for a description of each level 
-                        and which levels your database supports.
-                        
-  Notes for MySql:
-  * Use UTF8 charset when creating the database:
-      CREATE DATABASE my_database CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT CHARSET utf8;
-    
-  * Use InnoDb for tables
-      In persistence.xml add this property for hbm2ddl: 
-      <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5InnoDBDialect"/>
-      
-      or if you creates the tables by writing the SQL DDL by hand (you little machocist:):
-        CREATE TABLE `my_database`.`my_table` (
-          `id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
-          `text` VARCHAR(256) NOT NULL DEFAULT '',
-          PRIMARY KEY (`id`)
-        ) ENGINE = InnoDB;
-
-
-    MySql example:
-    
-    <local-tx-datasource>
-
-        <jndi-name>seam-refimplDatasource</jndi-name>
-        <connection-url>jdbc:mysql://localhost/refimpl_db?characterEncoding=UTF-8</connection-url>
-        <driver-class>com.mysql.jdbc.Driver</driver-class>
-        <user-name>root</user-name>
-        <password></password>
-
-        <min-pool-size>20</min-pool-size>
-
-        // Make sure your MySQL config has that many max_connections!
-             This is the max_threads in default Tomcat server.xml on JBoss AS. //
-        <max-pool-size>250</max-pool-size>
-
-        <blocking-timeout-millis>5000</blocking-timeout-millis>
-
-        // Needs to be smaller than wait_timeout (which is in seconds) in /etc/my.cnf! //
-        <idle-timeout-minutes>2</idle-timeout-minutes>
-
-        // These are the secret ingredients that make it stable! A simple check-valid-connection-sql won't be enough! //
-        <exception-sorter-class-name>com.mysql.jdbc.integration.jboss.ExtendedMysqlExceptionSorter</exception-sorter-class-name>
-        <valid-connection-checker-class-name>com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker</valid-connection-checker-class-name>
-
-    </local-tx-datasource>
-        
+Using this datasource:
+1. create a jboss module for mysql-connector and activate it using jboss-cli.sh
+2. save this datasource as JBOSS_HOME/standalone/deployments/zanata-ds.xml
+See http://jaitechwriteups.blogspot.com/2012/02/jboss-as-710final-thunder-released-java.html
 -->
+<datasources>
+    <datasource jndi-name="java:jboss/datasources/zanataDatasource"
+                enabled="true" use-java-context="true" pool-name="zanataDatasource">
+        <connection-url>jdbc:mysql://localhost:3306/zanata?characterEncoding=UTF-8</connection-url>
+        <driver>mysql-connector-java.jar</driver>
+        <security>
+            <user-name>root</user-name>
+            <!--
+            <password></password>
+            -->
+        </security>
+    </datasource>
+</datasources>
\ No newline at end of file

From b42c7eaf9b110878c41e49f594bc18dea443cf55 Mon Sep 17 00:00:00 2001
From: "Carlos A. Munoz" <camunoz@redhat.com>
Date: Mon, 26 Aug 2013 08:48:08 +1000
Subject: [PATCH 2/4] Change the way the public package is built.

Now uses .patch files to make modifications.
---
 .gitignore                                    |   3 +
 zanata-war/etc/public-package/README.txt      |   2 +-
 .../layers/base/sun/jdk/main/module.xml       |  97 ------
 .../etc/public-package/patches/as7.patch      |  64 ++++
 .../standalone/configuration/standalone.xml   | 329 ------------------
 .../etc/scripts/zanata-server-package.sh      |   4 +-
 6 files changed, 70 insertions(+), 429 deletions(-)
 delete mode 100644 zanata-war/etc/public-package/modules/system/layers/base/sun/jdk/main/module.xml
 create mode 100644 zanata-war/etc/public-package/patches/as7.patch
 delete mode 100644 zanata-war/etc/public-package/standalone/configuration/standalone.xml

diff --git a/.gitignore b/.gitignore
index 76cbea3187..fd98cb7b21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,9 @@
 
 *~
 *.patch
+# Include patches used for the publick package
+!/zanata-war/etc/public-package/patches/**/*.patch
+
 *.sedbak
 zanatasearchindex/
 test-output/
diff --git a/zanata-war/etc/public-package/README.txt b/zanata-war/etc/public-package/README.txt
index 21cd555d7a..f6f1fb7611 100644
--- a/zanata-war/etc/public-package/README.txt
+++ b/zanata-war/etc/public-package/README.txt
@@ -1,3 +1,3 @@
 This folder contains files necessary to package the publicly available Zanata download.
 See ../scripts/zanata-server-package.sh for details on how this is done.
-The files are located as they would on the root of the JBoss server.
\ No newline at end of file
+All file modifications should be done as patch files.
\ No newline at end of file
diff --git a/zanata-war/etc/public-package/modules/system/layers/base/sun/jdk/main/module.xml b/zanata-war/etc/public-package/modules/system/layers/base/sun/jdk/main/module.xml
deleted file mode 100644
index 2dcef2efb1..0000000000
--- a/zanata-war/etc/public-package/modules/system/layers/base/sun/jdk/main/module.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software 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
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<module xmlns="urn:jboss:module:1.1" name="sun.jdk">
-    <resources>
-        <!-- currently jboss modules has not way of importing services from
-        classes.jar so we duplicate them here -->
-        <resource-root path="service-loader-resources"/>
-    </resources>
-    <dependencies>
-        <system export="true">
-            <paths>
-                <path name="com/sun/management"/>
-                <path name="com/sun/script/javascript"/>
-                <path name="com/sun/image/codec/jpeg"/>
-                <path name="com/sun/imageio/plugins/bmp"/>
-                <path name="com/sun/imageio/plugins/common"/>
-                <path name="com/sun/imageio/plugins/gif"/>
-                <path name="com/sun/imageio/plugins/jpeg"/>
-                <path name="com/sun/imageio/plugins/png"/>
-                <path name="com/sun/imageio/plugins/wbmp"/>
-                <path name="com/sun/imageio/spi"/>
-                <path name="com/sun/imageio/stream"/>
-                <path name="com/sun/jndi/dns"/>
-                <path name="com/sun/jndi/ldap"/>
-                <path name="com/sun/jndi/url"/>
-                <path name="com/sun/jndi/url/dns"/>
-                <path name="com/sun/crypto/provider"/>
-                <path name="com/sun/org/apache/xml/internal/security/transforms/implementations"/>
-                <path name="com/sun/security/auth"/>
-                <path name="com/sun/security/auth/login"/>
-                <path name="com/sun/security/auth/module"/>
-                <path name="sun/awt"/>
-                <path name="sun/awt/color"/>
-                <path name="sun/awt/datatransfer"/>
-                <path name="sun/awt/dnd"/>
-                <path name="sun/awt/event"/>
-                <path name="sun/awt/geom"/>
-                <path name="sun/awt/im"/>
-                <path name="sun/awt/image"/>
-                <path name="sun/awt/image/codec"/>
-                <path name="sun/awt/motif"/>
-                <path name="sun/awt/resources"/>
-                <path name="sun/awt/shell"/>
-                <path name="sun/awt/util"/>
-                <path name="sun/awt/windows"/>
-                <path name="sun/awt/X11"/>
-                <path name="sun/print"/>
-                <path name="sun/print/resources"/>
-                <path name="sun/security/pkcs"/>
-                <path name="sun/security/x509"/>
-                <path name="sun/jdbc/odbc"/>
-                <path name="sun/jdbc/odbc/ee"/>
-                <path name="sun/font"/>
-                <path name="sun/misc"/>
-                <path name="sun/io"/>
-                <path name="sun/nio"/>
-                <path name="sun/nio/ch"/>
-                <path name="sun/security"/>
-                <path name="sun/security/krb5"/>
-                <path name="sun/util"/>
-                <path name="sun/util/calendar"/>
-                <path name="sun/util/locale"/>
-                <path name="sun/util/resources"/>
-                <path name="sun/security/pkcs11"/>
-                <path name="sun/security/provider"/>
-                <path name="sun/text"/>
-                <path name="META-INF/services"/>
-            </paths>
-            <exports>
-                <include-set>
-                    <path name="META-INF/services"/>
-                </include-set>
-            </exports>
-        </system>
-    </dependencies>
-</module>
diff --git a/zanata-war/etc/public-package/patches/as7.patch b/zanata-war/etc/public-package/patches/as7.patch
new file mode 100644
index 0000000000..10342dcd39
--- /dev/null
+++ b/zanata-war/etc/public-package/patches/as7.patch
@@ -0,0 +1,64 @@
+diff -ru jboss-as-7.2.0.Final/modules/system/layers/base/sun/jdk/main/module.xml jboss-as-7.2.0.Final.zanata/modules/system/layers/base/sun/jdk/main/module.xml
+--- jboss-as-7.2.0.Final/modules/system/layers/base/sun/jdk/main/module.xml	2013-08-07 09:00:18.000000000 +1000
++++ jboss-as-7.2.0.Final.zanata/modules/system/layers/base/sun/jdk/main/module.xml	2013-08-23 16:25:25.551155172 +1000
+@@ -30,6 +30,7 @@
+     <dependencies>
+         <system export="true">
+             <paths>
++                <path name="com/sun/management"/>
+                 <path name="com/sun/script/javascript"/>
+                 <path name="com/sun/image/codec/jpeg"/>
+                 <path name="com/sun/imageio/plugins/bmp"/>
+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
+@@ -25,6 +25,10 @@
+         <extension module="org.jboss.as.webservices"/>
+         <extension module="org.jboss.as.weld"/>
+     </extensions>
++    <system-properties>
++       <property name="javamelody.storage-directory" value="${user.home}/zanata/stats"/>
++       <property name="hibernate.search.default.indexBase" value="${user.home}/zanata/indexes"/>
++    </system-properties>
+     <management>
+         <security-realms>
+             <security-realm name="ManagementRealm">
+@@ -212,6 +216,12 @@
+             </mail-session>
+         </subsystem>
+         <subsystem xmlns="urn:jboss:domain:naming:1.2">
++            <bindings>
++               <simple name="java:global/zanata/security/auth-policy-names/internal" value="zanata.internal"/>
++               <simple name="java:global/zanata/security/admin-users" value="admin"/>
++               <simple name="java:global/zanata/files/document-storage-directory" value="${user.home}/zanata/files"/>
++               <simple name="java:global/zanata/email/default-from-address" value="no-reply@mydomain.com"/>
++            </bindings>
+             <remote-naming/>
+         </subsystem>
+         <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
+@@ -222,6 +232,16 @@
+         <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+         <subsystem xmlns="urn:jboss:domain:security:1.2">
+             <security-domains>
++                <security-domain name="zanata">
++                    <authentication>
++                        <login-module code="org.zanata.security.ZanataCentralLoginModule" flag="required"/>
++                    </authentication>
++                </security-domain>
++                <security-domain name="zanata.internal">
++                    <authentication>
++                        <login-module code="org.jboss.seam.security.jaas.SeamLoginModule" flag="required"/>
++                    </authentication>
++                </security-domain>
+                 <security-domain name="other" cache-type="default">
+                     <authentication>
+                         <login-module code="Remoting" flag="optional">
+@@ -304,4 +324,4 @@
+             <remote-destination host="localhost" port="25"/>
+         </outbound-socket-binding>
+     </socket-binding-group>
+-</server>
+\ No newline at end of file
++</server>
+Only in jboss-as-7.2.0.Final.zanata/standalone/configuration: standalone.xml~
diff --git a/zanata-war/etc/public-package/standalone/configuration/standalone.xml b/zanata-war/etc/public-package/standalone/configuration/standalone.xml
deleted file mode 100644
index a48708d822..0000000000
--- a/zanata-war/etc/public-package/standalone/configuration/standalone.xml
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:1.4">
-
-    <extensions>
-        <extension module="org.jboss.as.clustering.infinispan"/>
-        <extension module="org.jboss.as.connector"/>
-        <extension module="org.jboss.as.deployment-scanner"/>
-        <extension module="org.jboss.as.ee"/>
-        <extension module="org.jboss.as.ejb3"/>
-        <extension module="org.jboss.as.jaxrs"/>
-        <extension module="org.jboss.as.jdr"/>
-        <extension module="org.jboss.as.jmx"/>
-        <extension module="org.jboss.as.jpa"/>
-        <extension module="org.jboss.as.jsf"/>
-        <extension module="org.jboss.as.logging"/>
-        <extension module="org.jboss.as.mail"/>
-        <extension module="org.jboss.as.naming"/>
-        <extension module="org.jboss.as.pojo"/>
-        <extension module="org.jboss.as.remoting"/>
-        <extension module="org.jboss.as.sar"/>
-        <extension module="org.jboss.as.security"/>
-        <extension module="org.jboss.as.threads"/>
-        <extension module="org.jboss.as.transactions"/>
-        <extension module="org.jboss.as.web"/>
-        <extension module="org.jboss.as.webservices"/>
-        <extension module="org.jboss.as.weld"/>
-    </extensions>
-
-    <system-properties>
-        <property name="javamelody.storage-directory" value="${user.home}/zanata/stats"/>
-        <property name="hibernate.search.default.indexBase" value="${user.home}/zanata/indexes"/>
-    </system-properties>
-
-    <management>
-        <security-realms>
-            <security-realm name="ManagementRealm">
-                <authentication>
-                    <local default-user="$local"/>
-                    <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
-                </authentication>
-            </security-realm>
-            <security-realm name="ApplicationRealm">
-                <authentication>
-                    <local default-user="$local" allowed-users="*"/>
-                    <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
-                </authentication>
-                <authorization>
-                    <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
-                </authorization>
-            </security-realm>
-        </security-realms>
-        <management-interfaces>
-            <native-interface security-realm="ManagementRealm">
-                <socket-binding native="management-native"/>
-            </native-interface>
-            <http-interface security-realm="ManagementRealm">
-                <socket-binding http="management-http"/>
-            </http-interface>
-        </management-interfaces>
-    </management>
-
-    <profile>
-        <subsystem xmlns="urn:jboss:domain:logging:1.2">
-            <console-handler name="CONSOLE">
-                <level name="INFO"/>
-                <formatter>
-                    <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
-                </formatter>
-            </console-handler>
-            <periodic-rotating-file-handler name="FILE" autoflush="true">
-                <formatter>
-                    <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
-                </formatter>
-                <file relative-to="jboss.server.log.dir" path="server.log"/>
-                <suffix value=".yyyy-MM-dd"/>
-                <append value="true"/>
-            </periodic-rotating-file-handler>
-            <logger category="com.arjuna">
-                <level name="WARN"/>
-            </logger>
-            <logger category="org.apache.tomcat.util.modeler">
-                <level name="WARN"/>
-            </logger>
-            <logger category="org.jboss.as.config">
-                <level name="DEBUG"/>
-            </logger>
-            <logger category="sun.rmi">
-                <level name="WARN"/>
-            </logger>
-            <logger category="jacorb">
-                <level name="WARN"/>
-            </logger>
-            <logger category="jacorb.config">
-                <level name="ERROR"/>
-            </logger>
-            <root-logger>
-                <level name="INFO"/>
-                <handlers>
-                    <handler name="CONSOLE"/>
-                    <handler name="FILE"/>
-                </handlers>
-            </root-logger>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:datasources:1.1">
-            <datasources>
-                <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
-                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
-                    <driver>h2</driver>
-                    <security>
-                        <user-name>sa</user-name>
-                        <password>sa</password>
-                    </security>
-                </datasource>
-                <drivers>
-                    <driver name="h2" module="com.h2database.h2">
-                        <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
-                    </driver>
-                </drivers>
-            </datasources>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1">
-            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000"/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ee:1.1">
-            <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
-            <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ejb3:1.4">
-            <session-bean>
-                <stateless>
-                    <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
-                </stateless>
-                <stateful default-access-timeout="5000" cache-ref="simple"/>
-                <singleton default-access-timeout="5000"/>
-            </session-bean>
-            <pools>
-                <bean-instance-pools>
-                    <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
-                    <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
-                </bean-instance-pools>
-            </pools>
-            <caches>
-                <cache name="simple" aliases="NoPassivationCache"/>
-                <cache name="passivating" passivation-store-ref="file" aliases="SimpleStatefulCache"/>
-            </caches>
-            <passivation-stores>
-                <file-passivation-store name="file"/>
-            </passivation-stores>
-            <async thread-pool-name="default"/>
-            <timer-service thread-pool-name="default">
-                <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
-            </timer-service>
-            <remote connector-ref="remoting-connector" thread-pool-name="default"/>
-            <thread-pools>
-                <thread-pool name="default">
-                    <max-threads count="10"/>
-                    <keepalive-time time="100" unit="milliseconds"/>
-                </thread-pool>
-            </thread-pools>
-            <default-security-domain value="other"/>
-            <default-missing-method-permissions-deny-access value="true"/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:infinispan:1.4">
-            <cache-container name="web" aliases="standard-session-cache" default-cache="local-web" module="org.jboss.as.clustering.web.infinispan">
-                <local-cache name="local-web" batching="true">
-                    <file-store passivation="false" purge="false"/>
-                </local-cache>
-            </cache-container>
-            <cache-container name="hibernate" default-cache="local-query" module="org.jboss.as.jpa.hibernate:4">
-                <local-cache name="entity">
-                    <transaction mode="NON_XA"/>
-                    <eviction strategy="LRU" max-entries="10000"/>
-                    <expiration max-idle="100000"/>
-                </local-cache>
-                <local-cache name="local-query">
-                    <transaction mode="NONE"/>
-                    <eviction strategy="LRU" max-entries="10000"/>
-                    <expiration max-idle="100000"/>
-                </local-cache>
-                <local-cache name="timestamps">
-                    <transaction mode="NONE"/>
-                    <eviction strategy="NONE"/>
-                </local-cache>
-            </cache-container>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jca:1.1">
-            <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
-            <bean-validation enabled="true"/>
-            <default-workmanager>
-                <short-running-threads>
-                    <core-threads count="50"/>
-                    <queue-length count="50"/>
-                    <max-threads count="50"/>
-                    <keepalive-time time="10" unit="seconds"/>
-                </short-running-threads>
-                <long-running-threads>
-                    <core-threads count="50"/>
-                    <queue-length count="50"/>
-                    <max-threads count="50"/>
-                    <keepalive-time time="10" unit="seconds"/>
-                </long-running-threads>
-            </default-workmanager>
-            <cached-connection-manager/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jmx:1.2">
-            <expose-resolved-model/>
-            <expose-expression-model/>
-            <remoting-connector/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jpa:1.1">
-            <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:mail:1.1">
-            <mail-session jndi-name="java:jboss/mail/Default">
-                <smtp-server outbound-socket-binding-ref="mail-smtp"/>
-            </mail-session>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:naming:1.3">
-            <bindings>
-                <simple name="java:global/zanata/security/auth-policy-names/internal" value="zanata.internal"/>
-                <simple name="java:global/zanata/security/admin-users" value="admin"/>
-                <simple name="java:global/zanata/files/document-storage-directory" value="${user.home}/zanata/files"/>
-		        <simple name="java:global/zanata/email/default-from-address" value="no-reply@mydomain.com"/>
-            </bindings>
-            <remote-naming/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:remoting:1.1">
-            <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:resource-adapters:1.1"/>
-        <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:security:1.2">
-            <security-domains>
-                <security-domain name="zanata">
-                    <authentication>
-                        <login-module code="org.zanata.security.ZanataCentralLoginModule" flag="required"/>
-                    </authentication>
-                </security-domain>
-                <security-domain name="zanata.internal">
-                    <authentication>
-                        <login-module code="org.jboss.seam.security.jaas.SeamLoginModule" flag="required"/>
-                    </authentication>
-                </security-domain>
-                <security-domain name="other" cache-type="default">
-                    <authentication>
-                        <login-module code="Remoting" flag="optional">
-                            <module-option name="password-stacking" value="useFirstPass"/>
-                        </login-module>
-                        <login-module code="RealmDirect" flag="required">
-                            <module-option name="password-stacking" value="useFirstPass"/>
-                        </login-module>
-                    </authentication>
-                </security-domain>
-                <security-domain name="jboss-web-policy" cache-type="default">
-                    <authorization>
-                        <policy-module code="Delegating" flag="required"/>
-                    </authorization>
-                </security-domain>
-                <security-domain name="jboss-ejb-policy" cache-type="default">
-                    <authorization>
-                        <policy-module code="Delegating" flag="required"/>
-                    </authorization>
-                </security-domain>
-            </security-domains>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
-        <subsystem xmlns="urn:jboss:domain:transactions:1.3">
-            <core-environment>
-                <process-id>
-                    <uuid/>
-                </process-id>
-            </core-environment>
-            <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
-            <coordinator-environment default-timeout="300"/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:web:1.4" default-virtual-server="default-host" native="false">
-            <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/>
-            <virtual-server name="default-host" enable-welcome-root="true">
-                <alias name="localhost"/>
-                <alias name="example.com"/>
-            </virtual-server>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:webservices:1.2">
-            <modify-wsdl-address>true</modify-wsdl-address>
-            <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
-            <endpoint-config name="Standard-Endpoint-Config"/>
-            <endpoint-config name="Recording-Endpoint-Config">
-                <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
-                    <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
-                </pre-handler-chain>
-            </endpoint-config>
-            <client-config name="Standard-Client-Config"/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
-    </profile>
-
-    <interfaces>
-        <interface name="management">
-            <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}"/>
-        </interface>
-        <interface name="unsecure">
-            <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
-        </interface>
-    </interfaces>
-
-    <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
-        <socket-binding name="management-native" interface="management" port="${jboss.management.native.port:9999}"/>
-        <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
-        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
-        <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
-        <socket-binding name="https" port="8443"/>
-        <socket-binding name="remoting" port="4447"/>
-        <socket-binding name="txn-recovery-environment" port="4712"/>
-        <socket-binding name="txn-status-manager" port="4713"/>
-        <outbound-socket-binding name="mail-smtp">
-            <remote-destination host="localhost" port="25"/>
-        </outbound-socket-binding>
-    </socket-binding-group>
-
-</server>
diff --git a/zanata-war/etc/scripts/zanata-server-package.sh b/zanata-war/etc/scripts/zanata-server-package.sh
index 144a18f21f..797b4afd61 100755
--- a/zanata-war/etc/scripts/zanata-server-package.sh
+++ b/zanata-war/etc/scripts/zanata-server-package.sh
@@ -42,8 +42,8 @@ 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_HOME/src/etc/zanata-ds.xml $JBOSS_TMP_DIR//standalone/deployments
-cp -r $ZANATA_WAR_HOME/etc/public-package/* $JBOSS_TMP_DIR/
+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
 
 # Get Maven dependencies
 mvn dependency:get -DrepoUrl=http://repo1.maven.org -Dartifact=mysql:mysql-connector-java:$MYSQL_DRV_VERSION

From e9037ce03c833ae44c8c44e63364588c62363d7a Mon Sep 17 00:00:00 2001
From: "Carlos A. Munoz" <camunoz@redhat.com>
Date: Wed, 11 Sep 2013 10:10:16 +1000
Subject: [PATCH 3/4] 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.
---
 .../etc/public-package/patches/as7.patch      | 21 ++++++++++++++++++-
 .../etc/scripts/zanata-server-package.sh      |  7 ++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/zanata-war/etc/public-package/patches/as7.patch b/zanata-war/etc/public-package/patches/as7.patch
index 10342dcd39..b6874b6307 100644
--- 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
index 797b4afd61..b63ea9112e 100755
--- 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
 

From 7e0a0751678d48913914ac1adf2383f9eb4b9929 Mon Sep 17 00:00:00 2001
From: "Carlos A. Munoz" <camunoz@redhat.com>
Date: Wed, 11 Sep 2013 10:40:42 +1000
Subject: [PATCH 4/4] Add help message when zanata-server-package is not
 invoked correctly.

---
 zanata-war/etc/scripts/zanata-server-package.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/zanata-war/etc/scripts/zanata-server-package.sh b/zanata-war/etc/scripts/zanata-server-package.sh
index b63ea9112e..9237b48fb1 100755
--- a/zanata-war/etc/scripts/zanata-server-package.sh
+++ b/zanata-war/etc/scripts/zanata-server-package.sh
@@ -13,6 +13,14 @@
 # Pre-requisites:
 # 1. Apache maven in the path
 
+if [ $# -lt 2 ]; then
+   echo "Usage:"
+   echo "zanata-server-package.sh JBOSS_LOCATION ZANATA_WAR_LOCATION"
+   echo ""
+   echo "This must be done with a jboss AS 7.2.0 zip file with Hibernate 4.2.0.Final"
+   exit 1
+fi
+
 # Mysql Driver version to be used
 MYSQL_DRV_VERSION=5.1.18