Repository: juddi Updated Branches: refs/heads/master f0a1ae7f6 -> 17df28197
JUDDI-936 fixing default startup parameters to make replication config easier Project: http://git-wip-us.apache.org/repos/asf/juddi/repo Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/17df2819 Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/17df2819 Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/17df2819 Branch: refs/heads/master Commit: 17df28197a45f67dfca231acb04df3c1456c3ea7 Parents: f0a1ae7 Author: Alex <[email protected]> Authored: Wed Oct 28 19:23:35 2015 -0400 Committer: Alex <[email protected]> Committed: Wed Oct 28 19:23:35 2015 -0400 ---------------------------------------------------------------------- juddi-tomcat/build.xml | 14 +++++++------- juddi-tomcat/catalina.bat | 2 ++ juddi-tomcat/catalina.sh | 3 ++- juddi-tomcat/twonodes.bat | 12 ------------ 4 files changed, 11 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/juddi/blob/17df2819/juddi-tomcat/build.xml ---------------------------------------------------------------------- diff --git a/juddi-tomcat/build.xml b/juddi-tomcat/build.xml index 6d0cc7b..f28ab13 100644 --- a/juddi-tomcat/build.xml +++ b/juddi-tomcat/build.xml @@ -35,9 +35,9 @@ <!-- JUDDI-894 --> <move file="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index.jsp" tofile="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index-tomcat.html" overwrite="true"/> <copy file="${basedir}/index.html" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps/ROOT" overwrite="true"/> -<!-- + <copy file="${basedir}/catalina.sh" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> - <copy file="${basedir}/catalina.bat" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>--> + <copy file="${basedir}/catalina.bat" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> <copy file="${basedir}/truststore.jks" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> <copy file="${basedir}/truststore.jks" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/" overwrite="true"/> @@ -49,7 +49,7 @@ <copy file="${basedir}/tomcat-users.xml" todir="${conf.dir}" overwrite="true"/> <copy file="${basedir}/context.xml" todir="${webapps.dir}/juddiv3/META-INF" overwrite="true"/> <copy file="${basedir}/context.xml" todir="${webapps.dir}/juddiv3replication/META-INF" overwrite="true"/> - <!--<copy file="${basedir}/server.xml" todir="${conf.dir}" overwrite="true"/>--> + <copy file="${basedir}/server.xml" todir="${conf.dir}" overwrite="true"/> <copy file="${basedir}/keystore.jks" todir="${conf.dir}" overwrite="true"/> <copy file="${dependency.mysql.jar}" todir="${lib.dir}"/> @@ -87,10 +87,10 @@ <!-- JUDDI-894 --> <move file="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index.jsp" tofile="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index-tomcat.html" overwrite="true"/> <copy file="${basedir}/index.html" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/webapps/ROOT" overwrite="true"/> -<!-- + <copy file="${basedir}/catalina.sh" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> <copy file="${basedir}/catalina.bat" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> - --> + <copy file="${basedir}/truststore.jks" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> <copy file="${basedir}/truststore.jks" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/" overwrite="true"/> @@ -156,10 +156,10 @@ <!-- JUDDI-894 --> <move file="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index.jsp" tofile="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index-tomcat.html" overwrite="true"/> <copy file="${basedir}/index.html" todir="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/webapps/ROOT" overwrite="true"/> -<!-- + <copy file="${basedir}/catalina.sh" todir="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> <copy file="${basedir}/catalina.bat" todir="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> - --> + <copy file="${basedir}/truststore.jks" todir="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> <copy file="${basedir}/truststore.jks" todir="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/" overwrite="true"/> http://git-wip-us.apache.org/repos/asf/juddi/blob/17df2819/juddi-tomcat/catalina.bat ---------------------------------------------------------------------- diff --git a/juddi-tomcat/catalina.bat b/juddi-tomcat/catalina.bat index 2e0a3d0..278c3d1 100644 --- a/juddi-tomcat/catalina.bat +++ b/juddi-tomcat/catalina.bat @@ -93,9 +93,11 @@ rem --------------------------------------------------------------------------- setlocal + rem these are jUDDI specific settings set JAVA_OPTS=%JAVA_OPTS% -Xms1024m -Xmx1024m -XX:MaxPermSize=512m -XX:PermSize=256M set JAVA_OPTS=%JAVA_OPTS% -Djavax.net.ssl.trustStore=truststore.jks -Djavax.net.ssl.trustStorePassword=password +set JAVA_OPTS=%JAVA_OPTS% -Djavax.net.ssl.trustStore=truststore.jks -Djavax.net.ssl.trustStorePassword=password -Djavax.net.ssl.keyStore=../conf/keystore.jks -Djavax.net.ssl.keyStorePassword=password rem end custom settings http://git-wip-us.apache.org/repos/asf/juddi/blob/17df2819/juddi-tomcat/catalina.sh ---------------------------------------------------------------------- diff --git a/juddi-tomcat/catalina.sh b/juddi-tomcat/catalina.sh index 4f16206..550fe13 100755 --- a/juddi-tomcat/catalina.sh +++ b/juddi-tomcat/catalina.sh @@ -107,9 +107,10 @@ esac + # begin custom juddi settings JAVA_OPTS="$JAVA_OPTS -Xms1024m -Xmx1024m -XX:MaxPermSize=512m -XX:PermSize=256M" -JAVA_OPTS="$JAVA_OPTS -Djavax.net.ssl.trustStore=truststore.jks -Djavax.net.ssl.trustStorePassword=password" +JAVA_OPTS="$JAVA_OPTS -Djavax.net.ssl.trustStore=truststore.jks -Djavax.net.ssl.trustStorePassword=password -Djavax.net.ssl.keyStore=../conf/keystore.jks -Djavax.net.ssl.keyStorePassword=password" # end custom juddi settings http://git-wip-us.apache.org/repos/asf/juddi/blob/17df2819/juddi-tomcat/twonodes.bat ---------------------------------------------------------------------- diff --git a/juddi-tomcat/twonodes.bat b/juddi-tomcat/twonodes.bat deleted file mode 100644 index 092cf40..0000000 --- a/juddi-tomcat/twonodes.bat +++ /dev/null @@ -1,12 +0,0 @@ -rem This script will setup a two node example using two tomcat instances with independent databases and containers -rem windows only -rd /q /s .\target\tomcat\apache-tomcat-6.0.26Node2\ -rd /q /s .\target\tomcat\apache-tomcat-6.0.26\bin\target -xcopy /E /Y .\target\tomcat\apache-tomcat-6.0.26 .\target\tomcat\apache-tomcat-6.0.26Node2\ -copy /Y juddiv3Node2.xml target\tomcat\apache-tomcat-6.0.26Node2\webapps\juddiv3\WEB-INF\classes\juddiv3.xml -copy /Y serverNode2.xml target\tomcat\apache-tomcat-6.0.26Node2\conf\server.xml -copy /Y uddiNode2.xml target\tomcat\apache-tomcat-6.0.26Node2\webapps\juddi-gui\WEB-INF\classes\META-INF\uddi.xml -cd target\tomcat\apache-tomcat-6.0.26\bin -call startup.bat -cd ..\..\apache-tomcat-6.0.26Node2\bin -call startup.bat --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
