Fixes aasx-unpack issue in Jar

Signed-off-by: Mohammad Ghazanfar Ali Danish <[email protected]>

Author: mdanish98

basyx.components/basyx.components.docker/basyx.components.AASServer/src/main/java/org/eclipse/basyx/components/aas/aasx/AASXPackageManager.java

@@ -24,12 +24,9 @@
  ******************************************************************************/
 package org.eclipse.basyx.components.aas.aasx;
 
-import java.io.File;
 import java.io.IOException;
-import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -52,11 +49,13 @@ public AASXPackageManager(String path) {
 		super(path);
 	}
 
+	/**
+	 * @deprecated This method is deprecated. Please use the {@link AASXToMetamodelConverter#getTemporaryDirPath()}
+	 */
 	@Override
-	protected Path getRootFolder() throws IOException, URISyntaxException {
-		URI uri = AASXPackageManager.class.getProtectionDomain().getCodeSource().getLocation().toURI();
-		URI parent = new File(uri).getParentFile().toURI();
-		return Paths.get(parent);
+	@Deprecated(since = "1.4.0", forRemoval = true)
+	protected Path getRootFolder() throws URISyntaxException {
+		return getTemporaryDirPath();
 	}
 
 	@SuppressWarnings("unchecked")

basyx.components/basyx.components.docker/basyx.components.AASServer/src/test/java/org/eclipse/basyx/regression/AASServer/TestAASXAASServer.java

@@ -24,18 +24,19 @@
  ******************************************************************************/
 package org.eclipse.basyx.regression.AASServer;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.nio.file.Paths;
 
 import javax.servlet.ServletException;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.apache.commons.io.FileUtils;
 import org.eclipse.basyx.aas.aggregator.restapi.AASAggregatorProvider;
+import org.eclipse.basyx.aas.factory.aasx.AASXToMetamodelConverter;
 import org.eclipse.basyx.components.aas.AASServerComponent;
 import org.eclipse.basyx.components.aas.configuration.AASServerBackend;
 import org.eclipse.basyx.components.aas.configuration.BaSyxAASServerConfiguration;
-import org.eclipse.basyx.components.aas.executable.AASServerExecutable;
 import org.eclipse.basyx.components.configuration.BaSyxContextConfiguration;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -60,10 +61,8 @@ public static void setUpClass() throws ParserConfigurationException, SAXExceptio
 		contextConfig.loadFromResource(BaSyxContextConfiguration.DEFAULT_CONFIG_PATH);
 		BaSyxAASServerConfiguration aasConfig = new BaSyxAASServerConfiguration(AASServerBackend.INMEMORY, "aasx/01_Festo.aasx");
 
-		// Load the additional file path relative to the executed jar file
-		String rootPath = new File(AASServerExecutable.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile().getPath();
-		String docBasePath = rootPath;
-		contextConfig.setDocBasePath(docBasePath);
+		String docBasepath = Paths.get(FileUtils.getTempDirectory().getAbsolutePath(), AASXToMetamodelConverter.TEMP_DIRECTORY).toAbsolutePath().toString();
+		contextConfig.setDocBasePath(docBasepath);
 
 		// Start the component
 		component = new AASServerComponent(contextConfig, aasConfig);

basyx.components/basyx.components.docker/basyx.components.AASServer/src/test/java/org/eclipse/basyx/regression/AASServer/TestAASXPackageManager.java

@@ -40,6 +40,7 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.eclipse.basyx.aas.factory.aasx.AASXFactory;
 import org.eclipse.basyx.aas.factory.aasx.InMemoryFile;
@@ -101,7 +102,7 @@ public class TestAASXPackageManager {
 	/**
 	 * Files that are unzipped
 	 */
-	private static String[] unzipFiles = { "target/files/aasx/Document/docu.pdf", "target/files/icon.png" };
+	private static String[] unzipFiles = { "/basyx-temp/files/aasx/Document/docu.pdf", "/basyx-temp/files/icon.png" };
 
 	/**
 	 * AAS bundle which will be generated by the XMLAASBundleFactory
@@ -196,10 +197,12 @@ public void testLoadGeneratedAASX() throws InvalidFormatException, IOException,
 
 		// Unzip files from the .aasx
 		packageManager.unzipRelatedFiles();
+		
+		String tempDirectory = FileUtils.getTempDirectory().getAbsolutePath();
 
 		// Check if all expected files are present
 		for (String path : unzipFiles) {
-			assertTrue(new java.io.File(path).exists());
+			assertTrue(new java.io.File(tempDirectory + path).exists());
 		}
 
 	}