From 648fbf866d98a3bdb94b466e03e97715e8d88881 Mon Sep 17 00:00:00 2001
From: "f.revilla" <f.revilla@localhost>
Date: Wed, 6 Oct 2010 11:00:40 +0000
Subject: [PATCH] installation windows files update

---
 .gitattributes                                         |  2 +-
 .../installer/templates/.cdmLibrary/datasources.xml    | 10 +++++++++-
 .../installer/templates/{copyright => copyright.txt}   |  0
 .../src/main/installer/win32/Launch4JavaCDMSERVER.xml  |  4 ++--
 cdm-server/src/main/installer/win32/cdmserver.nsi      | 10 ++++++----
 .../main/installer/win32/cdmserver/bin/cdmserver.bat   |  2 +-
 6 files changed, 19 insertions(+), 9 deletions(-)
 rename cdm-server/src/main/installer/templates/{copyright => copyright.txt} (100%)

diff --git a/.gitattributes b/.gitattributes
index d4b767a12c..b565ba870e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1208,7 +1208,7 @@ cdm-server/src/main/installer/linux/copyright -text
 cdm-server/src/main/installer/linux/postinst -text
 cdm-server/src/main/installer/linux/postrm -text
 cdm-server/src/main/installer/templates/.cdmLibrary/datasources.xml -text
-cdm-server/src/main/installer/templates/copyright -text
+cdm-server/src/main/installer/templates/copyright.txt -text
 cdm-server/src/main/installer/win32/Launch4JavaCDMSERVER.xml -text
 cdm-server/src/main/installer/win32/cdmserver.nsi -text
 cdm-server/src/main/installer/win32/cdmserver/bin/cdmserver.bat -text
diff --git a/cdm-server/src/main/installer/templates/.cdmLibrary/datasources.xml b/cdm-server/src/main/installer/templates/.cdmLibrary/datasources.xml
index 38f637ad74..aece5b7605 100644
--- a/cdm-server/src/main/installer/templates/.cdmLibrary/datasources.xml
+++ b/cdm-server/src/main/installer/templates/.cdmLibrary/datasources.xml
@@ -27,7 +27,7 @@
        ======================================================-->
  
     <!-- the default data sources can be mapped to a specific URL root folder   -->
-    <bean id="myCDMServerInstance1"  lazy-init="true" class="com.mchange.v2.c3p0.ComboPooledDataSource">
+    <bean id="myCDMServerInstance1"  lazy-init="true" class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
         <property name="driverClass" value="com.mysql.jdbc.Driver"/>
         <property name="user" value="edit"/>
         <property name="password" value="wp5"/>
@@ -47,5 +47,13 @@
         <property name="password" value="123"/>
         <property name="url" value="jdbc:mysql://192.168.1.100/myCDMdatabase_3"/>
     </bean>
+    
+    <bean id="palmae"  lazy-init="true" class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
+        <property name="driverClass" value="com.mysql.jdbc.Driver"/>
+        <property name="username" value="edit"/>
+        <property name="password" value="wp5"/>
+        <property name="url" value="jdbc:mysql://160.45.63.201/cdm_edit_palmae_b"/>
+    </bean>
+    
     -->
 </beans>
diff --git a/cdm-server/src/main/installer/templates/copyright b/cdm-server/src/main/installer/templates/copyright.txt
similarity index 100%
rename from cdm-server/src/main/installer/templates/copyright
rename to cdm-server/src/main/installer/templates/copyright.txt
diff --git a/cdm-server/src/main/installer/win32/Launch4JavaCDMSERVER.xml b/cdm-server/src/main/installer/win32/Launch4JavaCDMSERVER.xml
index 83c9e164fb..a8e35eb6bd 100644
--- a/cdm-server/src/main/installer/win32/Launch4JavaCDMSERVER.xml
+++ b/cdm-server/src/main/installer/win32/Launch4JavaCDMSERVER.xml
@@ -1,7 +1,7 @@
 <launch4jConfig>
   <dontWrapJar>false</dontWrapJar>
   <headerType>console</headerType>
