Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge pull request #110 from zanata/public-package
Browse files Browse the repository at this point in the history
Update zanata public package script to new JBoss AS 7 config.
  • Loading branch information
Alex Eng committed Sep 11, 2013
2 parents e70fede + 7e0a075 commit bf11906
Show file tree
Hide file tree
Showing 7 changed files with 129 additions and 388 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -6,6 +6,9 @@

*~
*.patch
# Include patches used for the publick package
!/zanata-war/etc/public-package/patches/**/*.patch

*.sedbak
zanatasearchindex/
test-output/
Expand Down
2 changes: 1 addition & 1 deletion 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.
All file modifications should be done as patch files.
83 changes: 83 additions & 0 deletions zanata-war/etc/public-package/patches/as7.patch
@@ -0,0 +1,83 @@
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-09-11 09:47:17.613643411 +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">
@@ -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>
</socket-binding-group>
-</server>
\ 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
141 changes: 0 additions & 141 deletions zanata-war/etc/public-package/server/zanata/conf/login-config.xml

This file was deleted.

16 changes: 0 additions & 16 deletions zanata-war/etc/public-package/server/zanata/conf/zanata.properties

This file was deleted.

45 changes: 24 additions & 21 deletions zanata-war/etc/scripts/zanata-server-package.sh
Expand Up @@ -4,21 +4,34 @@
# 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.
# 2. Zanata war location.
#
# 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

# 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%/*}

# Get the Zanata war location from parameters
ZANATA_WAR=$2


# Zanata War project Dir
ZANATA_WAR_HOME=../..

Expand All @@ -37,39 +50,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 -r $ZANATA_WAR_HOME/etc/public-package/* $JBOSS_TMP_DIR/
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

# 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
Expand Down

0 comments on commit bf11906

Please sign in to comment.