Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Needed to adjust service suites for new jar directory layout

  • Loading branch information...
commit 65f351f4d7e2c6cbdd89ebd717f084ff6094dfe1 1 parent 6837e43
@timf timf authored
View
1  .idea-modules/service-suites/tests-common.iml
@@ -11,6 +11,7 @@
<orderEntry type="module" module-name="workspace-service" exported="" />
<orderEntry type="library" exported="" name="test-libs" level="project" />
<orderEntry type="library" exported="" name="lib-workspaceservice" level="project" />
+ <orderEntry type="library" exported="" name="lib-services" level="project" />
</component>
</module>
View
1  service/service/java/tests/suites/build.properties
@@ -5,6 +5,7 @@ nimbus.st.service.main.builddir=${nimbus.st.basedir}/service/service/java/source
nimbus.st.metadata.builddir=${nimbus.st.basedir}/metadata/java/source
nimbus.st.authzdb.builddir=${nimbus.st.basedir}/authzdb
nimbus.st.main.lib.dir=${nimbus.st.basedir}/lib/services
+nimbus.st.workspaceservice.lib.dir=${nimbus.st.basedir}/lib/workspaceservice
nimbus.st.test.lib.dir=${nimbus.st.basedir}/lib/test
nimbus.st.service.api.dist.dir=${nimbus.st.basedir}/service-api/java/source/dist
nimbus.st.service.main.dist.dir=${nimbus.st.basedir}/service/service/java/source/dist
View
3  service/service/java/tests/suites/build.xml
@@ -17,6 +17,9 @@
<fileset dir="${nimbus.st.main.lib.dir}">
<include name="*.jar"/>
</fileset>
+ <fileset dir="${nimbus.st.workspaceservice.lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
<fileset dir="${nimbus.st.test.lib.dir}">
<include name="*.jar"/>
</fileset>
View
6 ...ice/service/java/tests/suites/common/src/org/globus/workspace/testing/NimbusTestBase.java
@@ -466,19 +466,19 @@ protected void setUpShareDir(String nimbusHome) throws Exception {
String libdir = null;
String apath = nh.getAbsolutePath();
while (apath != null) {
- final File candidate = candidate(apath, "lib/services/");
+ final File candidate = candidate(apath, "lib/workspaceservice/");
if (candidate != null) {
libdir = candidate.getAbsolutePath();
}
apath = new File(apath).getParent();
}
if (libdir == null) {
- throw new Exception("could not determine proper lib/services directory, " +
+ throw new Exception("could not determine proper lib/workspaceservice directory, " +
"is your nimbus home somewhere outside of the repository");
}
final File sanityCheck = new File(libdir, "derby.jar");
if (!sanityCheck.exists()) {
- throw new Exception("could not determine proper lib/services directory, " +
+ throw new Exception("could not determine proper lib/workspaceservice directory, " +
"is your nimbus home somewhere outside of the repository (derby.jar not found)");
}
conf.setProperty("derby.classpath.dir.prop", libdir);
Please sign in to comment.
Something went wrong with that request. Please try again.