Merge lp:~zorba-coders/zorba/bug1058231 into lp:zorba

[Rodolfo Ochoa]

The problem was in the path from the process, instead of using the path of zorba_simplestore.dll Zorba gather the path of the main EXE.

This problem is not only from WinXP.

The problem was in the path from the process, instead of using the path of zorba_simplestore.dll Zorba gather the path of the main EXE.

This problem is not only from WinXP.

[lp:~zorba-coders/zorba/bug1058231]

11091. By Rodolfo Ochoa on 2012-10-13

Changing DIRS to PATH

[Chris Hillery (ceejatec)]

I'm assuming that the main fix here works. However I'm a bit confused why it matters whether we find the path to zorba.exe or zorba_simplestore.dll, because as far as I know they should always be in the same directory. So to satisfy my curiosity, why is this change necessary?

I also would like to know the use case for the two new environment variables. It seems to me that if we need those, we should need them on all platforms, not just Windows. Also, ZORBA_URI_PATH and ZORBA_LIB_PATH *are* already used by zorba.exe to do basically the same thing, so why is it necessary to handle them in root_static_context.cpp as well?

review: Needs Information

[Rodolfo Ochoa (rodolfo-ochoa)]

1-
Because Zorba Processor is not zorba.exe, is zorba_simplestore.dll, so, when you make a call from Java, the actual process is c:\...\java.exe calling zorba_simplestore among other dll's, so the paths come from java.exe.

2-
Same principle will apply here, when Zorba is called from other languages or environments this variables will not be considered and Zorba will fail miserably trying to get the URI and LIB path.

All this apply for windows, I think the same principle will apply for linux, but didn't added because this was a windows specific problem, do you think is better to add them for linux?

[Chris Hillery (ceejatec)]

Ah, OK, thanks for the explanation.

As for whether this should be done cross-platform:

1. There is no way that we have discovered to determine the path to zorba_simplestore (or zorba itself) on Linux or Mac, so there is no equivalent problem to be solved there (yet?).

2. It would be best if the environment variables were handled cross-platform and in one place. If nothing else, with your change I believe that entries in ZORBA_URI_PATH will be on the URI path twice, since they're added to root_static_context as well as to the query context by zorba.exe. So yes, if you could merge the code you've added with the equivalent code in bin/path_util.cpp, I think that would be correct.

[lp:~zorba-coders/zorba/bug1058231]

11092. By Rodolfo Ochoa on 2012-10-22

bringing lib/uri env vars to root static context in linux

11093. By Rodolfo Ochoa on 2012-10-23

Merge from branch

11094. By Rodolfo Ochoa on 2012-10-23

Changing the order of paths, env vars at the end

[Chris Hillery (ceejatec)]

I think you need to remove the corresponding getenv code from bin/path_util.cpp, or else it'll get executed twice when running zorba.exe.

review: Needs Fixing

[lp:~zorba-coders/zorba/bug1058231]

11095. By Rodolfo Ochoa on 2012-10-26

- Removing PathUtil from CMD
- Env Var seeking and setting is now optimized

11096. By Rodolfo Ochoa on 2012-10-26

Erasing debugging code

11097. By Rodolfo Ochoa on 2012-10-26

Removing path_util.cpp, not used anymore

[Chris Hillery (ceejatec)]

You can't remove path_util.cpp - it also handles the --lib-path and --uri-path command-line options, not just the environment variables. So you can get rid of getPathFromEnvironment(), and the parts of setPathsOnContext() which reference lEnvStr, but the rest has to stay, including the call to setPathsOnContext() in zorbacmd.cpp.

(Unrelated to your change, but it does appear that concatenatePaths() is unused code, so you could remove that too.)

review: Needs Fixing

[lp:~zorba-coders/zorba/bug1058231]

11098. By Rodolfo Ochoa on 2012-11-05

Merge from trunk

11099. By Rodolfo Ochoa on 2012-11-05

