diff --git a/all-in-one/installer/i18n/messages.properties b/all-in-one/installer/i18n/messages.properties index f566e964ce8460447be7decc82652e9b2e303447..31f0c80fac17bd2a4a177387cf3781ee6ee1778a 100644 --- a/all-in-one/installer/i18n/messages.properties +++ b/all-in-one/installer/i18n/messages.properties @@ -1,24 +1,10 @@ java.version.title=Java version java.version.message=The installer has not detected a compatible version of Java on your system. If you continue the installation, the installer will add an embedded version of Java to your Bonita BPM Studio.\n Note: This version of Java will not be installed on your system, so it will not impact other applications. If you do not want to use the embedded Java version, cancel the installation, install Java, then restart the installation.\n Do you want to continue the installation and use the embedded Java? -workspace.recovery.progressMessage=Please wait, retrieving workspace data... -initializing.progressMessage=Please wait, initializing -workspace.location.title=Workspace location -workspace.location.description=Path -workspace.location.explanation=You can migrate only one workspace automatically: -workspace.location.explanation.choice1=- default workspace: browse to the directory where you installed Bonita BPM Studio. -workspace.location.explanation.choice2=- another workspace (Subscription editions): browse to its parent directory. -workspace.location.explanation.end=To migrate other workspaces manually (Subscription editions only): in the old Studio, all diagrams closed, export everything and import the archive into the new Studio. -workspace.location.validation.error=The directory you chose does not contain a valid workspace keep.workspace.title=Keep workspace ? keep.workspace.msg=Do you want to keep all your existing data? launch=Launch install.license.error=License file should have a ".lic" extension -install.license.desc=License file (browse your computer) +install.license.desc=License file request.key.explanation=Copy the license key below, log into Bonitasoft Customer Portal (https://customer.bonitasoft.com/license/request) and paste it in the License Request Key field.\nYou will receive your license file by email. Save it locally and come back to this installer.\n install.license.title=Product license -retrieve.workspace.title=Retrieve data -retrieve.workspace.message=Do you want to retrieve data from an existing Bonita BPM workspace? -retrieve.workspace.message.warning=Warning: If you migrate a workspace that contains a shared repository (Subscription editions), all the repository users must migrate to the new version of Studio. -workspace.setup=Workspace setup -no.thanks=No, do not migrate data, I will migrate manually, or I do not have any data to migrate. -yes.import=Yes, migrate a workspace. \ No newline at end of file +workspace.setup=Workspace setup \ No newline at end of file diff --git a/all-in-one/installer/installer_project_template.xml b/all-in-one/installer/installer_project_template.xml index 89d5833b7459a551f404a71588c5c6d1b428b98f..f22f76f483b8b4a7f62c40052b64495dd4e4b63c 100644 --- a/all-in-one/installer/installer_project_template.xml +++ b/all-in-one/installer/installer_project_template.xml @@ -215,8 +215,9 @@ Type=Application - - + + @@ -279,8 +280,9 @@ -clearPersistedState -clearPersistedState --vm -../../../jre/Contents/Home/bin/java + -vm + ../../../jre/Contents/Home/bin/java + @@ -320,7 +322,8 @@ genisoimage - -D -V Setup -no-pad -r -apple -o @bitrock.output@/${dmgName} ${tempDir}/output + -D -V Setup -no-pad -r -apple -o @bitrock.output@/${dmgName} ${tempDir}/output + ${tempDir} @@ -381,7 +384,8 @@ 0 - http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=126&bos_redirect_product=bos&bos_version=${product_version}&os=${platform_name}&arch=@os_arch@&edition=community + http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=126&bos_redirect_product=bos&bos_version=${product_version}&os=${platform_name}&arch=@os_arch@&edition=community + @@ -459,187 +463,7 @@ - - retrieveWorksapce - ${msg(retrieve.workspace.title)} - ${msg(retrieve.workspace.message)} - ${msg(retrieve.workspace.message.warning)} - - - false - 0 - radiobuttons - installationFinished - default - - - - - - - - java_executable - ${installdir}/jre/bin/java.exe - - - - windows - - - - - java_executable - ${installdir}/jre/bin/java - - - - linux - - - - - java_executable - ${installdir}/jre/Contents/Home/bin/java - - - - osx - - - - - ${msg(workspace.setup)} - 100 - 400 - - - ${java_executable} - -Xmx512m -jar "${installdir}/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar" -product org.bonitasoft.studio.initializer -application org.bonitasoft.studio.application.InitializerApplication -data "${installdir}/workspace" -noSplash - ${msg(initializing.progressMessage)} ${product_fullname}... - - - ${retrieveWorksapce} - - - 1 - osx - - - - - - - ${retrieveWorksapce} - - - - - - - Oldworkspace - ${msg(workspace.location.title)} - ${msg(workspace.location.description)} - ${msg(workspace.location.explanation)} - ${msg(workspace.location.explanation.choice1)} - ${msg(workspace.location.explanation.choice2)} - - ${msg(workspace.location.explanation.end)} - - - ${platform_install_prefix}/ - 0 - retrieveWorksapce - 1 - 1 - - - - - - equals - ${retrieveWorksapce} - true - - - - - ${Oldworkspace} - 1 - ${msg(workspace.location.validation.error)} - workspace - workspaceFound - - - - - ${msg(workspace.setup)} - 100 - 400 - - - ${java_executable} - -Xmx512m -jar "${installdir}/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar" -product org.bonitasoft.studio.workspaceRecovery -application org.bonitasoft.studio.application.WorkspaceRecovery -data "${Oldworkspace}/workspace/" -newWorkspaceLocation "${installdir}/workspace" -noSplash - ${msg(workspace.recovery.progressMessage)} - - - 1 - osx - - - ${retrieveWorksapce} - - - - - ${java_executable} - -Xmx512m -jar "${installdir}/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar" -product org.bonitasoft.studio.initializer -application org.bonitasoft.studio.application.InitializerApplication -data "${installdir}/workspace" -noSplash - ${msg(initializing.progressMessage)} ${product_fullname}... - - - 1 - osx - - - - - ${java_executable} - -Xmx512m -XstartOnFirstThread -jar "${installdir}/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar" -product org.bonitasoft.studio.workspaceRecovery -application org.bonitasoft.studio.application.WorkspaceRecovery -data "${Oldworkspace}/workspace/" -newWorkspaceLocation "${installdir}/workspace" -noSplash - ${msg(workspace.recovery.progressMessage)} - - - osx - - - ${retrieveWorksapce} - - - - - ${java_executable} - - -Xmx512m -XstartOnFirstThread -jar "${installdir}/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar" -product org.bonitasoft.studio.initializer -application org.bonitasoft.studio.application.InitializerApplication -data "${installdir}/workspace" -noSplash - ${msg(initializing.progressMessage)} ${product_fullname}... - - - osx - - - - - - - installdir Installer.Parameter.installdir.description diff --git a/bundles/plugins/org.bonitasoft.studio.application/plugin.xml b/bundles/plugins/org.bonitasoft.studio.application/plugin.xml index 834e8e74db6fcc89a85638fe75da158f693163d9..6fc2f564c08eccb0ecb814e1e633e9205f8adc6b 100644 --- a/bundles/plugins/org.bonitasoft.studio.application/plugin.xml +++ b/bundles/plugins/org.bonitasoft.studio.application/plugin.xml @@ -744,28 +744,6 @@ id="org.bonitasoft.studio.views.overview"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - >>>>>> origin/master - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2.0 of the License, or - * (at your option) any later version. - * <<<<<<< HEAD - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * ======= - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * >>>>>>> origin/master - */ -package org.bonitasoft.studio.application; - -import org.bonitasoft.studio.application.advisor.InitWorkspaceAdvisor; -import org.eclipse.e4.core.contexts.ContextInjectionFactory; -import org.eclipse.e4.core.contexts.EclipseContextFactory; -import org.eclipse.equinox.app.IApplication; - -/** - * @author Romain Bioteau - */ -public class BonitaStudioInitializerApplication extends BonitaStudioApplication implements IApplication { - - @Override - protected BonitaStudioWorkbenchAdvisor createWorkbenchAdvisor() { - return ContextInjectionFactory.make(InitWorkspaceAdvisor.class, EclipseContextFactory.create()); - } - -} diff --git a/bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/RecoverWorkspaceApplication.java b/bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/RecoverWorkspaceApplication.java deleted file mode 100644 index 1427dd93291c35c4cddd8af113c4ad9a321d2f62..0000000000000000000000000000000000000000 --- a/bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/RecoverWorkspaceApplication.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Copyright (C) 2011 BonitaSoft S.A. - * BonitaSoft, 31 rue Gustave Eiffel - 38000 Grenoble - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2.0 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.bonitasoft.studio.application; - -import java.util.Map; - -import org.bonitasoft.studio.application.advisor.RecoverWorkspaceAdvisor; -import org.eclipse.core.runtime.Assert; -import org.eclipse.e4.core.contexts.ContextInjectionFactory; -import org.eclipse.e4.core.contexts.EclipseContextFactory; -import org.eclipse.equinox.app.IApplication; -import org.eclipse.equinox.app.IApplicationContext; - -/** - * @author Romain Bioteau - * - */ -public class RecoverWorkspaceApplication extends BonitaStudioApplication implements IApplication { - - private String newWorkspaceLocation; - - /* - * (non-Javadoc) - * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext) - */ - @Override - public Object start(final IApplicationContext context) { - final Map argument = context.getArguments() ; - final Object args = argument.get(IApplicationContext.APPLICATION_ARGS) ; - if(args != null && args instanceof String[]){ - final String[] arguments =(String[]) args ; - for(int i = 0; i < arguments.length ; i++ ){ - if(arguments[i].startsWith("-newWorkspaceLocation")){ - newWorkspaceLocation = arguments[i+1] ; - } - } - } - Assert.isLegal(newWorkspaceLocation != null && !newWorkspaceLocation.isEmpty()); - return super.start(context); - } - - @Override - protected BonitaStudioWorkbenchAdvisor createWorkbenchAdvisor() { - final RecoverWorkspaceAdvisor advisor = ContextInjectionFactory.make(RecoverWorkspaceAdvisor.class, EclipseContextFactory.create()); - advisor.setNewWorkspaceLocation(newWorkspaceLocation); - return advisor; - } - - /* (non-Javadoc) - * @see org.eclipse.equinox.app.IApplication#stop() - */ - @Override - public void stop() { - // NOTHING TO DO - } - - - -} diff --git a/bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/advisor/InitWorkspaceAdvisor.java b/bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/advisor/InitWorkspaceAdvisor.java deleted file mode 100644 index f4f9077c021c31d3371b4fc3ac55f54802b45f5d..0000000000000000000000000000000000000000 --- a/bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/advisor/InitWorkspaceAdvisor.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - * Copyright (C) 2009-2014 BonitaSoft S.A. - * BonitaSoft, 31 rue Gustave Eiffel - 38000 Grenoble - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2.0 of the License, or - * (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.bonitasoft.studio.application.advisor; - -import java.io.File; -import java.io.FileFilter; - -import org.bonitasoft.studio.common.jface.FileActionDialog; -import org.bonitasoft.studio.common.log.BonitaStudioLog; -import org.bonitasoft.studio.common.repository.Repository; -import org.bonitasoft.studio.common.repository.RepositoryManager; -import org.bonitasoft.studio.common.repository.model.IRepository; -import org.bonitasoft.studio.importer.ImporterRegistry; -import org.bonitasoft.studio.importer.processors.ToProcProcessor; -import org.eclipse.core.resources.ResourcesPlugin; - -/** - * @author Romain Bioteau - */ -public class InitWorkspaceAdvisor extends InstallerApplicationWorkbenchAdvisor { - - /* - * (non-Javadoc) - * @see org.bonitasoft.studio.application.advisor.InstallerApplicationWorkbenchAdvisor#executePostStartupHandler() - */ - @Override - protected void executePostStartupHandler() { - final File[] repositoryToImport = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile().listFiles(new FileFilter() { - - @Override - public boolean accept(final File file) { - return file.getName().endsWith(".bos"); - } - }); - - if (repositoryToImport != null && repositoryToImport.length > 0) { - for (final File workspaceArchive : repositoryToImport) { - final String name = workspaceArchive.getName(); - final String repositoryName = name.substring(0, name.lastIndexOf(".")); - RepositoryManager.getInstance().setRepository(repositoryName, Repository.NULL_PROGRESS_MONITOR); - final IRepository repository = RepositoryManager.getInstance().getRepository(repositoryName); - if (repository != null) { - try { - FileActionDialog.setDisablePopup(true); - final ToProcProcessor importer = ImporterRegistry.getInstance().createImporterFor(name); - if (importer != null) { - importer.setRepository(repositoryName); - importer.createDiagram(workspaceArchive.toURL(), Repository.NULL_PROGRESS_MONITOR); - } - workspaceArchive.delete(); - } catch (final Exception e) { - BonitaStudioLog.error(e); - } - } - } - RepositoryManager.getInstance().setRepository("default", Repository.NULL_PROGRESS_MONITOR); - } - } -} diff --git a/bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/advisor/InstallerApplicationWorkbenchAdvisor.java b/bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/advisor/InstallerApplicationWorkbenchAdvisor.java deleted file mode 100644 index 5bef4168f1faad87369de2d538e44cf410e51e22..0000000000000000000000000000000000000000 --- a/bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/advisor/InstallerApplicationWorkbenchAdvisor.java +++ /dev/null @@ -1,85 +0,0 @@ -/** - * Copyright (C) 2009-2011 BonitaSoft S.A. - * BonitaSoft, 31 rue Gustave Eiffel - 38000 Grenoble - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2.0 of the License, or - * (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.bonitasoft.studio.application.advisor; - -import org.bonitasoft.studio.application.BonitaStudioWorkbenchAdvisor; -import org.bonitasoft.studio.common.BonitaHomeUtil; -import org.bonitasoft.studio.common.jface.FileActionDialog; -import org.bonitasoft.studio.common.log.BonitaStudioLog; -import org.bonitasoft.studio.common.repository.core.job.WorkspaceInitializationJob; -import org.bonitasoft.studio.engine.BOSWebServerManager; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.jobs.Job; - -public abstract class InstallerApplicationWorkbenchAdvisor extends BonitaStudioWorkbenchAdvisor { - - protected static final String PRIORITY = "priority"; - - public InstallerApplicationWorkbenchAdvisor() { - FileActionDialog.setDisablePopup(true); //Do not aske to override existing files when importing a workspace - } - - @Override - public boolean openWindows() { - return true; //DO NOT OPEN WORKBENCH WINDOW - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.application.WorkbenchAdvisor#preStartup() - */ - @Override - public void preStartup() { - try { - final IProgressMonitor monitor = new NullProgressMonitor(); - disableGroovyDSL(); - doInitWorkspace(); - BOSWebServerManager.getInstance().copyTomcatBundleInWorkspace(monitor); - BonitaHomeUtil.initBonitaHome(); - } catch (final Exception e) { - BonitaStudioLog.error(e); - } - } - - @Override - public void postStartup() { - try { - Job.getJobManager().join(WorkspaceInitializationJob.WORKSPACE_INIT_FAMILY, new NullProgressMonitor()); - } catch (OperationCanceledException | InterruptedException e) { - BonitaStudioLog.error(e); - } - executePostStartupHandler(); - } - - protected abstract void executePostStartupHandler(); - - protected void closeAllProjects(final IProgressMonitor monitor, final IWorkspace workspace) { - for (final IProject project : workspace.getRoot().getProjects()) { - if (project.isOpen()) { - try { - project.close(monitor); - monitor.worked(1); - } catch (final CoreException e) { - BonitaStudioLog.error(e); - } - } - } - } -} diff --git a/bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/advisor/RecoverWorkspaceAdvisor.java b/bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/advisor/RecoverWorkspaceAdvisor.java deleted file mode 100644 index 7d046a1e04c7985e62f48abf23a364a3dd60fd4b..0000000000000000000000000000000000000000 --- a/bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/advisor/RecoverWorkspaceAdvisor.java +++ /dev/null @@ -1,98 +0,0 @@ -/** - * Copyright (C) 2014 Bonitasoft S.A. - * BonitaSoft, 32 rue Gustave Eiffel - 38000 Grenoble - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2.0 of the License, or - * (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.bonitasoft.studio.application.advisor; - -import static org.bonitasoft.studio.common.repository.Repository.NULL_PROGRESS_MONITOR; - -import java.io.File; - -import org.bonitasoft.studio.application.ApplicationPlugin; -import org.bonitasoft.studio.application.i18n.Messages; -import org.bonitasoft.studio.common.log.BonitaStudioLog; -import org.bonitasoft.studio.common.repository.RepositoryManager; -import org.bonitasoft.studio.common.repository.model.IRepository; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.PlatformUI; - - -public class RecoverWorkspaceAdvisor extends InstallerApplicationWorkbenchAdvisor { - - private String targetPath; - - /* - * (non-Javadoc) - * @see org.bonitasoft.studio.application.advisor.InstallerApplicationWorkbenchAdvisor#preStartup() - */ - @Override - public void preStartup() { - try { - ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - } catch (final CoreException e) { - BonitaStudioLog.error(e); - } - final IProject defaultDir = ResourcesPlugin.getWorkspace().getRoot().getProject("default"); - if (defaultDir != null && defaultDir.exists()) { - super.preStartup(); - } else { - if (defaultDir.getLocation() != null) { - MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.invalidWorkspaceTitle, - Messages.bind(Messages.invalidWorkspace, defaultDir.getLocation().toFile().getParentFile().getAbsolutePath())); - } else { - BonitaStudioLog.error("Invalid input workspace, default project not found.", ApplicationPlugin.PLUGIN_ID); - } - PlatformUI.getWorkbench().close(); - } - } - - /* - * (non-Javadoc) - * @see org.bonitasoft.studio.application.advisor.InstallerApplicationWorkbenchAdvisor#executePostStartupHandler() - */ - @Override - protected void executePostStartupHandler() { - for (final IRepository repo : RepositoryManager.getInstance().getAllRepositories()) { - if (!repo.isShared()) { - RepositoryManager.getInstance().setRepository(repo.getName(), false, NULL_PROGRESS_MONITOR); - RepositoryManager.getInstance().getRepository(repo.getName()).open(NULL_PROGRESS_MONITOR); - repo.exportToArchive(targetPath + File.separatorChar + repo.getName() + ".bos"); - RepositoryManager.getInstance().getCurrentRepository().close(); - } - } - RepositoryManager.getInstance().setRepository("default", NULL_PROGRESS_MONITOR); - } - - /* - * (non-Javadoc) - * @see org.bonitasoft.studio.application.advisor.InstallerApplicationWorkbenchAdvisor#postStartup() - */ - @Override - public void postStartup() { - final IProject defaultDir = ResourcesPlugin.getWorkspace().getRoot().getProject("default"); - if (defaultDir != null && defaultDir.exists()) { - super.postStartup(); - } - } - - public void setNewWorkspaceLocation(String newWorkspaceLocation) { - this.targetPath = newWorkspaceLocation; - } - -}