75e5a6dcfc20a582a4b4653a25c074f4263dd7dc

Message

fixes my wrong commit - fixes #1423

Diff

This diff is truncated to protect this page.

  1diff --git a/.gitignore b/.gitignore
  2index 4cb1720e7ca778b4104c88447a9b312b6516289b..51a5ee6c396f012ae162d0d63006d4d8e765b92f 100644
  3--- a/.gitignore
  4+++ b/.gitignore
  5@@ -1,6 +1,7 @@
  6 locals.zsh
  7 log/.zsh_history
  8 projects.zsh
  9+custom/*
 10 !custom/example
 11 !custom/example.zsh
 12 *.swp
 13diff --git a/custom/totvs.zsh b/custom/totvs.zsh
 14deleted file mode 100644
 15index 883bdf7ddd09adc3b570319c68597afd49735c31..0000000000000000000000000000000000000000
 16--- a/custom/totvs.zsh
 17+++ /dev/null
 18@@ -1,124 +0,0 @@
 19-#
 20-# Just some utilities for use in ecm development.
 21-#
 22-
 23-setopt rmstarsilent
 24-
 25-HOME="/home/carlos"
 26-ECM_WS="$HOME/totvs/ws"
 27-ECM_JBOSS="$HOME/Public/ecm/JBoss-7.1.1"
 28-ECM_PORT="8080"
 29-VOLDEMORT=$ECM_WS/voldemort
 30-ECM=$ECM_WS/ecm
 31-INSTALLER="n"
 32-DRY_CLEAN="n"
 33-
 34-# fuckin aliases
 35-alias ecmu=ecmup
 36-alias ecmb=ecmbuild
 37-alias ecmc=ecmclean
 38-alias ecms=ecmstart
 39-alias ecmo=ecmstop
 40-alias ecmi=ecminstall
 41-alias ecmri=ecmruninstall
 42-alias ecm=ecmfull
 43-alias e='MAVEN_OPTS="-Xmx2048m -XX:MaxPermSize=512m -DskipTests=true" ecm'  
 44-
 45-
 46-# update ecm
 47-ecmup() {
 48-	echo "update all the things!"
 49-	cd $VOLDEMORT && svn up
 50-	cd $ECM && svn up
 51-}
 52-
 53-# build it!
 54-ecmbuild() {
 55-	echo "build? no problem sir..."
 56-	cd $VOLDEMORT && mvncie && \
 57-	cd $VOLDEMORT/social-ecm && \
 58-	cd $VOLDEMORT/wcm && mvncie && \
 59-	cd $ECM/wecmpackage && mvncie && \
 60-	cd $VOLDEMORT/ecm && mvncie && \
 61-	ecminstall
 62-}
 63-
 64-# gen installer or cp wars...
 65-ecminstall() {
 66-	case $@ in
 67-	-*i*)
 68-		INSTALLER=y
 69-		;;
 70-	esac	
 71-  if [[ "$INSTALLER" == "y" ]]; then
 72-  	echo "generating installer..."
 73-    cd $VOLDEMORT/ecm/installer
 74-          mvnci -am -Drun=installer -DLinux64=true -DappServer=jboss
 75-  else
 76-		echo "cpying wars..."
 77-    cd $VOLDEMORT/ecm/build && mvnci && \
 78-		cd $VOLDEMORT/wcm/build && mvnci && \
 79-    cd $VOLDEMORT/social-ecm/build && mvnci
 80-	fi
 81-}
 82-
 83-# clean jboss trash folders
 84-ecmclean() {
 85-	echo "cleaning jboss shit"
 86-	case $@ in
 87-	-*d*)
 88-		DRY_CLEAN="y"
 89-		;;
 90-	esac
 91-	if [[ "$DRY_CLEAN" == "y" ]]; then
 92-		rm -rf $ECM_JBOSS/standalone/deployments/*.{failed,deployed,dodeploy,deploying}
 93-	else
 94-		rm -rf $ECM_JBOSS/standalone/deployments/*
 95-	fi
 96-	rm -rf $ECM_JBOSS/standalone/{log,tmp,data}
 97-	rm -rf $ECM_JBOSS/solr/zoo_data
 98-}
 99-
100-# start jboss server
101-ecmstart() {
102-	# why shall I start server if i just gen a installer?
103-	if [[ "$INSTALLER" == "y" ]]; then
104-		ecmruninstall
105-	else
106-		echo "starting jboss"
107-		cd $ECM_JBOSS/bin
108-		JAVA_OPTS="-Xmx2048m -XX:MaxPermSize=512m -DzkRun -Dbootstrap_conf=true" ./standalone.sh
109-	fi
110-}
111-
112-ecmruninstall() {
113-	echo "ok, lets install this crap :)"
114-	cd $VOLDEMORT/ecm/installer/izpack/target
115-	if [[ -f ECM-Linux64.zip ]]; then
116-		mkdir -p /tmp/ecmi
117-		rm -rf /tmp/ecmi/*