installation windows files update

diff --git a/.gitattributes b/.gitattributes
index d4b767a12c16666c134e939644e7ec31ad3f0385..b565ba870e3ab8c3983f47116d112ebc1da52213 100644 (file)
--- 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 38f637ad743f67109eafdf9c472c8aabd1a0553a..aece5b7605a2b351845c4e125a142ec087cfd43e 100644 (file)
--- a/cdm-server/src/main/installer/templates/.cdmLibrary/datasources.xml
+++ b/cdm-server/src/main/installer/templates/.cdmLibrary/datasources.xml
@@ -27,7 +27,7 @@
        ======================================================-->\r
  \r
     <!-- the default data sources can be mapped to a specific URL root folder   -->\r
-    <bean id="myCDMServerInstance1"  lazy-init="true" class="com.mchange.v2.c3p0.ComboPooledDataSource">\r
+    <bean id="myCDMServerInstance1"  lazy-init="true" class="org.springframework.jdbc.datasource.SimpleDriverDataSource">\r
         <property name="driverClass" value="com.mysql.jdbc.Driver"/>\r
         <property name="user" value="edit"/>\r
         <property name="password" value="wp5"/>\r
@@ -47,5 +47,13 @@
         <property name="password" value="123"/>\r
         <property name="url" value="jdbc:mysql://192.168.1.100/myCDMdatabase_3"/>\r
     </bean>\r
+    \r
+    <bean id="palmae"  lazy-init="true" class="org.springframework.jdbc.datasource.SimpleDriverDataSource">\r
+        <property name="driverClass" value="com.mysql.jdbc.Driver"/>\r
+        <property name="username" value="edit"/>\r
+        <property name="password" value="wp5"/>\r
+        <property name="url" value="jdbc:mysql://160.45.63.201/cdm_edit_palmae_b"/>\r
+    </bean>\r
+    \r
     -->\r
 </beans>\r

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 83c9e164fb288626e638d98bb9ee8262d22c580b..a8e35eb6bd470e0a3fb0863d33a24546fd7a8164 100644 (file)
--- 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 2028c2978bdcd8827a09e4878b2bfdb4754b4b48..522815160597d8bac94696c6cb40f821f62a42c6 100644 (file)
--- 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}"\r
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
 \r
-!define COPYRIGHT_FILE "..\templates\copyright"\r
+!define COPYRIGHT_FILE "..\templates\copyright.txt"\r
 !define DATASOURCES_FILE "..\templates\.cdmLibrary\datasources.xml"\r
-!define JAR_FILE "..\..\..\..\target\cdmserver-standalone.jar"\r
+!define JAR_FILE "..\..\..\..\target\cdm-server-2.5.jar"\r
 \r
+!define JAR_FILE_NAME "cdm-server-2.5.jar"\r
+!define COPYRIGHT_FILE_NAME "copyright.txt"\r
 \r
 ; MUI 1.67 compatible ------\r
 !include "MUI.nsh"\r
@@ -118,8 +120,8 @@ Section Uninstall
   Delete "$INSTDIR\${PRODUCT_NAME}.url"\r
   Delete "$INSTDIR\uninst.exe"\r
   ;Delete "$INSTDIR\logs\cdmserverLog.txt"\r
-  Delete "$INSTDIR\license\license.txt"\r
-  Delete "$INSTDIR\libs\cdmserver-standalone.jar"\r
+  Delete "$INSTDIR\license\${COPYRIGHT_FILE_NAME}"\r
+  Delete "$INSTDIR\libs\${JAR_FILE_NAME}"\r
   Delete "$INSTDIR\libs\.cdmLibrary\datasources.xml"\r
   Delete "$INSTDIR\bin\cdmserver.bat"\r
   Delete "$INSTDIR\bin\cdmserver.exe"\r

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 3725fd2e124eba5b093074c93aef500544f043b3..9cd80dde05f30c25c85515f01c6e652540145a84 100644 (file)
--- 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 ..\r
 set HOME=%cd%\r
-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