Removing only Environment Variables from PathUtil Class

[Rodolfo Ochoa (rodolfo-ochoa)]

PathUtil has been restored and fixed.

[Chris Hillery (ceejatec)]

The changes all look good to me now; thanks.

However, I just noticed something else that might be an issue for 28msec. Matthias, this code changes the magic Windows behaviour of finding modules based on the install location of Zorba. It used to be that it would find the location of zorba.exe. Now it bases it on the location of zorba_simplestore.dll. However: For Sausalito, the library isn't named "zorba_simplestore", is it? Is there a programmatic way of determining the DLL's name, based I guess on the current value of ZORBA_STORE_NAME? I guess we might want something like

#cmakedefine ZORBA_STORE_NAME

in config.h.cmake ?

[Matthias Brantner (matthias-brantner)]

> The changes all look good to me now; thanks.
>
> However, I just noticed something else that might be an issue for 28msec.
> Matthias, this code changes the magic Windows behaviour of finding modules
> based on the install location of Zorba. It used to be that it would find the
> location of zorba.exe. Now it bases it on the location of
> zorba_simplestore.dll. However: For Sausalito, the library isn't named
> "zorba_simplestore", is it? Is there a programmatic way of determining the
> DLL's name, based I guess on the current value of ZORBA_STORE_NAME? I guess we
> might want something like
>
> #cmakedefine ZORBA_STORE_NAME
>
> in config.h.cmake ?
Yes, nothing should depend on the name of the library.

[lp:~zorba-coders/zorba/bug1058231]

11100. By Rodolfo Ochoa on 2012-11-07

Moving tests to folder tests

11101. By Rodolfo Ochoa on 2012-11-13

Moving simplestore.dll name to config.h

[Rodolfo Ochoa (rodolfo-ochoa)]

sorry for the delay, is now on config.h

[lp:~zorba-coders/zorba/bug1058231]

11102. By Chris Hillery on 2012-11-26

Restoring http_resolution feature (lost in merge from trunk).

11103. By Chris Hillery on 2012-11-27

Merge from trunk.

[Chris Hillery (ceejatec)]

review: Approve

[Matthias Brantner (matthias-brantner)]

- bad include +#include "../include/zorba/config.h"

- it seems like entire files have been removed and added (potential newline problem)?

- set_env_var seems to be a bad name for the function. What the function really does is get_env_var, right?

review: Needs Fixing

[Chris Hillery (ceejatec)]

Good catch on the #include. Should just be #include <zorba/config.h> .

The removed/added problem is because Rodolfo initially deleted them, but then put them back based on my earlier comment. Unfortunately I don't know of a way to fix this.

As for the function name, I don't care much, but append_from_env_vars() would probably be most accurate.

[Till Westmann (tillw)]

> The removed/added problem is because Rodolfo initially deleted them, but then
> put them back based on my earlier comment. Unfortunately I don't know of a
> way to fix this.

The way I usually solve this (if the history of the branch is not terribly relevant) is to create a patch from the branch, apply the patch to the trunk, and push it to a new branch. This loses the history in the branch, but gets better diff in the history of the trunk.

[Chris Hillery (ceejatec)]

This proposals has been replaced by the following:

https://code.launchpad.net/~zorba-coders/zorba/bug1058231b/+merge/139556

Therefore I'm marking this one as Rejected to clean it off the list.

Unmerged revisions

11103. By Chris Hillery on 2012-11-27

Merge from trunk.

11102. By Chris Hillery on 2012-11-26

Restoring http_resolution feature (lost in merge from trunk).

11101. By Rodolfo Ochoa on 2012-11-13

Moving simplestore.dll name to config.h

11100. By Rodolfo Ochoa on 2012-11-07

Moving tests to folder tests

11099. By Rodolfo Ochoa on 2012-11-05

Removing only Environment Variables from PathUtil Class

11098. By Rodolfo Ochoa on 2012-11-05

Merge from trunk

