Permalink
Browse files

retrieve content installer fix

  • Loading branch information...
Josh Stafford
Josh Stafford committed Mar 29, 2012
1 parent b3332a8 commit 0530a5355ae6c79cbc9fac870e55a60e10eef98a
Showing with 24 additions and 5 deletions.
  1. +1 −1 build/src/izpack/download-prep.sh
  2. +5 −1 build/src/izpack/install.xml
  3. +16 −1 build/src/main/assembly/build.xml
  4. +1 −1 database
  5. +1 −1 documentation
@@ -2,7 +2,7 @@
echo "executing download-prep.sh"
-cp -v $INSTALL_PATH/conf/truststore.jks $INSTALL_PATH/client_downloads/
+cp -v $INSTALL_PATH/conf/keystore.jks $INSTALL_PATH/client_downloads/
echo "completing download-prep.sh"
@@ -60,20 +60,24 @@
<file src="${basedir}/src/izpack/edge-db-install.sh" targetdir="$INSTALL_PATH/scripts" />
<file src="${basedir}/src/izpack/keygen.sh" targetdir="$INSTALL_PATH/scripts" />
<file src="${basedir}/src/izpack/database.properties" targetdir="$INSTALL_PATH/conf" />
+ <file src="${basedir}/../receive-content-app/RSNA/config/retrieve-content.properties" targetdir="$INSTALL_PATH/conf" />
<file src="${basedir}/src/izpack/jvm-opts" targetdir="$INSTALL_PATH/conf" />
<file src="${basedir}/src/izpack/truststore.jks" targetdir="$INSTALL_PATH/conf" />
<file src="${basedir}/src/izpack/prep-log4j.properties" targetdir="$INSTALL_PATH/conf" />
<file src="${basedir}/src/izpack/transfer-log4j.properties" targetdir="$INSTALL_PATH/conf" />
+ <file src="${basedir}/src/izpack/retrieve-log4j.properties" targetdir="$INSTALL_PATH/conf" />
<file src="${basedir}/src/izpack/edge-server" targetdir="/etc/init.d" os="unix" />
- <file src="${basedir}/src/izpack/retrieve-content.zip" targetdir="$INSTALL_PATH/client_downloads" />
+ <file src="${basedir}/target/edgeserver-install/retrieve-content/target/retrieve-content.zip" targetdir="$INSTALL_PATH/client_downloads" />
<file src="${basedir}/src/izpack/download-prep.sh" targetdir="$INSTALL_PATH/scripts" />
<executable targetfile="$INSTALL_PATH/scripts/edge-db-install.sh" stage="never" />
<executable targetfile="$INSTALL_PATH/scripts/keygen.sh" stage="never" os="unix" />
<executable targetfile="/etc/init.d/edge-server" stage="never" os="unix" />
<executable targetfile="$INSTALL_PATH/scripts/download-prep.sh" stage="never" os="unix" />
<parsable targetfile="$INSTALL_PATH/conf/database.properties" type="javaprop" />
+ <parsable targetfile="$INSTALL_PATH/conf/retrieve-content.properties" type="javaprop" />
<parsable targetfile="$INSTALL_PATH/conf/prep-log4j.properties" type="javaprop" />
<parsable targetfile="$INSTALL_PATH/conf/transfer-log4j.properties" type="javaprop" />
+ <parsable targetfile="$INSTALL_PATH/conf/retrieve-log4j.properties" type="javaprop" />
<parsable targetfile="/etc/init.d/edge-server" os="unix" />
</pack>
<pack name="Glassfish" required="no">
@@ -10,7 +10,7 @@
<moduleSets>
<moduleSet>
<excludes>
- <exclude>org.rsna.isn:token-app</exclude>
+ <exclude>org.rsna.isn:token-app</exclude>
</excludes>
<binaries>
<unpack>false</unpack>
@@ -37,6 +37,21 @@
</fileSets>
</sources>
</moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.rsna.isn:retrieve-content</include>
+ </includes>
+ <sources>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>target/retrieve-content.zip</include>
+ <include>target/retrieve-content</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </sources>
+ </moduleSet>
</moduleSets>
<dependencySets>
<dependencySet>
Submodule documentation updated 1 files
+ EdgeServerManualV2.0.pdf

0 comments on commit 0530a53

Please sign in to comment.