439964 - Renames java7-server.profile to java-server.profile
diff --git a/jetty-server/build.gradle b/jetty-server/build.gradle index ea15ab8..43544ae 100644 --- a/jetty-server/build.gradle +++ b/jetty-server/build.gradle
@@ -56,7 +56,7 @@ def product = 'jetty-server' def productFileLocation = file("${projectDir}/publish_resources/products/${product}/${product}.product") - def javaProfileLocation = file("${projectDir}/src/main/dist/configuration/java7-server.profile") + def javaProfileLocation = file("${projectDir}/src/main/dist/configuration/java-server.profile") doLast() { publishProduct(project, productFileLocation, javaProfileLocation) } }
diff --git a/jetty-server/src/main/dist/bin/dmk.bat b/jetty-server/src/main/dist/bin/dmk.bat index 2f6231b..22dc9a7 100644 --- a/jetty-server/src/main/dist/bin/dmk.bat +++ b/jetty-server/src/main/dist/bin/dmk.bat
@@ -181,7 +181,7 @@ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djetty.home="%KERNEL_HOME%\jetty" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.io.tmpdir="%TMP_DIR%" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.home="%KERNEL_HOME%" - set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.java.profile="file:%CONFIG_DIR%\java7-server.profile" + set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.java.profile="file:%CONFIG_DIR%\java-server.profile" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dssh.server.keystore="%CONFIG_DIR%/hostkey.ser" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.config="%CONFIG_DIR%" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.sharedConfiguration.area="%CONFIG_DIR%"
diff --git a/jetty-server/src/main/dist/configuration/java7-server.profile b/jetty-server/src/main/dist/configuration/java-server.profile similarity index 100% rename from jetty-server/src/main/dist/configuration/java7-server.profile rename to jetty-server/src/main/dist/configuration/java-server.profile
diff --git a/jetty-server/src/main/filtered/bin/dmk.sh b/jetty-server/src/main/filtered/bin/dmk.sh index c26c4d4..1f4f3a0 100644 --- a/jetty-server/src/main/filtered/bin/dmk.sh +++ b/jetty-server/src/main/filtered/bin/dmk.sh
@@ -148,7 +148,7 @@ AUTH_LOGIN=$CONFIG_DIR/org.eclipse.virgo.kernel.authentication.config AUTH_FILE=$CONFIG_DIR/org.eclipse.virgo.kernel.users.properties CONFIG_AREA=$KERNEL_HOME/work - JAVA_PROFILE=$KERNEL_HOME/configuration/java7-server.profile + JAVA_PROFILE=$KERNEL_HOME/configuration/java-server.profile if $cygwin; then ACCESS_PROPERTIES=$(cygpath -wp $ACCESS_PROPERTIES)
diff --git a/kernel/build.gradle b/kernel/build.gradle index 9b17805..93e076b 100644 --- a/kernel/build.gradle +++ b/kernel/build.gradle
@@ -60,7 +60,7 @@ def product = 'kernel' def productFileLocation = file("${projectDir}/publish_resources/products/${product}/${product}.product") - def javaProfileLocation = file("${projectDir}/src/main/dist/configuration/java7-server.profile") + def javaProfileLocation = file("${projectDir}/src/main/dist/configuration/java-server.profile") doLast() { publishProduct(project, productFileLocation, javaProfileLocation) } }
diff --git a/kernel/src/main/dist/bin/dmk.bat b/kernel/src/main/dist/bin/dmk.bat index caff311..25870c4 100644 --- a/kernel/src/main/dist/bin/dmk.bat +++ b/kernel/src/main/dist/bin/dmk.bat
@@ -180,7 +180,7 @@ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.authentication.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.users.properties" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.io.tmpdir="%TMP_DIR%" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.home="%KERNEL_HOME%" - set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.java.profile="file:%CONFIG_DIR%\java7-server.profile" + set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.java.profile="file:%CONFIG_DIR%\java-server.profile" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dssh.server.keystore="%CONFIG_DIR%/hostkey.ser" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.config="%CONFIG_DIR%" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.sharedConfiguration.area="%CONFIG_DIR%"
diff --git a/kernel/src/main/dist/configuration/java7-server.profile b/kernel/src/main/dist/configuration/java-server.profile similarity index 100% rename from kernel/src/main/dist/configuration/java7-server.profile rename to kernel/src/main/dist/configuration/java-server.profile
diff --git a/kernel/src/main/filtered/bin/dmk.sh b/kernel/src/main/filtered/bin/dmk.sh index 7816e90..2bab7e2 100755 --- a/kernel/src/main/filtered/bin/dmk.sh +++ b/kernel/src/main/filtered/bin/dmk.sh
@@ -147,7 +147,7 @@ AUTH_LOGIN=$CONFIG_DIR/org.eclipse.virgo.kernel.authentication.config AUTH_FILE=$CONFIG_DIR/org.eclipse.virgo.kernel.users.properties CONFIG_AREA=$KERNEL_HOME/work - JAVA_PROFILE=$KERNEL_HOME/configuration/java7-server.profile + JAVA_PROFILE=$KERNEL_HOME/configuration/java-server.profile if $cygwin; then ACCESS_PROPERTIES=$(cygpath -wp $ACCESS_PROPERTIES)
diff --git a/nano/build.gradle b/nano/build.gradle index 1e1fee7..2308d74 100644 --- a/nano/build.gradle +++ b/nano/build.gradle
@@ -122,7 +122,7 @@ File repositoryDir = project.file("${project.rootProject.projectDir}/org.eclipse.virgo.site/build/repository/") def productFileLocation = file("${projectDir}/publish_resources/products/${product}/${product}.product") - def javaProfileLocation = file("${projectDir}/src/main/dist/configuration/java7-server.profile") + def javaProfileLocation = file("${projectDir}/src/main/dist/configuration/java-server.profile") doLast() { publishProduct(project, repositoryDir, productFileLocation, javaProfileLocation) } }
diff --git a/nano/src/main/dist/bin/dmk.bat b/nano/src/main/dist/bin/dmk.bat index caff311..25870c4 100644 --- a/nano/src/main/dist/bin/dmk.bat +++ b/nano/src/main/dist/bin/dmk.bat
@@ -180,7 +180,7 @@ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.authentication.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.users.properties" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.io.tmpdir="%TMP_DIR%" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.home="%KERNEL_HOME%" - set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.java.profile="file:%CONFIG_DIR%\java7-server.profile" + set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.java.profile="file:%CONFIG_DIR%\java-server.profile" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dssh.server.keystore="%CONFIG_DIR%/hostkey.ser" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.config="%CONFIG_DIR%" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.sharedConfiguration.area="%CONFIG_DIR%"
diff --git a/nano/src/main/dist/configuration/java7-server.profile b/nano/src/main/dist/configuration/java-server.profile similarity index 100% rename from nano/src/main/dist/configuration/java7-server.profile rename to nano/src/main/dist/configuration/java-server.profile
diff --git a/nano/src/main/filtered/bin/dmk.sh b/nano/src/main/filtered/bin/dmk.sh index 7816e90..2bab7e2 100755 --- a/nano/src/main/filtered/bin/dmk.sh +++ b/nano/src/main/filtered/bin/dmk.sh
@@ -147,7 +147,7 @@ AUTH_LOGIN=$CONFIG_DIR/org.eclipse.virgo.kernel.authentication.config AUTH_FILE=$CONFIG_DIR/org.eclipse.virgo.kernel.users.properties CONFIG_AREA=$KERNEL_HOME/work - JAVA_PROFILE=$KERNEL_HOME/configuration/java7-server.profile + JAVA_PROFILE=$KERNEL_HOME/configuration/java-server.profile if $cygwin; then ACCESS_PROPERTIES=$(cygpath -wp $ACCESS_PROPERTIES)
diff --git a/tomcat-server/build.gradle b/tomcat-server/build.gradle index 0e432a8..59c5cbc 100644 --- a/tomcat-server/build.gradle +++ b/tomcat-server/build.gradle
@@ -60,7 +60,7 @@ def product = 'tomcat-server' def productFileLocation = file("${projectDir}/publish_resources/products/${product}/${product}.product") - def javaProfileLocation = file("${projectDir}/src/main/dist/configuration/java7-server.profile") + def javaProfileLocation = file("${projectDir}/src/main/dist/configuration/java-server.profile") doLast() { publishProduct(project, productFileLocation, javaProfileLocation) } }
diff --git a/tomcat-server/src/main/dist/bin/dmk.bat b/tomcat-server/src/main/dist/bin/dmk.bat index caff311..25870c4 100644 --- a/tomcat-server/src/main/dist/bin/dmk.bat +++ b/tomcat-server/src/main/dist/bin/dmk.bat
@@ -180,7 +180,7 @@ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.authentication.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.users.properties" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.io.tmpdir="%TMP_DIR%" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.home="%KERNEL_HOME%" - set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.java.profile="file:%CONFIG_DIR%\java7-server.profile" + set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.java.profile="file:%CONFIG_DIR%\java-server.profile" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dssh.server.keystore="%CONFIG_DIR%/hostkey.ser" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.config="%CONFIG_DIR%" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.sharedConfiguration.area="%CONFIG_DIR%"
diff --git a/tomcat-server/src/main/dist/configuration/java7-server.profile b/tomcat-server/src/main/dist/configuration/java-server.profile similarity index 100% rename from tomcat-server/src/main/dist/configuration/java7-server.profile rename to tomcat-server/src/main/dist/configuration/java-server.profile
diff --git a/tomcat-server/src/main/filtered/bin/dmk.sh b/tomcat-server/src/main/filtered/bin/dmk.sh index 7816e90..2bab7e2 100755 --- a/tomcat-server/src/main/filtered/bin/dmk.sh +++ b/tomcat-server/src/main/filtered/bin/dmk.sh
@@ -147,7 +147,7 @@ AUTH_LOGIN=$CONFIG_DIR/org.eclipse.virgo.kernel.authentication.config AUTH_FILE=$CONFIG_DIR/org.eclipse.virgo.kernel.users.properties CONFIG_AREA=$KERNEL_HOME/work - JAVA_PROFILE=$KERNEL_HOME/configuration/java7-server.profile + JAVA_PROFILE=$KERNEL_HOME/configuration/java-server.profile if $cygwin; then ACCESS_PROPERTIES=$(cygpath -wp $ACCESS_PROPERTIES)