11097. By Rodolfo Ochoa on 2012-10-26

Removing path_util.cpp, not used anymore

11096. By Rodolfo Ochoa on 2012-10-26

Erasing debugging code

11095. By Rodolfo Ochoa on 2012-10-26

- Removing PathUtil from CMD
- Env Var seeking and setting is now optimized

11094. By Rodolfo Ochoa on 2012-10-23

Changing the order of paths, env vars at the end

=== added file 'bin/path_util.cpp'
--- bin/path_util.cpp	1970-01-01 00:00:00 +0000
+++ bin/path_util.cpp	2012-11-27 00:19:21 +0000
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2006-2008 The FLWOR Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "path_util.h"
+
+#include <stdlib.h>
+//#include "zorba/zorba_string.h"
+#include "zorba/util/path.h"
+
+#include "util.h"
+#include "zorbacmdproperties.h"
+#include <zorba/static_context.h>
+
+namespace zorba {
+
+namespace PathUtil {
+
+void
+tokenizePath(
+  const std::string&    aPathStr,
+  std::vector<String>&  aResult)
+{
+  std::vector<std::string> lPath;
+#ifdef WIN32
+  Util::tokenize(aPathStr, ";", lPath);
+#else
+  Util::tokenize(aPathStr, ":", lPath);
+#endif
+  for (std::vector<std::string>::iterator lIter = lPath.begin();
+       lIter != lPath.end(); ++lIter) {
+    aResult.push_back(*lIter);
+  }
+}
+
+void
+setPathsOnContext(
+  const ZorbaCMDProperties& aProperties,
+  StaticContext_t& aStaticCtx)
+{
+  std::vector<String> lPath;
+  std::string lPathStr;
+
+  // Compute the current working directory to append to all paths.
+  filesystem_path lCWD;
+
+  // setModulePaths() *overwrites* the URI path and lib path, so there's no
+  // sense in calling both. So if --module-path exists, just use it.
+  aProperties.getModulePath(lPathStr);
+  if (lPathStr.length() > 0) {
+    tokenizePath(lPathStr, lPath);
+    lPath.push_back(lCWD.get_path());
+    aStaticCtx->setModulePaths(lPath);
+  }
+  else {
+    // Compute and set URI path
+    aProperties.getURIPath(lPathStr);
+    tokenizePath(lPathStr, lPath);
+    lPath.push_back(lCWD.get_path());
+    aStaticCtx->setURIPath(lPath);
+    lPath.clear();
+
+    // Compute and set lib path
+    aProperties.getLibPath(lPathStr);
+    tokenizePath(lPathStr, lPath);
+    lPath.push_back(lCWD.get_path());
+    aStaticCtx->setLibPath(lPath);
+  }
+}
+
+} /* namespace ModulePath */
+
+} /* namespace zorba */

