Skip to content
Snippets Groups Projects
Commit e244b7d2 authored by Alvaro Fides's avatar Alvaro Fides
Browse files

Updated to use Eclipse 3.7 integrated maven Plugin

parent a987dec4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
wizard/org.universaal.tool.wizardfeature/feature.xml
+ 44
− 37
View file @ e244b7d2
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.universaal.tools.newwizard.feature"
label="AAL Studio Project Wizards"
version="0.5.1"
provider-name="universAAL"
plugin="org.universaal.tools.aalstudio.core">
<description url="http://www.universaal.org/">
The AAL Studio project and item wizards make it easy to create new universAAL-compliant projects by providing a skeleton project with all the files you need and initial content to make the project work in universAAL. The item wizards generate new files required or optional to a universAAL project with the proper formatting and template or initial content.
</description>
<copyright url="http://www.tsb.upv.es/">
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.universaal.tools.newwizard.feature"
label="AAL Studio Project Wizards"
version="0.5.1"
provider-name="universAAL"
plugin="org.universaal.tools.aalstudio.core">
<description url="http://www.universaal.org/">
The AAL Studio project and item wizards make it easy to create new universAAL-compliant projects by providing a skeleton project with all the files you need and initial content to make the project work in universAAL. The item wizards generate new files required or optional to a universAAL project with the proper formatting and template or initial content.
</description>
<copyright url="http://www.tsb.upv.es/">
Copyright 2011 ITACA-TSB, http://www.tsb.upv.es
Instituto Tecnologico de Aplicaciones de Comunicacion
Avanzadas - Grupo Tecnologias para la Salud y el
......@@ -26,10 +26,10 @@
distributed under the License is distributed on an &quot;AS IS&quot; 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.
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0">
limitations under the License.
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0">
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
......@@ -230,23 +230,30 @@
distributed under the License is distributed on an &quot;AS IS&quot; 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.
</license>
<url>
<update url="http://depot.universaal.org/eclipse-update/"/>
</url>
<requires>
<import feature="org.maven.ide.eclipse.feature" version="0.12.0" match="greaterOrEqual"/>
<import feature="org.universaal.tools.aalstudio.feature" version="0.3.0"/>
</requires>
<plugin
id="org.universaal.tools.newwizard.plugin"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>
limitations under the License.
</license>
<url>
<update url="http://depot.universaal.org/eclipse-update/"/>
</url>
<requires>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.core.resources" version="3.5.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.ui" version="3.5.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.m2e.core" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.m2e.core.ui" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.m2e.maven.runtime"/>
<import plugin="org.eclipse.jdt.core"/>
<import feature="org.universaal.tools.aalstudio.feature" version="0.3.0"/>
</requires>
<plugin
id="org.universaal.tools.newwizard.plugin"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>
wizard/org.universaal.tools.wizardplugin/.settings/org.eclipse.jdt.core.prefs
+ 6
− 6
View file @ e244b7d2
#Tue Apr 19 16:17:12 CEST 2011
#Fri Jul 15 13:55:01 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
org.eclipse.jdt.core.compiler.source=1.3
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
wizard/org.universaal.tools.wizardplugin/META-INF/MANIFEST.MF
+ 3
− 2
View file @ e244b7d2
......@@ -8,8 +8,9 @@ Bundle-Vendor: universAAL ITACA-TSB UPV
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.resources;bundle-version="3.5.1",
org.maven.ide.eclipse;bundle-version="0.9.0",
org.eclipse.jdt.ui;bundle-version="3.5.2"
org.eclipse.jdt.ui;bundle-version="3.5.2",
org.eclipse.m2e.core;bundle-version="1.0.0",
org.eclipse.m2e.core.ui;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Bundle-ActivationPolicy: lazy
Import-Package: org.apache.maven.model,
......
wizard/org.universaal.tools.wizardplugin/src/org/universaal/tools/newwizard/plugin/wizards/NewProjectWizard.java
+ 12
− 10
View file @ e244b7d2
......@@ -12,6 +12,10 @@ import org.eclipse.core.runtime.*;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection; //import org.eclipse.core.resources.*;
import org.eclipse.m2e.core.MavenPlugin;
import org.eclipse.m2e.core.internal.IMavenConstants;
import org.eclipse.m2e.core.ui.internal.actions.OpenMavenConsoleAction;
import org.eclipse.m2e.core.project.ProjectImportConfiguration;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.Job;
......@@ -22,10 +26,6 @@ import java.io.*;
import org.eclipse.ui.*;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.ui.progress.IProgressConstants;
import org.maven.ide.eclipse.MavenPlugin;
import org.maven.ide.eclipse.actions.OpenMavenConsoleAction;
import org.maven.ide.eclipse.core.IMavenConstants;
import org.maven.ide.eclipse.project.ProjectImportConfiguration;
import org.universaal.tools.newwizard.plugin.Activator;
/**
......@@ -100,8 +100,9 @@ public class NewProjectWizard extends Wizard implements INewWizard {
// I use deprecated methods because I havent found the new way to
// create a new project
// TODO: Use the latest methods
final String projectName = configuration.getProjectName(model);
// TODO: Use the latest methods -> Latest version of Maven plugin keeps
// using them!
// final String projectName = configuration.getProjectName(model);
IStatus nameStatus = configuration.validateProjectName(model);
if (!nameStatus.isOK()) {
MessageDialog.openError(getShell(),
......@@ -129,7 +130,6 @@ public class NewProjectWizard extends Wizard implements INewWizard {
}
final Job job, job2;
final MavenPlugin plugin = MavenPlugin.getDefault();
// This job creates a blank maven project with the POM as defined in the
// wizard
......@@ -140,7 +140,7 @@ public class NewProjectWizard extends Wizard implements INewWizard {
try {
// Here we use the maven plugin to create and shape the
// project
plugin.getProjectConfigurationManager()
MavenPlugin.getProjectConfigurationManager()
.createSimpleProject(project, location, model,
getFolders(), //
configuration, monitor);
......@@ -231,6 +231,8 @@ public class NewProjectWizard extends Wizard implements INewWizard {
// here...
System.out.println(">>>>>>>>>>>>>>NO POM!!!!!!!!!"); //$NON-NLS-1$
}
//This is like refreshing, because we changed the pom
MavenPlugin.getProjectConfigurationManager().updateProjectConfiguration(project, monitor);
return Status.OK_STATUS;
} catch (CoreException e) {
return e.getStatus();
......@@ -281,7 +283,7 @@ public class NewProjectWizard extends Wizard implements INewWizard {
IResourceChangeEvent.POST_CHANGE);
try {
// Execute the first job (create maven)
job.setRule(plugin.getProjectConfigurationManager().getRule());
job.setRule(MavenPlugin.getProjectConfigurationManager().getRule());
job.schedule();
// MNGECLIPSE-766 wait until new project is created
......@@ -294,7 +296,7 @@ public class NewProjectWizard extends Wizard implements INewWizard {
}
}
// Execute the second job (modify to uaal)
job2.setRule(plugin.getProjectConfigurationManager().getRule());
// job2.setRule(MavenPlugin.getProjectConfigurationManager().getRule());
job2.schedule();
// MNGECLIPSE-766 wait until new project is created
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment