Authored by wangshusheng

打包

@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <group> 4 <group>
5 <!--yohobuy.resources-autoconfig-env--> 5 <!--yohobuy.resources-autoconfig-env-->
6 <property name="yohobuy.rfid.env.webapphome" defaultValue="/home/master/yohobuy-rfid/deploy" description="应用根目录"/> 6 <property name="yohobuy.rfid.env.webapphome" defaultValue="/home/master/yohobuy-rfid/deploy" description="应用根目录"/>
7 - <property name="yohobuy.rfid.env.serverport" defaultValue="7" description="应用端口"/> 7 + <property name="yohobuy.rfid.env.serverport" defaultValue="8" description="应用端口"/>
8 </group> 8 </group>
9 <script> 9 <script>
10 <generate template="META-INF/autoconf/bin/env.sh" destfile="bin/env.sh"/> 10 <generate template="META-INF/autoconf/bin/env.sh" destfile="bin/env.sh"/>
@@ -8,25 +8,25 @@ BASE_BIN_DIR=`dirname $0` @@ -8,25 +8,25 @@ BASE_BIN_DIR=`dirname $0`
8 . $BASE_BIN_DIR/functions.sh 8 . $BASE_BIN_DIR/functions.sh
9 9
10 export JAVA_HOME=${yoho.env.javahome} 10 export JAVA_HOME=${yoho.env.javahome}
11 -export WEB_APP_HOME=${yohobuy.product.env.webapphome}  
12 -export SERVER_PORT=${yohobuy.product.env.serverport} 11 +export WEB_APP_HOME=${yohobuy.rfid.env.webapphome}
  12 +export SERVER_PORT=${yohobuy.rfid.env.serverport}
13 export PRODUCTION_MODE="${yoho.env.productmode}" 13 export PRODUCTION_MODE="${yoho.env.productmode}"
14 export SERVER_HOME=${yoho.env.serverhome} 14 export SERVER_HOME=${yoho.env.serverhome}
15 export SERVER_TYPE=${yoho.env.servertype} 15 export SERVER_TYPE=${yoho.env.servertype}
16 -export SERVER_NAMESPACE=${yohobuy.product.env.namespace} 16 +export SERVER_NAMESPACE=${yohobuy.rfid.env.namespace}
17 export GW_URL=$Gateway_URL 17 export GW_URL=$Gateway_URL
18 18
19 #if("${yoho.env.servertype}"=="jboss") 19 #if("${yoho.env.servertype}"=="jboss")
20 - export SERVER_BASE_DIR=" -Djboss.server.base.dir=${yohobuy.product.env.webapphome}/.jboss/default " 20 + export SERVER_BASE_DIR=" -Djboss.server.base.dir=${yohobuy.rfid.env.webapphome}/.jboss/default "
21 #end 21 #end
22 22
23 #if("${yoho.env.servertype}"=="tomcat") 23 #if("${yoho.env.servertype}"=="tomcat")
24 - export SERVER_BASE_DIR=" -Dcatalina.base=${yohobuy.product.env.webapphome}/.tomcat " 24 + export SERVER_BASE_DIR=" -Dcatalina.base=${yohobuy.rfid.env.webapphome}/.tomcat "
25 #end 25 #end
26 26
27 -export NAMING_PORT=`expr 9000 + $SERVER_PORT`  
28 -export HTTP_SERVER_PORT=`expr 8080 + $SERVER_PORT`  
29 -export DEBUG_PORT=`expr 8800 + $SERVER_PORT` 27 +export NAMING_PORT=`expr 9010 + $SERVER_PORT`
  28 +export HTTP_SERVER_PORT=`expr 8090 + $SERVER_PORT`
  29 +export DEBUG_PORT=`expr 8810 + $SERVER_PORT`
