ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/dbs-server.spec
(Generate patch)

Comparing COMP/CMSDIST/dbs-server.spec (file contents):
Revision 1.52 by valya, Fri May 30 19:41:59 2008 UTC vs.
Revision 1.73 by valya, Sat Feb 21 01:58:07 2009 UTC

# Line 1 | Line 1
1 < ### RPM cms dbs-server DBS_1_1_6_pre2
1 > ### RPM cms dbs-server DBS_2_0_6_pre1
2  
3   %define cvstag %{realversion}
4   # define version of DBS to use, it's schema version
# Line 23 | Line 23 | cd Servers/JavaServer
23   #export DBS_SCHEMA_VERSION=`cat  $DBS_SCHEMA_ROOT/lib/Schema/NeXtGen/DBS-NeXtGen-MySQL_DEPLOYABLE.sql | grep "INSERT INTO SchemaVersion" | awk '{split($0,a,"\x27"); print a[2]}'`
24  
25   # fix context.xml file
26 < cat etc/context.xml.tobe  | sed "s/__insert_username__/dbs/g" | sed "s/__insert_password__/cmsdbs/g" | sed "s/3306/3316/g" > etc/context.xml
27 < #cat > etc/context.xml << EOF_CONTEXT
28 < #<Context path="/servlet/DBSServlet" docBase="DBSServlet" debug="5" reloadable="true" crossContext="true">
29 < #     <SchemaOwner schemaowner="${DBS_SCHEMA}" />
30 < #     <SupportedSchemaVersion schemaversion="${DBS_SCHEMA_VERSION}" />
31 < #     <SupportedClientVersions clientversions="DBS_1_0_1, DBS_1_0_5, DBS_1_0_7, DBS_1_0_8, DBS_1_0_9, DBS_1_1_2, DBS_1_1_3 "/>
32 < #     <DBSBlockConfig maxBlockSize="2000000000000" maxBlockFiles="100" />
33 < #     <Resource name="jdbc/dbs"
34 < #              auth="Container"
35 < #              type="javax.sql.DataSource"
36 < #              maxActive="30"
37 < #              maxIdle="10"
38 < #              maxWait="10000"
39 < #              username="dbs"
40 < #              password="cmsdbs"
41 < #              driverClassName="org.gjt.mm.mysql.Driver"
42 < #              url="jdbc:mysql://localhost:3316/${DBS_SCHEMA}?autoReconnect=true"/>
43 < #</Context>
44 < #EOF_CONTEXT
26 > cat etc/context.xml.tobe  | sed "s/__insert_username__/dbs/g" | sed "s/__insert_password__/cmsdbs/g" | sed "s/3306/3316/g" | sed "s/maxActive=\"0\"/maxActive=\"100\"/g" > etc/context.xml
27  
28 + # compile DBS server code
29   mkdir -p bin/WEB-INF/lib
30   echo "PWD=$PWD"
31   source $JAVA_JDK_ROOT/etc/profile.d/init.sh
# Line 53 | Line 36 | cd ../../
36   %install
37   mkdir -p %{i}/Servers/JavaServer/bin/WEB-INF/lib
38   cp -r Servers/JavaServer/* %{i}/Servers/JavaServer
39 + ln -s $DBS_LIBS_ROOT/lib %{i}/LibValut
40  
41   # copy war file
42   cp %{i}/Servers/JavaServer/DBS.war $APACHE_TOMCAT_ROOT/webapps
# Line 192 | Line 176 | $MYSQL_ROOT/bin/mysql --socket=$MYSQL_SO
176   cp $DBS_SERVER_ROOT/Servers/JavaServer/DBS.war $APACHE_TOMCAT_ROOT/webapps
177  
178   # Copy mysql jdbc driver to tomcat
195 #if [ ! -f $APACHE_TOMCAT_ROOT/common/lib/mysql-connector-java-5.0.5-bin.jar ]; then
196 #cp $DBS_SERVER_ROOT/Servers/JavaServer/lib/mysql-connector-java-5.0.5-bin.jar \
197 #   $APACHE_TOMCAT_ROOT/common/lib
198 #fi
199 # Copy all jar files from DBS area to tomcat area.
200 #cp -f $DBS_SERVER_ROOT/Servers/JavaServer/lib/*.jar $APACHE_TOMCAT_ROOT/common/lib
179   cp -f $DBS_LIBS_ROOT/lib/*.jar $APACHE_TOMCAT_ROOT/common/lib
180  
181   # Fix path in dbs_init.sh file since now we know install area
# Line 219 | Line 197 | echo "+++ Clean-up mysqld|tomcat process
197   $MYSQL_ROOT/bin/mysqladmin -uroot -pcms --socket=$MYSQL_SOCK --port=3316 shutdown
198   killall -q tomcat
199  
200 + # made correct link to LibValut
201 + rm -f $DBS_SERVER_ROOT/LibValut
202 + ln -s $DBS_LIBS_ROOT/lib $DBS_SERVER_ROOT/LibValut
203 +
204   echo
205   echo
206   echo "#####  IMPORTANT!!!  #####"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines