Page tree

Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

Intro goes here...

Mac OS X

From this you can also build a Windows version,

Code Block
languagebash
 #!/bin/sh
export PATH=$PATH:/Applications/Araxis\ Merge.app/Contents/Utilities

# Confirm that the path export worked.
which compare
# Result should be this,
# /Applications/Araxis Merge.app/Contents/Utilities/compare


# not working in .sh yet need to run at commend line


# Improvements to do...
# Change the path to environment variables.
# Make it run in a bash shell.
# core Confluence changes

# Loads Araxis with original on the left and new one on the right.
# base
compare /Volumes/svradm@bonsaiframework.com/opt/confluence/bin/setenv.sh /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/bin/setenv.sh
compare /Volumes/svradm@bonsaiframework.com/opt/confluence/conf/server.xml /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/conf/server.xml
compare /Volumes/svradm@bonsaiframework.com/opt/confluence/confluence/WEB-INF/classes/confluence-init.properties /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/confluence/WEB-INF/classes/confluence-init.properties
compare /Volumes/svradm@bonsaiframework.com/opt/confluence/bin/shutdown.sh /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/bin/shutdown.sh
compare /Volumes/svradm@bonsaiframework.com/opt/confluence/bin/startup.sh /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/bin/startup.sh
compare /Volumes/svradm@bonsaiframework.com/opt/confluence/bin/user.sh /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/bin/user.sh 


# extra security changes
compare /Volumes/svradm@bonsaiframework.com/opt/confluence/confluence/WEB-INF/classes/log4j.properties /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/confluence/WEB-INF/classes/log4j.properties

 
compare /Volumes/svradm@bonsaiframework.com/opt/confluence/confluence/WEB-INF/web.xml /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/confluence/WEB-INF/web.xml
compare /Volumes/svradm@bonsaiframework.com/opt/confluence/WEB-INF/classes/log4j.properties /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/WEB-INF/classes/log4j.properties