-  <jar>C:\Dokumente und Einstellungen\f.revilla\Desktop\cdmlib-remote\target\cdmserver-standalone.jar</jar>
+  <jar>C:\Dokumente und Einstellungen\f.revilla\Eigene Dateien\dev\cdm-server\target\cdm-server-2.5.jar</jar>
   <outfile>cdmserver\bin\cdmserver.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
@@ -18,6 +18,6 @@
     <minVersion>1.5.0</minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>preferJre</jdkPreference>
-    <opt>-Xmx1024M -jar &quot;%CD%..\\libs\\cdmserver-standalone.jar&quot; --httpPort=8080 --ajp13Port=-1 --logfile=%CD%..\\logs\\cdmserverLog.txt</opt>
+    <opt>-Xmx1024M -jar &quot;%CD%..\\libs\\cdm-server-2.5.jar&quot; --httpPort=8080 --ajp13Port=-1 --logfile=%CD%..\\logs\\cdmserverLog.txt</opt>
   </jre>
 </launch4jConfig>
\ No newline at end of file
diff --git a/cdm-server/src/main/installer/win32/cdmserver.nsi b/cdm-server/src/main/installer/win32/cdmserver.nsi
index 2028c2978b..5228151605 100644
--- a/cdm-server/src/main/installer/win32/cdmserver.nsi
+++ b/cdm-server/src/main/installer/win32/cdmserver.nsi
@@ -15,10 +15,12 @@
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 
-!define COPYRIGHT_FILE "..\templates\copyright"
+!define COPYRIGHT_FILE "..\templates\copyright.txt"
 !define DATASOURCES_FILE "..\templates\.cdmLibrary\datasources.xml"
-!define JAR_FILE "..\..\..\..\target\cdmserver-standalone.jar"
+!define JAR_FILE "..\..\..\..\target\cdm-server-2.5.jar"
 
+!define JAR_FILE_NAME "cdm-server-2.5.jar"
+!define COPYRIGHT_FILE_NAME "copyright.txt"
 
 ; MUI 1.67 compatible ------
 !include "MUI.nsh"
@@ -118,8 +120,8 @@ Section Uninstall
   Delete "$INSTDIR\${PRODUCT_NAME}.url"
   Delete "$INSTDIR\uninst.exe"
   ;Delete "$INSTDIR\logs\cdmserverLog.txt"
-  Delete "$INSTDIR\license\license.txt"
-  Delete "$INSTDIR\libs\cdmserver-standalone.jar"
+  Delete "$INSTDIR\license\${COPYRIGHT_FILE_NAME}"
+  Delete "$INSTDIR\libs\${JAR_FILE_NAME}"
   Delete "$INSTDIR\libs\.cdmLibrary\datasources.xml"
   Delete "$INSTDIR\bin\cdmserver.bat"
   Delete "$INSTDIR\bin\cdmserver.exe"
diff --git a/cdm-server/src/main/installer/win32/cdmserver/bin/cdmserver.bat b/cdm-server/src/main/installer/win32/cdmserver/bin/cdmserver.bat
index 3725fd2e12..9cd80dde05 100644
--- a/cdm-server/src/main/installer/win32/cdmserver/bin/cdmserver.bat
+++ b/cdm-server/src/main/installer/win32/cdmserver/bin/cdmserver.bat
@@ -1,3 +1,3 @@
 cd ..
 set HOME=%cd%
-java -Xmx1024M -jar "%HOME%\libs\cdmserver-standalone.jar" --httpPort=8080 --ajp13Port=-1 --logfile="%HOME%\logs\cdmserverLog.txt"
\ No newline at end of file
+java -Xmx1024M -jar "%HOME%\libs\cdm-server-2.5.jar"
\ No newline at end of file
-- 
2.34.1