=== removed file 'bin/path_util.cpp'
--- bin/path_util.cpp	2012-09-19 21:16:15 +0000
+++ bin/path_util.cpp	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-/*
- * Copyright 2006-2008 The FLWOR Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "path_util.h"
-
-#include <stdlib.h>
-//#include "zorba/zorba_string.h"
-#include "zorba/util/path.h"
-
-#include "util.h"
-#include "zorbacmdproperties.h"
-#include <zorba/static_context.h>
-
-namespace zorba {
-
-namespace PathUtil {
-
-static std::string
-getPathFromEnvironment(std::string const& aEnvVar)
-{
-#ifdef WIN32
-  char* lBuffer;
-  size_t lLen=0;
-  errno_t lErr = getenv_s(&lLen, NULL, 0, aEnvVar.c_str());
-  if (lErr || !lLen) return "";
-  lBuffer = (char*)malloc(lLen * sizeof(char));
-  if (!lBuffer) return "";
-  getenv_s(&lLen, lBuffer, lLen, aEnvVar.c_str());
-  std::string lRes(lBuffer);
-  free(lBuffer);
-  return lRes;
-#else
-  const char* lEnvValue = getenv(aEnvVar.c_str());
-  return lEnvValue != 0 ? lEnvValue : "";
-#endif
-}
-
-
-void
-tokenizePath(
-  const std::string&    aPathStr,
-  std::vector<String>&  aResult)
-{
-  std::vector<std::string> lPath;
-#ifdef WIN32
-  Util::tokenize(aPathStr, ";", lPath);
-#else
-  Util::tokenize(aPathStr, ":", lPath);
-#endif
-  for (std::vector<std::string>::iterator lIter = lPath.begin();
-       lIter != lPath.end(); ++lIter) {
-    aResult.push_back(*lIter);
-  }
-}
-
-
-String
-concatenatePaths( const std::vector<String>& aPathList)
-{
-  String delimiter(filesystem_path::get_path_separator());
-
-  String lResult;
-  for (std::vector<String>::const_iterator lIter = aPathList.begin();
-       lIter != aPathList.end(); ++lIter)
-  {
-    lResult += delimiter + *lIter;
-  }
-
-  return lResult;
-}
-
-
-void
-setPathsOnContext(
-  const ZorbaCMDProperties& aProperties,
-  StaticContext_t& aStaticCtx)
-{
-  std::vector<String> lPath;
-  std::string lPathStr, lEnvStr;
-
-  // Compute the current working directory to append to all paths.
-  filesystem_path lCWD;
-
-  // setModulePaths() *overwrites* the URI path and lib path, so there's no
-  // sense in calling both. So if either --module-path or ZORBA_MODULE_PATH
-  // exists, just use those.
-  aProperties.getModulePath(lPathStr);
-  lEnvStr = getPathFromEnvironment("ZORBA_MODULE_PATH");
-  if (lPathStr.length() > 0 || lEnvStr.length() > 0) {
-    tokenizePath(lPathStr, lPath);
-    tokenizePath(lEnvStr, lPath);
-    lPath.push_back(lCWD.get_path());
-    aStaticCtx->setModulePaths(lPath);
-  }
-  else {
-    // Compute and set URI path
-    aProperties.getURIPath(lPathStr);
-    tokenizePath(lPathStr, lPath);
-    lEnvStr = getPathFromEnvironment("ZORBA_URI_PATH");
-    tokenizePath(lEnvStr, lPath);
-    lPath.push_back(lCWD.get_path());
-    aStaticCtx->setURIPath(lPath);
-    lPath.clear();
-
-    // Compute and set lib path
-    aProperties.getLibPath(lPathStr);
-    tokenizePath(lPathStr, lPath);
-    lPath.push_back(lCWD.get_path());
-    lEnvStr = getPathFromEnvironment("ZORBA_LIB_PATH");
-    tokenizePath(lEnvStr, lPath);
-    aStaticCtx->setLibPath(lPath);
-  }
-}
-
-} /* namespace ModulePath */
-
-} /* namespace zorba */

=== added file 'bin/path_util.h'
--- bin/path_util.h	1970-01-01 00:00:00 +0000
+++ bin/path_util.h	2012-11-27 00:19:21 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2006-2008 The FLWOR Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ZORBA_MODULE_PATH_H
+#define ZORBA_MODULE_PATH_H
+
+#include <vector>
+#include <string>
+#include <zorba/api_shared_types.h>
+
+class ZorbaCMDProperties;
+
+namespace zorba {
+
+  class String;
+
+  namespace PathUtil {
+
+    void
+    setPathsOnContext(const ZorbaCMDProperties& aProperties,
+                      zorba::StaticContext_t& aStaticCtx);
+
+    void
+    tokenizePath(const std::string& aPathStr, std::vector<String>&  aResult);
+
+  }
+} /* namespace zorba */
+
+#endif