30 30
31 export CHECK_SERVER_STARTUP_URL="http://127.0.0.1:$HTTP_SERVER_PORT/$SERVER_NAMESPACE/common/ok.jsp" 31 export CHECK_SERVER_STARTUP_URL="http://127.0.0.1:$HTTP_SERVER_PORT/$SERVER_NAMESPACE/common/ok.jsp"
32 export STARTUP_SUCCESS_MSG="Server Online Resources ok" 32 export STARTUP_SUCCESS_MSG="Server Online Resources ok"
@@ -35,13 +35,13 @@ export JAVA_DEBUG_OPT=" -server -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp @@ -35,13 +35,13 @@ export JAVA_DEBUG_OPT=" -server -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp
35 export TIGER_JMX_OPT=" -Dcom.sun.management.config.file=$WEB_APP_HOME/conf/jmx/jmx_monitor_management.properties " 35 export TIGER_JMX_OPT=" -Dcom.sun.management.config.file=$WEB_APP_HOME/conf/jmx/jmx_monitor_management.properties "
36 36
37 #jmx 37 #jmx
38 -export JMX_PORT=`expr 9600 + $SERVER_PORT` 38 +export JMX_PORT=`expr 9610 + $SERVER_PORT`
39 export LOCAL_IP=`/sbin/ifconfig -a|grep inet|grep -v 127.0.0.1|grep -v inet6|awk '{print $2}'|tr -d "addr:"|awk 'NR==1 {print}'` 39 export LOCAL_IP=`/sbin/ifconfig -a|grep inet|grep -v 127.0.0.1|grep -v inet6|awk '{print $2}'|tr -d "addr:"|awk 'NR==1 {print}'`
40 export CATALINA_OPTS="$CATALINA_OPTS -Djava.rmi.server.hostname=$LOCAL_IP -Dcom.sun.management.jmxremote.port=$JMX_PORT -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" 40 export CATALINA_OPTS="$CATALINA_OPTS -Djava.rmi.server.hostname=$LOCAL_IP -Dcom.sun.management.jmxremote.port=$JMX_PORT -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
41 41
42 42
43 -GC_LOGS_DIR=/Data/logs/gc/product  
44 -HEAPDUMP_LOGS_DIR=/Data/logs/heapDump/product 43 +GC_LOGS_DIR=/Data/logs/gc/rfid
  44 +HEAPDUMP_LOGS_DIR=/Data/logs/heapDump/rfid
45 45
46 if [ ! -d $GC_LOGS_DIR ]; then 46 if [ ! -d $GC_LOGS_DIR ]; then
47 mkdir -p $GC_LOGS_DIR 47 mkdir -p $GC_LOGS_DIR
@@ -6,17 +6,17 @@ BASE_BIN_DIR=`dirname $0` @@ -6,17 +6,17 @@ BASE_BIN_DIR=`dirname $0`
6 . $BASE_BIN_DIR/functions.sh 6 . $BASE_BIN_DIR/functions.sh
7 7
8 export JAVA_HOME=$yoho.env.javahome 8 export JAVA_HOME=$yoho.env.javahome
9 -export WEB_APP_HOME=/home/test/yohobuy-product/deploy  
10 -export SERVER_PORT=3 9 +export WEB_APP_HOME=/home/test/yohobuy-rfid/deploy
  10 +export SERVER_PORT=8
11 export PRODUCTION_MODE="$yoho.env.productmode" 11 export PRODUCTION_MODE="$yoho.env.productmode"
12 export SERVER_HOME=$yoho.env.serverhome 12 export SERVER_HOME=$yoho.env.serverhome
13 export SERVER_TYPE=$yoho.env.servertype 13 export SERVER_TYPE=$yoho.env.servertype
14 -export SERVER_NAMESPACE=product 14 +export SERVER_NAMESPACE=rfid
15 15
16 16
17 17
18 -export NAMING_PORT=`expr 9000 + $SERVER_PORT`  
19 -export HTTP_SERVER_PORT=`expr 8080 + $SERVER_PORT` 18 +export NAMING_PORT=`expr 9010 + $SERVER_PORT`
  19 +export HTTP_SERVER_PORT=`expr 8090 + $SERVER_PORT`
