Compare commits

...

3 Commits

Author SHA1 Message Date
hzhao-talendbj
33dfaa943a Merge remote-tracking branch 'origin/maintenance/7.3' into hengzhao/backport73/TUP-30208 2021-03-01 16:13:00 +08:00
hzhao-talendbj
d27026af27 TUP-30208 code change to fix mistake 2021-02-09 10:50:29 +08:00
hzhao-talendbj
674eb3e788 chore:(TUP-30208): Improve resources/ext-resources generation when
run/build job
2021-02-08 17:22:01 +08:00

View File

@@ -76,7 +76,6 @@ import org.eclipse.jdt.debug.core.JDIDebugModel;
import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.text.java.JavaFormattingStrategy;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jdt.launching.sourcelookup.advanced.AdvancedJavaLaunchDelegate;
import org.eclipse.jdt.ui.text.IJavaPartitions;
import org.eclipse.jdt.ui.text.JavaTextTools;
import org.eclipse.jface.dialogs.MessageDialog;
@@ -410,6 +409,11 @@ public class JavaProcessor extends AbstractJavaProcessor implements IJavaBreakpo
// CamelPropertiesPackage Line 516 int ROUTELET_PROCESS_ITEM = 4;
needContextInJar = true;
}
} else {
// for case normal job and not for build, should be resource folder
if (!ProcessorUtilities.isExportConfig()) {
needContextInJar = true;
}
}
}
}
@@ -2098,52 +2102,6 @@ public class JavaProcessor extends AbstractJavaProcessor implements IJavaBreakpo
copyEsbConfigFile(esbConfigsSourceFolder, esbConfigsTargetFolder, "oidc.properties"); //$NON-NLS-1$
}
}
try {
ITalendProcessJavaProject tProcessJvaProject = this.getTalendJavaProject();
if (tProcessJvaProject == null) {
return;
}
Item item = property.getItem();
if (item == null) {
// may be a guess schema process
return;
}
IFolder externalResourcesFolder = tProcessJvaProject.getExternalResourcesFolder();
IFolder resourcesFolder = tProcessJvaProject.getResourcesFolder();
String jobClassPackageFolder = JavaResourcesHelper.getJobClassPackageFolder(item, false);
IPath jobContextFolderPath = new Path(jobClassPackageFolder).append(JavaUtils.JAVA_CONTEXTS_DIRECTORY);
IFolder extResourcePath = externalResourcesFolder.getFolder(jobContextFolderPath);
IFolder resourcesPath = resourcesFolder.getFolder(jobContextFolderPath);
if (!extResourcePath.exists()) {
tProcessJvaProject.createSubFolder(null, externalResourcesFolder, jobContextFolderPath.toString());
}
extResourcePath.refreshLocal(IResource.DEPTH_INFINITE, null);
if(!resourcesPath.exists()) {
tProcessJvaProject.createSubFolder(null, resourcesFolder, jobContextFolderPath.toString());
}
resourcesPath.refreshLocal(IResource.DEPTH_INFINITE, null);
for (IResource resource : extResourcePath.members()) {
IFile context = resourcesPath.getFile(resource.getName());
if (context.exists()) {
context.delete(true, null);
}
resource.copy(context.getFullPath(), true, null);
}
resourcesPath.refreshLocal(IResource.DEPTH_INFINITE, null);
} catch (Exception e) {
e.printStackTrace();
}
}
/**