=== removed file 'bin/path_util.h'
--- bin/path_util.h	2012-09-19 21:16:15 +0000
+++ bin/path_util.h	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright 2006-2008 The FLWOR Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef ZORBA_MODULE_PATH_H
-#define ZORBA_MODULE_PATH_H
-
-#include <vector>
-#include <string>
-#include <zorba/api_shared_types.h>
-
-class ZorbaCMDProperties;
-
-namespace zorba {
-
-  class String;
-
-  namespace PathUtil {
-
-    void
-    setPathsOnContext(const ZorbaCMDProperties& aProperties,
-                      zorba::StaticContext_t& aStaticCtx);
-
-    void
-    tokenizePath(const std::string& aPathStr, std::vector<String>&  aResult);
-
-
-    String
-    concatenatePaths( const std::vector<String>& aPathList);
-
-  }
-} /* namespace zorba */
-
-#endif

=== modified file 'include/zorba/config.h.cmake'
--- include/zorba/config.h.cmake	2012-09-19 21:16:15 +0000
+++ include/zorba/config.h.cmake	2012-11-27 00:19:21 +0000
@@ -160,6 +160,8 @@
 
 ////////// Zorba //////////////////////////////////////////////////////////////
 
+#cmakedefine ZORBA_STORE_NAME "zorba_${ZORBA_STORE_NAME}"
+
 // Version
 #define ZORBA_VERSION "${ZORBA_VERSION}"
 #define ZORBA_MAJOR_NUMBER ${ZORBA_MAJOR_NUMBER}

=== modified file 'src/compiler/expression/expr_clone.cpp'
--- src/compiler/expression/expr_clone.cpp	2012-10-24 11:32:56 +0000
+++ src/compiler/expression/expr_clone.cpp	2012-11-27 00:19:21 +0000
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "stdafx.h"
 #include "compiler/expression/expr_base.h"
 #include "compiler/expression/update_exprs.h"
 #include "compiler/expression/expr.h"

=== modified file 'src/context/root_static_context.cpp'
--- src/context/root_static_context.cpp	2012-11-06 10:11:37 +0000
+++ src/context/root_static_context.cpp	2012-11-27 00:19:21 +0000
@@ -31,11 +31,19 @@
 
 #include "store/api/item_factory.h"
 
+#ifdef WIN32
+#include "../include/zorba/config.h"
+#endif WIN32
+
+
+// DEFINE ENVIRONMENT VARIABLES
 namespace zorba 
 {
 
 
 #ifdef WIN32
+#define MAX_VAR_SIZE 32767
+
 static void append_to_path(
     std::vector<zstring>& aPath,
     zstring& zorba_root,
@@ -47,6 +55,62 @@
   full_path.append("\\");
   aPath.push_back(full_path);
 }
+
+static void set_env_var(
+  wchar_t const * env_var_name,
+  std::vector<zstring>& pathsVector,
+  zstring& core_path,
+  zstring& noncore_path
+  )
+{
+  wchar_t env_var[MAX_VAR_SIZE];
+  DWORD path_size;
+  // get a relative path from the environment for LIB
+  path_size = GetEnvironmentVariableW (env_var_name,
+                                       env_var,
+                                       MAX_VAR_SIZE );
+  if (path_size)
+  {
+    char  dll_path[MAX_VAR_SIZE];
+    WideCharToMultiByte(CP_UTF8,
+                        0,
+                        env_var,
+                        -1,
+                        dll_path,
+                        MAX_VAR_SIZE,
+                        NULL,
+                        NULL);
+    char * str_env = std::strtok(dll_path, ";");
+    while (str_env !=NULL) {
+      zstring zorba_env_dir(str_env);
+      if (str_env[strlen(str_env)-1] != '\\')
+      {
+        zorba_env_dir.append("\\");
+      }
+      append_to_path(pathsVector, zorba_env_dir, core_path);
+      append_to_path(pathsVector, zorba_env_dir, noncore_path);
+      str_env = std::strtok(NULL, ";");
+    }
+  }
+}
+#else
+  static void set_env_var(
+  char * env_var_name,
+  std::vector<zstring>& pathsVector
+  )
+{
+  char* dll_path = getenv(env_var_name);
+  char* str_env = std::strtok(dll_path, ";");
+  while (str_env !=NULL) {
+    zstring zorba_env_dir(str_env);
+    if (str_env[strlen(str_env)-1] != '/')
+    {
+      zorba_env_dir.append("/");
+    }
+    pathsVector.push_back(zorba_env_dir);
+    str_env = std::strtok(NULL, ";");
+  }
+}
 #endif
 
 
@@ -133,7 +197,8 @@
   // compute the relative path to zorba_simplestore.dll (this dll)
   WCHAR  wdll_path[1024];
   DWORD dll_path_size;
-  dll_path_size = GetModuleFileNameW(NULL,
+  HMODULE h_module = GetModuleHandleW (_T(ZORBA_STORE_NAME));
+  dll_path_size = GetModuleFileNameW(h_module,
                                      wdll_path,
                                      sizeof(wdll_path)/sizeof(wdll_path[0]));
   if(dll_path_size)
@@ -167,6 +232,7 @@
     }
   }
 #endif