20 20
21 export CHECK_SERVER_STARTUP_URL="http://127.0.0.1:$HTTP_SERVER_PORT/$SERVER_NAMESPACE/common/ok.jsp" 21 export CHECK_SERVER_STARTUP_URL="http://127.0.0.1:$HTTP_SERVER_PORT/$SERVER_NAMESPACE/common/ok.jsp"
22 export STARTUP_SUCCESS_MSG="Server Online Resources ok" 22 export STARTUP_SUCCESS_MSG="Server Online Resources ok"
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 define subcomponents such as "Valves" at this level. 19 define subcomponents such as "Valves" at this level.
20 Documentation at /docs/config/server.html 20 Documentation at /docs/config/server.html
21 --> 21 -->
22 -<Server port="8117" shutdown="SHUTDOWN"> 22 +<Server port="8118" shutdown="SHUTDOWN">
23 <Listener className="org.apache.catalina.startup.VersionLoggerListener" /> 23 <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
24 <!-- Security listener. Documentation at /docs/config/listeners.html 24 <!-- Security listener. Documentation at /docs/config/listeners.html
25 <Listener className="org.apache.catalina.security.SecurityListener" /> 25 <Listener className="org.apache.catalina.security.SecurityListener" />
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 APR (HTTP/AJP) Connector: /docs/apr.html 66 APR (HTTP/AJP) Connector: /docs/apr.html
67 Define a non-SSL/TLS HTTP/1.1 Connector on port 8080 67 Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
68 --> 68 -->
69 - <Connector port="8097" protocol="HTTP/1.1" 69 + <Connector port="8098" protocol="HTTP/1.1"
70 connectionTimeout="20000" 70 connectionTimeout="20000"
71 redirectPort="8443" compressionMinSize="2048" 71 redirectPort="8443" compressionMinSize="2048"
72 noCompressionUserAgents="gozilla,traviata" 72 noCompressionUserAgents="gozilla,traviata"
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 --> 90 -->
91 91
92 <!-- Define an AJP 1.3 Connector on port 8009 --> 92 <!-- Define an AJP 1.3 Connector on port 8009 -->
93 - <Connector port="8003" protocol="AJP/1.3" redirectPort="8443" /> 93 + <Connector port="8018" protocol="AJP/1.3" redirectPort="8443" />
94 94
95 95
96 <!-- An Engine represents the entry point (within Catalina) that processes 96 <!-- An Engine represents the entry point (within Catalina) that processes
@@ -112,28 +112,10 @@ @@ -112,28 +112,10 @@
112 --> 112 -->
113 </dependencies> 113 </dependencies>
114 114
115 - <build>  
116 - <plugins>  
117 - <plugin>  
118 - <artifactId>maven-compiler-plugin</artifactId>  
119 - <version>2.3.2</version>  
120 - <configuration>  
121 - <source>1.7</source>  
122 - <target>1.7</target>  
123 - <encoding>UTF-8</encoding>  
124 - <compilerArguments>  
125 - <extdirs>${basedir}/web/src/main/webapp/WEB-INF/lib/JW.UHF.jar</extdirs>  
126 - </compilerArguments>  
127 - </configuration>  
128 - </plugin>  
129 - </plugins>  
130 - </build>  
131 <modules> 115 <modules>
132 <module>service</module> 116 <module>service</module>
133 <module>web</module> 117 <module>web</module>
134 <module>deploy</module> 118 <module>deploy</module>
135 </modules> 119 </modules>
136 120
137 -  
138 -  
139 </project> 121 </project>
@@ -17,10 +17,6 @@ @@ -17,10 +17,6 @@
17 17
18 <dependency> 18 <dependency>
19 <groupId>com.yoho.rfid</groupId> 19 <groupId>com.yoho.rfid</groupId>
20 - <artifactId>yoho-rfid-common</artifactId>  
21 - </dependency>  
22 - <dependency>  
23 - <groupId>com.yoho.rfid</groupId>  
24 <artifactId>yoho-rfid-service</artifactId> 20 <artifactId>yoho-rfid-service</artifactId>
25 </dependency> 21 </dependency>
26 <dependency> 22 <dependency>