Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions modules/distribution/src/main/bin/ciphertool.bat
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,7 @@ echo Using SYNAPSE_HOME: %SYNAPSE_HOME%
echo Using JAVA_HOME: %JAVA_HOME%
set _RUNJAVA="%JAVA_HOME%\bin\java"

set JAVA_ENDORSED=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"

%_RUNJAVA% %JAVA_OPTS% -cp "%SYNAPSE_CLASSPATH%" %_XDEBUG% -Djava.endorsed.dirs=%JAVA_ENDORSED% org.apache.synapse.securevault.tool.CipherTool %*
%_RUNJAVA% %JAVA_OPTS% -cp "%SYNAPSE_CLASSPATH%" %_XDEBUG% org.apache.synapse.securevault.tool.CipherTool %*
endlocal
:end

1 change: 0 additions & 1 deletion modules/distribution/src/main/bin/ciphertool.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,5 +101,4 @@ fi

$JAVA_HOME/bin/java \
-classpath "$SYNAPSE_CLASSPATH" \
-Djava.endorsed.dirs="$SYNAPSE_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
org.apache.synapse.securevault.tool.CipherTool $*
3 changes: 0 additions & 3 deletions modules/distribution/src/main/bin/synapse-config-migrator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ if $cygwin; then
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
fi
# endorsed dir
SYNAPSE_ENDORSED=$SYNAPSE_HOME/lib/endorsed

MIGRATING_CONFIG=$SYNAPSE_HOME/repository/conf/synapse.xml
if $1; then
Expand All @@ -126,7 +124,6 @@ mv $MIGRATING_CONFIG $MIGRATING_CONFIG.back
$JAVA_HOME/bin/java -server -Xms128M -Xmx128M \
$TEMP_PROPS \
-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XMLGrammarCachingConfiguration \
-Djava.endorsed.dirs=$SYNAPSE_ENDORSED \
-Djava.io.tmpdir=$SYNAPSE_HOME/work/temp/synapse \
-classpath $SYNAPSE_CLASSPATH \
org.apache.synapse.migrator.ConfigurationMigrator \
Expand Down
15 changes: 7 additions & 8 deletions repository/conf/sample-server-wrapper.conf
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,9 @@ wrapper.java.library.path.1=../../lib
wrapper.java.additional.1=-Dhttp_port
wrapper.java.additional.2=-Dhttps_port
wrapper.java.additional.3=-Dserver_name
wrapper.java.additional.4=-Djava.endorsed.dirs=../../lib/endorsed
wrapper.java.additional.5=-Dlog4j.configuration=file:../../lib/log4j.properties
wrapper.java.additional.6=-Djava.io.tmpdir=../../work/temp/sampleServer
wrapper.java.additional.7=
wrapper.java.additional.4=-Dlog4j.configuration=file:../../lib/log4j.properties
wrapper.java.additional.5=-Djava.io.tmpdir=../../work/temp/sampleServer
wrapper.java.additional.6=

# Initial Java Heap Size (in MB) - compute according to system
wrapper.java.initmemory=128
Expand All @@ -46,11 +45,11 @@ wrapper.app.parameter.1=samples.util.SampleAxis2Server
wrapper.app.parameter.2=-repo %AXIS2_HOME%repository
wrapper.app.parameter.3=-conf %AXIS2_HOME%repository\conf\axis2.xml

#wrapper will be initiated from this class(8 and 9 are required parameters)
#wrapper will be initiated from this class(7 and 8 are required parameters)
#wrapper.app.parameter.1=samples.util.Bootstrap
#wrapper additional parameters(8 and 9 required) to overcome windows long classpath issue using Bootstrap
#wrapper.java.additional.8=-Djar.class.paths=../../lib,../../repository/components/plugins
#wrapper.java.additional.9=-Dsystem.home=.
#wrapper additional parameters(7 and 8 required) to overcome windows long classpath issue using Bootstrap
#wrapper.java.additional.7=-Djar.class.paths=../../lib,../../repository/components/plugins
#wrapper.java.additional.8=-Dsystem.home=.

#********************************************************************
# Wrapper Logging Properties
Expand Down
7 changes: 3 additions & 4 deletions repository/conf/wrapper.conf
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@ wrapper.java.library.path.1=lib

# Java Additional Parameters
wrapper.java.additional.1=-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XMLGrammarCachingConfiguration
wrapper.java.additional.2=-Djava.endorsed.dirs=lib/endorsed
wrapper.java.additional.3=-Djava.io.tmpdir=work/temp/synapse
wrapper.java.additional.4=
wrapper.java.additional.2=-Djava.io.tmpdir=work/temp/synapse
wrapper.java.additional.3=
# ----- Uncoment this to enable SSL debug options -----------
#wrapper.java,additional.5=-Djavax.net.debug=all
#wrapper.java,additional.4=-Djavax.net.debug=all

# Initial Java Heap Size (in MB)
wrapper.java.initmemory=128
Expand Down
Loading