+
   const char ** lURIPathIter = get_builtin_uri_path();
   for (; *lURIPathIter != 0; ++lURIPathIter)
   {
@@ -186,6 +252,21 @@
   set_feature( feature::scripting );
   set_feature( feature::trace );
   set_feature( feature::http_resolution );
+
+#ifdef WIN32
+  // get a relative path from the environment for URI
+  set_env_var (L"ZORBA_MODULE_PATH", lRootURIPath, zstring(ZORBA_CORE_URI_DIR), zstring(ZORBA_NONCORE_URI_DIR));
+  set_env_var (L"ZORBA_MODULE_PATH", lRootLibPath, zstring(ZORBA_CORE_LIB_DIR), zstring(ZORBA_NONCORE_LIB_DIR));
+
+  set_env_var (L"ZORBA_URI_PATH", lRootURIPath, zstring(ZORBA_CORE_URI_DIR), zstring(ZORBA_NONCORE_URI_DIR));
+  set_env_var (L"ZORBA_LIB_PATH", lRootLibPath, zstring(ZORBA_CORE_LIB_DIR), zstring(ZORBA_NONCORE_LIB_DIR));
+
+#else
+  set_env_var ("ZORBA_URI_PATH", lRootURIPath);
+  set_env_var ("ZORBA_LIB_PATH", lRootLibPath);
+
+#endif
+
 } 
 
 

=== modified file 'src/functions/func_schema_impl.cpp'
--- src/functions/func_schema_impl.cpp	2012-10-15 13:35:59 +0000
+++ src/functions/func_schema_impl.cpp	2012-11-27 00:19:21 +0000
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "stdafx.h"
 #include "functions/func_schema.h"
 
 #include "compiler/expression/expr_base.h"

=== modified file 'test/rbkt/modules/java/CMakeLists.txt'
--- test/rbkt/modules/java/CMakeLists.txt	2012-10-08 12:09:36 +0000
+++ test/rbkt/modules/java/CMakeLists.txt	2012-11-27 00:19:21 +0000
@@ -31,6 +31,8 @@
     GET_PROPERTY (JavaTest2_JAR_FILE TARGET JavaTest2 PROPERTY JAR_FILE)
     DECLARE_ZORBA_JAR(FILE ${JavaTest_JAR_FILE} TARGET JavaTest TEST_ONLY)
     DECLARE_ZORBA_JAR(FILE ${JavaTest2_JAR_FILE} TARGET JavaTest2 TEST_ONLY)
+    SET_TARGET_PROPERTIES (JavaTest PROPERTIES FOLDER "Tests")
+    SET_TARGET_PROPERTIES (JavaTest2 PROPERTIES FOLDER "Tests")
 
   ENDIF (Java_JAVAC_EXECUTABLE)
 ENDIF (${RESULT} GREATER -1)