diff --git a/README.md b/README.md index 134ecad05901ccd8d14e56f625c41237a5870890..ac973d4f07657112b4aae04d2c39a71d37a6c38e 100644 --- a/README.md +++ b/README.md @@ -67,9 +67,9 @@ File -> New -> Project From Existing Sources Select the gradle folder to load the gradle model After the model is loaded execute the tasks: -openBISDevelopementEnvironmentASPrepare -openBISDevelopementEnvironmentASStart -openBISDevelopementEnvironmentDSSStart +openBISDevelopmentEnvironmentASPrepare +openBISDevelopmentEnvironmentASStart +openBISDevelopmentEnvironmentDSSStart ``` ## IntelliJ can't find package com.sun.*, but I can compile the project using the command line! @@ -84,8 +84,8 @@ option for cross-compilation". 2. ./gradlew :bundleOpenbisStaticResources 2. Start openBIS in your chosen IDE (NG UI assumes it will run at: http://localhost:8888/openbis-test/): - 1. run openBISDevelopementEnvironmentASPrepare gradle task - 2. run openBISDevelopementEnvironmentASStart gradle task + 1. run openBISDevelopmentEnvironmentASPrepare gradle task + 2. run openBISDevelopmentEnvironmentASStart gradle task 3. In command line do: 1. cd /<OPENBIS_PROJECT_ROOT>/ui-admin 2. npm install diff --git a/server-application-server/build.gradle b/server-application-server/build.gradle index 5fbb3d48c55bd24ba35df26504cf7f7995021a0c..c25c7290a7e49ac48fff23620965c37495e91b4e 100644 --- a/server-application-server/build.gradle +++ b/server-application-server/build.gradle @@ -123,7 +123,7 @@ task copyTestData(type: Copy, dependsOn: testClasses) { include "*.properties" } -task openBISDevelopementEnvironmentASStart(type: JavaExec) { +task openBISDevelopmentEnvironmentASStart(type: JavaExec) { main = 'org.eclipse.jetty.runner.Runner' classpath = sourceSets.main.runtimeClasspath + configurations.devRuntime jvmArgs(['-Dpython.path=../libraries/jython/jython-lib', '-Dlog4j.configuration=etc/log.xml', diff --git a/server-application-server/gwtdev.gradle b/server-application-server/gwtdev.gradle index 20083479db0b2a55dda26b0df8f3401101f0acd4..8803ce77b98e989588431ba6dc0f8dd2263e1c54 100644 --- a/server-application-server/gwtdev.gradle +++ b/server-application-server/gwtdev.gradle @@ -96,7 +96,7 @@ task copyV3Api(type: Copy, dependsOn: [compileGWTToTempJDK11, ':api-openbis-java into "${gwtTempPath}/ch.systemsx.cisd.openbis.OpenBIS/resources/api/v3" } -task openBISDevelopementEnvironmentASPrepare(type: Copy, dependsOn: copyV3Api) { +task openBISDevelopmentEnvironmentASPrepare(type: Copy, dependsOn: copyV3Api) { from "${gwtTempPath}/ch.systemsx.cisd.openbis.OpenBIS" into "targets/www/openbis-test" } diff --git a/server-original-data-store/build.gradle b/server-original-data-store/build.gradle index 5b46693006fb834978b86226f2239ff1a21e5eba..1589a7a3241ece9b0559d95cb56138973584b224 100644 --- a/server-original-data-store/build.gradle +++ b/server-original-data-store/build.gradle @@ -118,7 +118,7 @@ jar { } } -task openBISDevelopementEnvironmentDSSStart(type: JavaExec) { +task openBISDevelopmentEnvironmentDSSStart(type: JavaExec) { main = 'ch.systemsx.cisd.openbis.dss.generic.DataStoreServer' classpath = sourceSets.datastoreExec.runtimeClasspath jvmArgs(['-ea', '-Dpython.path=../libraries/jython/jython-lib',