October 2012 - jbosstools-commits

JBoss Tools SVN: r44219 - trunk/build/target-platforms/jenkins.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-10-02 10:58:07 -0400 (Tue, 02 Oct 2012) New Revision: 44219 Modified: trunk/build/target-platforms/jenkins/pom.xml Log: JBIDE-12773: Fix God'damn file name! Modified: trunk/build/target-platforms/jenkins/pom.xml =================================================================== --- trunk/build/target-platforms/jenkins/pom.xml 2012-10-02 14:37:38 UTC (rev 44218) +++ trunk/build/target-platforms/jenkins/pom.xml 2012-10-02 14:58:07 UTC (rev 44219) @@ -58,7 +58,7 @@ <includes> <include>multiple.target</include> </includes> - <stylesheet>multiple2unified.xsl</stylesheet> + <stylesheet>multiple2jenkins.xsl</stylesheet> <outputDir>${project.build.directory}/${project.artifactId}</outputDir> <outputProperties> <outputPropertie>

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44218 - in trunk/maven/plugins/org.jboss.tools.maven.conversion.ui: META-INF and 8 other directories.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2012-10-02 10:37:38 -0400 (Tue, 02 Oct 2012) New Revision: 44218 Added: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/DependencyCollector.java trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/DependencyCollectorFactory.java trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/ProjectDependency.java trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/ComponentDependency.java trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/ComponentDependencyCollector.java trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/JavaDependency.java trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/JavaDependencyCollector.java Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/plugin.xml trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/ConvertToMavenDependencyWizard.java trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/DeleteExistingJarsJob.java trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/xpl/ConversionUtils.java trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/handlers/ConvertToMavenDependencyHandler.java trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ClasspathConversionParticipant.java trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentifyProjectJob.java Log: JBIDE-12527 : convert EAR references Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/META-INF/MANIFEST.MF 2012-10-02 14:17:39 UTC (rev 44217) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/META-INF/MANIFEST.MF 2012-10-02 14:37:38 UTC (rev 44218) @@ -14,7 +14,8 @@ org.eclipse.ui.ide;bundle-version="3.7.0", org.eclipse.m2e.core.ui;bundle-version="1.1.0", org.jboss.tools.maven.core;bundle-version="1.4.0", - org.jboss.tools.maven.ui;bundle-version="1.4.0" + org.jboss.tools.maven.ui;bundle-version="1.4.0", + org.eclipse.wst.common.emfworkbench.integration Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %BundleVendor Bundle-Localization: plugin Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/plugin.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/plugin.xml 2012-10-02 14:17:39 UTC (rev 44217) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/plugin.xml 2012-10-02 14:37:38 UTC (rev 44218) @@ -39,9 +39,16 @@ point="org.eclipse.m2e.core.projectConversionParticipants"> <projectConversionParticipant class="org.jboss.tools.maven.conversion.ui.internal.ClasspathConversionParticipant" - id="org.jboss.tools.maven.conversion.ui.internal.ClasspathConversionParticipant" + id="org.jboss.tools.maven.conversion.ui.ClasspathConversionParticipant" name="Classpath conversion participant" nature="org.eclipse.jdt.core.javanature"> </projectConversionParticipant> + <projectConversionParticipant + class="org.jboss.tools.maven.conversion.ui.internal.ClasspathConversionParticipant" + id="org.jboss.tools.maven.conversion.ui.ModuleConversionParticipant" + name="EAR conversion participant" + nature="org.eclipse.wst.common.modulecore.ModuleCoreNature"> + </projectConversionParticipant> </extension> + </plugin> Added: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/DependencyCollector.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/DependencyCollector.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/DependencyCollector.java 2012-10-02 14:37:38 UTC (rev 44218) @@ -0,0 +1,23 @@ +/************************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.maven.conversion.core; + +import java.util.List; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; + +public abstract class DependencyCollector { + + public abstract List<ProjectDependency> collectDependencies(IProject project) throws CoreException; + + public abstract boolean appliesTo(IProject project) throws CoreException; +} Added: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/DependencyCollectorFactory.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/DependencyCollectorFactory.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/DependencyCollectorFactory.java 2012-10-02 14:37:38 UTC (rev 44218) @@ -0,0 +1,45 @@ +/************************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.maven.conversion.core; + +import java.util.HashSet; +import java.util.Set; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.jboss.tools.maven.conversion.core.internal.ComponentDependencyCollector; +import org.jboss.tools.maven.conversion.core.internal.JavaDependencyCollector; + +public class DependencyCollectorFactory { + + public static DependencyCollectorFactory INSTANCE = new DependencyCollectorFactory(); + + Set<DependencyCollector> dependencyCollectors = new HashSet<DependencyCollector>(); + + private DependencyCollectorFactory() { + initDependencyCollectors(); + } + + private void initDependencyCollectors() { + dependencyCollectors.clear(); + dependencyCollectors.add(new JavaDependencyCollector()); + dependencyCollectors.add(new ComponentDependencyCollector()); + } + + public DependencyCollector getDependencyCollector(IProject project) throws CoreException { + for (DependencyCollector dc : dependencyCollectors) { + if (dc.appliesTo(project)) { + return dc; + } + } + return null; + } +} Added: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/ProjectDependency.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/ProjectDependency.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/ProjectDependency.java 2012-10-02 14:37:38 UTC (rev 44218) @@ -0,0 +1,40 @@ +/************************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.maven.conversion.core; + +import org.eclipse.core.runtime.IPath; + +public abstract class ProjectDependency { + + public enum DependencyKind { + Project, Archive, Unsupported; + } + + private DependencyKind dependencyKind; + + public DependencyKind getDependencyKind() { + if (dependencyKind == null) { + dependencyKind = DependencyKind.Unsupported; + } + return dependencyKind; + } + + public void setDependencyKind(DependencyKind dependencyKind) { + this.dependencyKind = dependencyKind; + } + + /** + * @return get full path of underlying archive or workspace path of underlying project + */ + public abstract IPath getPath(); + + +} Added: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/ComponentDependency.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/ComponentDependency.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/ComponentDependency.java 2012-10-02 14:37:38 UTC (rev 44218) @@ -0,0 +1,42 @@ +/************************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.maven.conversion.core.internal; + +import org.eclipse.core.runtime.IPath; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.jboss.tools.maven.conversion.core.ProjectDependency; + +public class ComponentDependency extends ProjectDependency { + + private IVirtualComponent component; + + public ComponentDependency(IVirtualComponent comp) { + super(); + component = comp; + if (comp.isBinary()) { + setDependencyKind(DependencyKind.Archive); + } else { + setDependencyKind(DependencyKind.Project); + } + } + + public IVirtualComponent getComponent() { + return component; + } + + @Override + public IPath getPath() { + if (component.isBinary()) { + return (IPath) component.getAdapter(IPath.class); + } + return component.getProject().getFullPath(); + } +} Added: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/ComponentDependencyCollector.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/ComponentDependencyCollector.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/ComponentDependencyCollector.java 2012-10-02 14:37:38 UTC (rev 44218) @@ -0,0 +1,65 @@ +/************************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.maven.conversion.core.internal; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.ModuleCoreNature; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualReference; +import org.jboss.tools.maven.conversion.core.DependencyCollector; +import org.jboss.tools.maven.conversion.core.ProjectDependency; + +/** + * Collects {@link ProjectDependency}'s from a non-java component project's references + * + * @author Fred Bricon + * + */ +public class ComponentDependencyCollector extends DependencyCollector { + + @Override + public List<ProjectDependency> collectDependencies(IProject project) throws CoreException { + if (!appliesTo(project)) { + return null; + } + List<ProjectDependency> moduleDependencies = new ArrayList<ProjectDependency>(); + collectReferences(project, moduleDependencies); + return moduleDependencies; + } + + private void collectReferences(IProject project, List<ProjectDependency> moduleDependencies) { + IVirtualComponent component = ComponentCore.createComponent(project, true); + if (component == null) { + return; + } + IVirtualReference[] references = component.getReferences(); + if (references == null || references.length == 0) { + return; + } + for (IVirtualReference r : references) { + moduleDependencies.add(new ComponentDependency(r.getReferencedComponent())); + } + } + + @Override + public boolean appliesTo(IProject project) throws CoreException { + return project != null && + ModuleCoreNature.isFlexibleProject(project) && + !project.hasNature(JavaCore.NATURE_ID); + } + +} Added: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/JavaDependency.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/JavaDependency.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/JavaDependency.java 2012-10-02 14:37:38 UTC (rev 44218) @@ -0,0 +1,44 @@ +/************************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.maven.conversion.core.internal; + +import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.IPath; +import org.eclipse.jdt.core.IClasspathEntry; +import org.jboss.tools.maven.conversion.core.ProjectDependency; + +public class JavaDependency extends ProjectDependency { + + private IClasspathEntry classpathEntry; + + public JavaDependency(IClasspathEntry cpe) { + super(); + Assert.isNotNull(cpe, "classpentry parameter can not be null"); + classpathEntry = cpe; + if (cpe.getEntryKind() == IClasspathEntry.CPE_PROJECT) { + setDependencyKind(DependencyKind.Project); + } else if (cpe.getEntryKind() == IClasspathEntry.CPE_LIBRARY) { + setDependencyKind(DependencyKind.Archive); + } else { + setDependencyKind(DependencyKind.Unsupported); + } + } + + public IClasspathEntry getClasspathEntry() { + return classpathEntry; + } + + @Override + public IPath getPath() { + return classpathEntry.getPath(); + } + +} Added: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/JavaDependencyCollector.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/JavaDependencyCollector.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/internal/JavaDependencyCollector.java 2012-10-02 14:37:38 UTC (rev 44218) @@ -0,0 +1,89 @@ +/************************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.maven.conversion.core.internal; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.IClasspathContainer; +import org.eclipse.jdt.core.IClasspathEntry; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.m2e.jdt.internal.MavenClasspathHelpers; +import org.jboss.tools.maven.conversion.core.DependencyCollector; +import org.jboss.tools.maven.conversion.core.ProjectDependency; + +/** + * Collects {@link ProjectDependency}'s from a java project's classpath entries + * + * @author Fred Bricon + * + */ +@SuppressWarnings("restriction") +public class JavaDependencyCollector extends DependencyCollector { + + @Override + public List<ProjectDependency> collectDependencies(IProject project) throws CoreException { + if (!appliesTo(project)) { + return null; + } + IJavaProject javaProject = JavaCore.create(project); + if (javaProject == null) { + return null; + } + IClasspathEntry[] classpath = javaProject.getRawClasspath(); + List<ProjectDependency> classpathDependencies = new ArrayList<ProjectDependency>(classpath.length); + extractDependencies(javaProject, classpath, classpathDependencies); + return classpathDependencies; + } + + private void extractDependencies(IJavaProject javaProject, IClasspathEntry[] classpath, + List<ProjectDependency> classpathDependencies) throws JavaModelException { + for (IClasspathEntry cpe : classpath) { + if (!isValid(cpe)) { + continue; + } + if (cpe.getEntryKind() == IClasspathEntry.CPE_CONTAINER) { + IClasspathContainer container = JavaCore.getClasspathContainer(cpe.getPath(), javaProject ); + if (container != null) { + IClasspathEntry[] cpes = container.getClasspathEntries(); + if (cpes != null && cpes.length > 0) { + extractDependencies(javaProject, cpes, classpathDependencies); + } + } + } else { + classpathDependencies.add(new JavaDependency(cpe)); + } + } + } + + @Override + public boolean appliesTo(IProject project) throws CoreException { + return project != null && project.hasNature(JavaCore.NATURE_ID); + } + + private boolean isValid(IClasspathEntry cpe) { + + if(IClasspathEntry.CPE_CONTAINER == cpe.getEntryKind() + && ("org.eclipse.jdt.launching.JRE_CONTAINER".equals(cpe.getPath().segment(0)) + || MavenClasspathHelpers.isMaven2ClasspathContainer(cpe.getPath()))) { + return false; + } + if (IClasspathEntry.CPE_SOURCE == cpe.getEntryKind()) { + return false; + } + return true; + } + +} Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/ConvertToMavenDependencyWizard.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/ConvertToMavenDependencyWizard.java 2012-10-02 14:17:39 UTC (rev 44217) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/ConvertToMavenDependencyWizard.java 2012-10-02 14:37:38 UTC (rev 44218) @@ -11,26 +11,31 @@ package org.jboss.tools.maven.conversion.ui.dialog; import java.util.List; -import java.util.Set; import org.apache.maven.model.Dependency; import org.eclipse.core.resources.IProject; -import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jface.wizard.Wizard; +import org.jboss.tools.maven.conversion.core.ProjectDependency; +/** + * Convert project dependencies to Maven dependencies wizard + * + * @author Fred Bricon + * + */ public class ConvertToMavenDependencyWizard extends Wizard { private IProject project; - private Set<IClasspathEntry> entries; + private List<ProjectDependency> entries; - IdentifyMavenDependencyPage identificationPage; + private List<Dependency> dependencies; - public ConvertToMavenDependencyWizard(IProject project, Set<IClasspathEntry> entries) { + public ConvertToMavenDependencyWizard(IProject project, List<ProjectDependency> projectDependencies) { this.project = project; - this.entries = entries; + this.entries = projectDependencies; String title = "Convert to Maven "; if (entries.size() > 1) { title += "Dependencies"; Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/DeleteExistingJarsJob.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/DeleteExistingJarsJob.java 2012-10-02 14:17:39 UTC (rev 44217) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/DeleteExistingJarsJob.java 2012-10-02 14:37:38 UTC (rev 44218) @@ -28,6 +28,7 @@ import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; +import org.jboss.tools.maven.conversion.core.ProjectDependency; import org.jboss.tools.maven.conversion.ui.dialog.xpl.ConversionUtils; import org.jboss.tools.maven.core.MavenCoreActivator; @@ -37,15 +38,22 @@ private IJavaProject javaProject; - public DeleteExistingJarsJob(IProject project, Set<IClasspathEntry> entries) { + public DeleteExistingJarsJob(IProject project, List<ProjectDependency> entries2) { super("Delete classpath entries" + ((project == null) ? "" : "for " + project.getName())); this.javaProject = JavaCore.create(project); - this.entries = entries; + this.entries = toClasspathEntries(entries2); } + private Set<IClasspathEntry> toClasspathEntries(List<ProjectDependency> entries2) { + return null; + } + @Override protected IStatus run(IProgressMonitor monitor) { + if (entries == null) { + return Status.OK_STATUS; + } Set<IPath> pathsToRemove = new HashSet<IPath>(); Set<IFile> filesToRemove = new HashSet<IFile>(); try { Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java 2012-10-02 14:17:39 UTC (rev 44217) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java 2012-10-02 14:37:38 UTC (rev 44218) @@ -17,7 +17,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.apache.maven.model.Dependency; @@ -28,10 +27,6 @@ import org.eclipse.core.runtime.jobs.IJobChangeEvent; import org.eclipse.core.runtime.jobs.IJobChangeListener; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jdt.core.IClasspathContainer; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.resource.JFaceResources; @@ -61,6 +56,8 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.dialogs.PreferencesUtil; +import org.jboss.tools.maven.conversion.core.ProjectDependency; +import org.jboss.tools.maven.conversion.core.ProjectDependency.DependencyKind; import org.jboss.tools.maven.conversion.ui.dialog.xpl.ConversionUtils; import org.jboss.tools.maven.conversion.ui.dialog.xpl.EditDependencyDialog; import org.jboss.tools.maven.conversion.ui.internal.CellListener; @@ -85,11 +82,11 @@ private static final int DEPENDENCY_COLUMN = 2; - private Map<IClasspathEntry, Dependency> dependencyMap; + private Map<ProjectDependency, Dependency> dependencyMap; - private Map<IClasspathEntry, IdentificationJob> identificationJobs; + private Map<ProjectDependency, IdentificationJob> identificationJobs; - private Set<IClasspathEntry> initialEntries; + private List<ProjectDependency> initialEntries; private Map<Dependency, Boolean> dependencyResolution = new ConcurrentHashMap<Dependency, Boolean>(); @@ -116,37 +113,20 @@ private Link warningLink; - private static String MESSAGE = "Identify existing classpath entries as Maven dependencies. Double-click on a Maven Dependency to edit its details"; + private static String MESSAGE = "Identify existing project references as Maven dependencies. Double-click on a Maven dependency to edit its details"; - public IdentifyMavenDependencyPage(IProject project, Set<IClasspathEntry> entries) { + public IdentifyMavenDependencyPage(IProject project, List<ProjectDependency> entries) { super(""); this.project = project; - initialEntries = Collections.unmodifiableSet(entries); + initialEntries = Collections.unmodifiableList(entries); initDependencyMap(); } private void initDependencyMap() { - dependencyMap = new LinkedHashMap<IClasspathEntry, Dependency>(initialEntries.size()); - IJavaProject javaProject = JavaCore.create(project); - try { - - for (IClasspathEntry entry : initialEntries) { - if ((entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY && entry.getPath() != null) - || (entry.getEntryKind() == IClasspathEntry.CPE_PROJECT)) { - dependencyMap.put(entry, null); - } else if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) { - IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), javaProject ); - if (container != null) { - for (IClasspathEntry cpe: container.getClasspathEntries()) { - dependencyMap.put(cpe, null); - } - } - } - } - - } catch(Exception e) { - setMessage(e.getLocalizedMessage()); + dependencyMap = new LinkedHashMap<ProjectDependency, Dependency>(initialEntries.size()); + for (ProjectDependency entry : initialEntries) { + dependencyMap.put(entry, null); } } @@ -230,7 +210,7 @@ } }); - deleteJarsBtn = addCheckButton(container, "Delete classpath entries from project", deleteJars); + deleteJarsBtn = addCheckButton(container, "Delete original references from project", deleteJars); deleteJarsBtn.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { deleteJars = deleteJarsBtn.getSelection(); @@ -272,20 +252,24 @@ emptyColumn.setWidth(20); TableViewerColumn sourceColumn = new TableViewerColumn(dependenciesViewer, SWT.NONE); - sourceColumn.getColumn().setText("Classpath Entry "); + sourceColumn.getColumn().setText("Project Reference"); sourceColumn.getColumn().setWidth(270); sourceColumn.setLabelProvider(new ColumnLabelProvider(){ @Override @SuppressWarnings("unchecked") public String getText(Object element) { - IClasspathEntry cpe = (IClasspathEntry) element; - return cpe.getPath().lastSegment(); + ProjectDependency projectDependency = (ProjectDependency) element; + return projectDependency.getPath().lastSegment(); } @Override public String getToolTipText(Object element) { + ProjectDependency projectDependency = (ProjectDependency) element; + if (projectDependency.getDependencyKind() == DependencyKind.Project) { + return ""; + } try { - return "SHA1 Checksum : "+IdentificationUtil.getSHA1(ConversionUtils.getFile(((IClasspathEntry) element))); + return "SHA1 Checksum : "+IdentificationUtil.getSHA1(ConversionUtils.getFile(projectDependency.getPath())); } catch (Exception e) { e.printStackTrace(); } @@ -295,9 +279,9 @@ @Override @SuppressWarnings("unchecked") public Image getImage(Object element) { - IClasspathEntry cpe = (IClasspathEntry) element; + ProjectDependency projectDependency = (ProjectDependency) element; Image img; - if (cpe.getEntryKind() == IClasspathEntry.CPE_LIBRARY) { + if (projectDependency.getDependencyKind() == ProjectDependency.DependencyKind.Archive) { img = jarImage; } else { img = projectImage; @@ -325,21 +309,21 @@ @Override protected void handle(int columnIndex, TableItem item) { if (columnIndex == DEPENDENCY_COLUMN) { - IClasspathEntry cpe = (IClasspathEntry) item.getData(); + ProjectDependency projectDep = (ProjectDependency) item.getData(); - IdentificationJob job = identificationJobs.get(cpe); + IdentificationJob job = identificationJobs.get(projectDep); if (Job.RUNNING == job.getState()) { return; } - Dependency d= dependencyMap.get(cpe); + Dependency d= dependencyMap.get(projectDep); EditDependencyDialog editDependencyDialog = new EditDependencyDialog(getShell()); editDependencyDialog.setDependency(d); if(editDependencyDialog.open() == Window.OK) { Dependency newDep = editDependencyDialog.getDependency(); - dependencyMap.put(cpe,newDep); + dependencyMap.put(projectDep,newDep); if (!eq(newDep,d)) { - resolve(cpe, newDep); + resolve(projectDep, newDep); } } } @@ -364,9 +348,9 @@ } - private void resolve(IClasspathEntry cpe, Dependency d) { + private void resolve(ProjectDependency projectDependency, Dependency d) { if (d != null) { - IdentificationJob job = identificationJobs.get(cpe); + IdentificationJob job = identificationJobs.get(projectDependency); job.setDependency(d); job.setRequestedProcess(Task.RESOLUTION_ONLY); job.schedule(); @@ -439,7 +423,7 @@ if (monitor == null) { monitor = new NullProgressMonitor(); } - for (Map.Entry<IClasspathEntry, Dependency> entry : dependencyMap.entrySet()) { + for (Map.Entry<ProjectDependency, Dependency> entry : dependencyMap.entrySet()) { if (entry.getValue() != null) { //don't need to run identification //continue; @@ -511,28 +495,28 @@ private void initJobs() { if (identificationJobs == null) { - identificationJobs = new HashMap<IClasspathEntry, IdentificationJob>(dependencyMap.size()); + identificationJobs = new HashMap<ProjectDependency, IdentificationJob>(dependencyMap.size()); Table t = dependenciesViewer.getTable(); IFileIdentificationManager fileIdentificationManager = new FileIdentificationManager(); for (final TableItem item : t.getItems()) { - final IClasspathEntry cpe = (IClasspathEntry)item.getData(); - Dependency dep = dependencyMap.get(cpe); - if (dep != null) { + final ProjectDependency projectDep = (ProjectDependency)item.getData(); + Dependency mavenDep = dependencyMap.get(projectDep); + if (mavenDep != null) { //already identified continue; } File jar; try { final IdentificationJob job; - if (cpe.getEntryKind() == IClasspathEntry.CPE_PROJECT) { - job = new IdentifyProjectJob("Search the Maven coordinates for "+cpe.getPath(), cpe.getPath()); - } else if (cpe.getEntryKind() == IClasspathEntry.CPE_LIBRARY) { - jar = ConversionUtils.getFile(cpe); + if (projectDep.getDependencyKind() == ProjectDependency.DependencyKind.Project) { + job = new IdentifyProjectJob("Search the Maven coordinates for "+projectDep.getPath(), projectDep.getPath()); + } else if (projectDep.getDependencyKind() == ProjectDependency.DependencyKind.Archive) { + jar = ConversionUtils.getFile(projectDep.getPath()); job = new IdentifyJarJob("Search the Maven coordinates for "+jar.getAbsolutePath(), fileIdentificationManager, jar); } else { - job = new DependencyResolutionJob("Resolve the Maven dependency for "+cpe.getPath()); + job = new DependencyResolutionJob("Resolve the Maven dependency for "+projectDep.getPath()); } job.addJobChangeListener(new IJobChangeListener() { @@ -555,7 +539,7 @@ @Override public void done(IJobChangeEvent event) { Dependency d = job.getDependency(); - dependencyMap.put(cpe, d); + dependencyMap.put(projectDep, d); if (d != null) { dependencyResolution.put(d, job.isResolvable()); } @@ -576,12 +560,12 @@ Display.getDefault().syncExec(new Runnable() { @Override public void run() { - refresh(cpe); + refresh(projectDep); } }); } }); - identificationJobs.put(cpe, job); + identificationJobs.put(projectDep, job); } catch (CoreException e) { e.printStackTrace(); } @@ -589,7 +573,7 @@ } } - private synchronized void refresh(IClasspathEntry key) { + private synchronized void refresh(ProjectDependency key) { if (dependenciesViewer == null || dependenciesViewer.getTable().isDisposed()) { return; } @@ -597,14 +581,14 @@ try { for (TableItem item : dependenciesViewer.getTable().getItems()) { @SuppressWarnings("unchecked") - final IClasspathEntry cpe = (IClasspathEntry)item.getData(); - if (cpe.equals(key)) { - dependenciesViewer.refresh(cpe, false); + final ProjectDependency projectDep = (ProjectDependency)item.getData(); + if (projectDep.equals(key)) { + dependenciesViewer.refresh(projectDep, false); //Don't force check when there's an existing dependency, only uncheck if they're is not. - if (dependencyMap.get(cpe) == null) { - Job job = identificationJobs.get(cpe); + if (dependencyMap.get(projectDep) == null) { + Job job = identificationJobs.get(projectDep); if (job != null && job.getState() == Job.NONE) { - dependenciesViewer.setChecked(cpe, false); + dependenciesViewer.setChecked(projectDep, false); } } setPageComplete(hasNoRunningJobs()); @@ -624,8 +608,8 @@ Object[] selection = dependenciesViewer.getCheckedElements(); List<Dependency> dependencies = new ArrayList<Dependency>(selection.length); for (Object o : selection) { - IClasspathEntry cpe = (IClasspathEntry) o; - Dependency d = dependencyMap.get(cpe); + ProjectDependency projectDep = (ProjectDependency) o; + Dependency d = dependencyMap.get(projectDep); if (d != null) { dependencies.add(d); } @@ -649,23 +633,23 @@ @Override @SuppressWarnings("unchecked") public String getText(Object element) { - IClasspathEntry cpe = (IClasspathEntry) element; - IdentificationJob job = identificationJobs ==null? null:identificationJobs.get(cpe); + ProjectDependency projectDep = (ProjectDependency) element; + IdentificationJob job = identificationJobs ==null? null:identificationJobs.get(projectDep); if (job != null) { int jobState = job.getState(); if (jobState == Job.RUNNING || jobState == Job.WAITING) { return "Identification in progress..."; } } - Dependency d = dependencyMap.get(cpe); + Dependency d = dependencyMap.get(projectDep); return IdentifyMavenDependencyPage.toString(d); } @Override @SuppressWarnings("unchecked") public Image getImage(Object element) { - IClasspathEntry cpe = (IClasspathEntry) element; - IdentificationJob job = identificationJobs ==null? null:identificationJobs.get(cpe); + ProjectDependency projectDep = (ProjectDependency) element; + IdentificationJob job = identificationJobs ==null? null:identificationJobs.get(projectDep); if (job != null) { int jobState = job.getState(); if (jobState == Job.RUNNING || jobState == Job.WAITING) { @@ -673,7 +657,7 @@ } } - Dependency d = dependencyMap.get(cpe); + Dependency d = dependencyMap.get(projectDep); if (d == null) { return failedImage; Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/xpl/ConversionUtils.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/xpl/ConversionUtils.java 2012-10-02 14:17:39 UTC (rev 44217) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/xpl/ConversionUtils.java 2012-10-02 14:37:38 UTC (rev 44218) @@ -48,6 +48,11 @@ public static File getFile(IClasspathEntry cpe) throws CoreException { Assert.isNotNull(cpe, "ClasspathEntry can not be null"); IPath path = cpe.getPath(); + return getFile(path); + } + + public static File getFile(IPath path) throws CoreException { + Assert.isNotNull(path, "path can not be null"); IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); IResource file = root.findMember(path); File localFile = null; @@ -65,7 +70,7 @@ localFile= path.toFile(); } return localFile; - } + } public static IFile getIFile(IClasspathEntry cpe) throws CoreException { Assert.isNotNull(cpe, "ClasspathEntry can not be null"); Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/handlers/ConvertToMavenDependencyHandler.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/handlers/ConvertToMavenDependencyHandler.java 2012-10-02 14:17:39 UTC (rev 44217) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/handlers/ConvertToMavenDependencyHandler.java 2012-10-02 14:37:38 UTC (rev 44218) @@ -49,34 +49,19 @@ Set<IClasspathEntry> entries = getSelectedClasspathEntries(selection); - //System.err.println(entries); - if (entries == null || entries.isEmpty()) { MessageDialogWithToggle.openInformation(window.getShell(), "Convert to Maven Dependency", "Nothing to convert"); return null; } - /* - IPath path = libraryFromUI.getClasspathEntry().getPath(); - - IJavaProject javaProject = libraryFromUI.getJavaProject(); - - final String libName = libraryFromUI.getLabel(); - */ - /* - IClasspathContainer containerToMaterialize = JavaCore.getClasspathContainer(path, javaProject); - - IProject project = javaProject.getProject(); - - */ - ConvertToMavenDependencyWizard wizard = new ConvertToMavenDependencyWizard( - null, //project, - entries - ); - - WizardDialog dialog = new WizardDialog(window.getShell(), wizard); - dialog.open(); - return null; + ConvertToMavenDependencyWizard wizard = new ConvertToMavenDependencyWizard( + null, //project, + null + ); + + WizardDialog dialog = new WizardDialog(window.getShell(), wizard); + dialog.open(); + return null; } Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ClasspathConversionParticipant.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ClasspathConversionParticipant.java 2012-10-02 14:17:39 UTC (rev 44217) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ClasspathConversionParticipant.java 2012-10-02 14:37:38 UTC (rev 44218) @@ -10,28 +10,22 @@ ************************************************************************************/ package org.jboss.tools.maven.conversion.ui.internal; -import java.util.Collection; -import java.util.LinkedHashSet; import java.util.List; -import java.util.Set; import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jdt.core.IClasspathContainer; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.m2e.core.project.conversion.AbstractProjectConversionParticipant; -import org.eclipse.m2e.jdt.internal.MavenClasspathHelpers; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; +import org.jboss.tools.maven.conversion.core.DependencyCollector; +import org.jboss.tools.maven.conversion.core.DependencyCollectorFactory; +import org.jboss.tools.maven.conversion.core.ProjectDependency; import org.jboss.tools.maven.conversion.ui.dialog.ConvertToMavenDependencyWizard; public class ClasspathConversionParticipant extends @@ -39,28 +33,23 @@ @Override public boolean accept(IProject project) throws CoreException { - return project.hasNature(JavaCore.NATURE_ID); + return getDependencyCollector(project) != null; } + private DependencyCollector getDependencyCollector(IProject project) throws CoreException { + return DependencyCollectorFactory.INSTANCE.getDependencyCollector(project); + } + @Override public void convert(final IProject project, final Model model, final IProgressMonitor monitor) throws CoreException { - if (accept(project)) { - - IJavaProject javaProject = JavaCore.create(project); - IClasspathEntry[] classpath = javaProject.getRawClasspath(); - Set<IClasspathEntry> entries = new LinkedHashSet<IClasspathEntry>(classpath.length); - for (IClasspathEntry cpe : classpath) { - if (isValid(cpe)) { - entries.add(cpe); - } - } - - if (!hasDependencies(javaProject, entries)) { + DependencyCollector dependencyCollector = getDependencyCollector(project); + if (dependencyCollector != null) { + List<ProjectDependency> entries = dependencyCollector.collectDependencies(project); + if (entries == null || entries.isEmpty()) { return; } - final ConvertToMavenDependencyWizard conversionWizard = new ConvertToMavenDependencyWizard(project, entries); Display.getDefault().syncExec(new Runnable() { @@ -80,35 +69,4 @@ } } - private boolean hasDependencies(IJavaProject javaProject, Collection<IClasspathEntry> initialEntries) throws JavaModelException { - for (IClasspathEntry entry : initialEntries) { - if ((entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY && entry.getPath() != null) - || (entry.getEntryKind() == IClasspathEntry.CPE_PROJECT)) { - return true; - } else if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) { - IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), javaProject ); - if (container != null) { - IClasspathEntry[] cpes = container.getClasspathEntries(); - if (cpes != null && cpes.length > 0) { - return true; - } - } - } - } - return false; - } - - private boolean isValid(IClasspathEntry cpe) { - - if(IClasspathEntry.CPE_CONTAINER == cpe.getEntryKind() - && ("org.eclipse.jdt.launching.JRE_CONTAINER".equals(cpe.getPath().segment(0)) - || MavenClasspathHelpers.isMaven2ClasspathContainer(cpe.getPath()))) { - return false; - } - if (IClasspathEntry.CPE_SOURCE == cpe.getEntryKind()) { - return false; - } - return true; - } - } Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentifyProjectJob.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentifyProjectJob.java 2012-10-02 14:17:39 UTC (rev 44217) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/IdentifyProjectJob.java 2012-10-02 14:37:38 UTC (rev 44218) @@ -47,13 +47,6 @@ if (a.getArtifactHandler() != null && a.getArtifactHandler().getPackaging() != null) { String type = a.getArtifactHandler().getPackaging(); - //case where classpath dependency is a war : it usually corresponds to - //a jar of the war classes, having the "classes" classifier. - if ("war".equals(type)) { - type = "jar"; - dependency.setClassifier("classes"); - } - dependency.setType(type); } }

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44217 - trunk/build/publish.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-10-02 10:17:39 -0400 (Tue, 02 Oct 2012) New Revision: 44217 Modified: trunk/build/publish/publish.sh Log: calculate BUILD_ALIAS from parent pom version as recorded in the build log so we can use trunk version of this script in stable branch; also switch from Hxxx to Bxxx as build number suffix Modified: trunk/build/publish/publish.sh =================================================================== --- trunk/build/publish/publish.sh 2012-10-02 14:11:52 UTC (rev 44216) +++ trunk/build/publish/publish.sh 2012-10-02 14:17:39 UTC (rev 44217) @@ -2,7 +2,7 @@ # Hudson script used to publish Tycho-built p2 update sites # NOTE: sources MUST be checked out into ${WORKSPACE}/sources -# to use timestamp when naming dirs instead of ${BUILD_ID}-H${BUILD_NUMBER}, use: +# to use timestamp when naming dirs instead of ${BUILD_ID}-B${BUILD_NUMBER}, use: # BUILD_ID=2010-08-31_19-16-10; timestamp=$(echo $BUILD_ID | tr -d "_-"); timestamp=${timestamp:0:12}; echo $timestamp; # 201008311916 #set up tmpdir @@ -20,7 +20,7 @@ # releases get named differently than snapshots if [[ ${RELEASE} == "Yes" ]]; then - ZIPSUFFIX="${BUILD_ID}-H${BUILD_NUMBER}" + ZIPSUFFIX="${BUILD_ID}-B${BUILD_NUMBER}" else ZIPSUFFIX="SNAPSHOT" fi @@ -75,6 +75,9 @@ bl=${STAGINGDIR}/logs/BUILDLOG.txt rm -f ${bl}; wget -q http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl} --timeout=900 --wait=10 --random-wait --tries=10 --retry-connrefused --no-check-certificate +# calculate BUILD_ALIAS from parent pom version as recorded in the build log, eg., from org/jboss/tools/parent/4.0.0.Alpha2-SNAPSHOT get Alpha2 +BUILD_ALIAS=$(cat ${bl} | grep "org/jboss/tools/parent/" | head -1 | sed -e "s#.\+org/jboss/tools/parent/$.\+$/$maven-metadata.xml\|parent.\+$#\1#" | sed -e "s#-SNAPSHOT##" | sed -e "s#[0-9].[0-9].[0-9].##") + # JBDS-1361 - fetch XML and then sed it into plain text wgetParams="--timeout=900 --wait=10 --random-wait --tries=30 --retry-connrefused --no-check-certificate --server-response" rl=${STAGINGDIR}/logs/REVISION @@ -97,10 +100,11 @@ echo "UNKNOWN REVISION(S)" > ${rl}.txt fi -METAFILE="${BUILD_ID}-H${BUILD_NUMBER}.txt" +METAFILE="${BUILD_ID}-B${BUILD_NUMBER}.txt" touch ${STAGINGDIR}/logs/${METAFILE} METAFILE=build.properties +echo "BUILD_ALIAS = ${BUILD_ALIAS}" >> ${STAGINGDIR}/logs/${METAFILE} echo "JOB_NAME = ${JOB_NAME}" >> ${STAGINGDIR}/logs/${METAFILE} echo "BUILD_NUMBER = ${BUILD_NUMBER}" >> ${STAGINGDIR}/logs/${METAFILE} echo "BUILD_ID = ${BUILD_ID}" >> ${STAGINGDIR}/logs/${METAFILE} @@ -279,7 +283,7 @@ export JAVA_HOME=$(find /qa/tools/opt -maxdepth 1 -mindepth 1 -type d -name "jdk1.6.0_*" | sort | tail -1) export M2_HOME=$(find /qa/tools/opt -maxdepth 1 -mindepth 1 -type d -name "apache-maven-3.0.*" | sort | tail -1) - ${M2_HOME}/bin/mvn -q -B install -DJOB_NAME=${JOB_NAME} -DBUILD_NUMBER=${BUILD_NUMBER} -DBUILD_ID=${BUILD_ID} + ${M2_HOME}/bin/mvn -q -B install -DJOB_NAME=${JOB_NAME} -DBUILD_NUMBER=${BUILD_NUMBER} -DBUILD_ID=${BUILD_ID} -DBUILD_ALIAS=${BUILD_ALIAS} mv target/index.html ${STAGINGDIR}/index.html; rm -fr target popd >/dev/null fi @@ -319,7 +323,7 @@ # if an aggregate build, put output elsewhere on disk if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then - echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > $tmpdir/latestBuild.html + echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-B${BUILD_NUMBER}/\">" > $tmpdir/latestBuild.html if [[ ${PUBLISHPATHSUFFIX} ]]; then date # create folders if not already there @@ -328,17 +332,17 @@ else mkdir -p $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX} fi - date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/ + date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-B${BUILD_NUMBER}/ # sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead - # echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${PUBLISHPATHSUFFIX}/ - pushd $tmpdir >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null + # echo -e "rm latest\nln ${BUILD_ID}-B${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${PUBLISHPATHSUFFIX}/ + pushd $tmpdir >/dev/null; ln -s ${BUILD_ID}-B${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null date; rsync -arzq --protocol=28 --delete $tmpdir/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/ else date; rsync -arzq --protocol=28 --delete $tmpdir/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/ # sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead - # echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${JOBNAMEREDUX}/ - pushd $tmpdir >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/; rm -f latest; popd >/dev/null - date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/ + # echo -e "rm latest\nln ${BUILD_ID}-B${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${JOBNAMEREDUX}/ + pushd $tmpdir >/dev/null; ln -s ${BUILD_ID}-B${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/; rm -f latest; popd >/dev/null + date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-B${BUILD_NUMBER}/ fi rm -f $tmpdir/latestBuild.html #else

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44216 - trunk/tests/scripts/installation-updates/src/main/groovy.

by jbosstools-commits＠lists.jboss.org

Author: psrna Date: 2012-10-02 10:11:52 -0400 (Tue, 02 Oct 2012) New Revision: 44216 Modified: trunk/tests/scripts/installation-updates/src/main/groovy/getAndInstallEclipse.groovy Log: * fixed unzip new File(".") Modified: trunk/tests/scripts/installation-updates/src/main/groovy/getAndInstallEclipse.groovy =================================================================== --- trunk/tests/scripts/installation-updates/src/main/groovy/getAndInstallEclipse.groovy 2012-10-02 13:47:56 UTC (rev 44215) +++ trunk/tests/scripts/installation-updates/src/main/groovy/getAndInstallEclipse.groovy 2012-10-02 14:11:52 UTC (rev 44216) @@ -45,7 +45,7 @@ if (fileExtension.equals("zip")) { new AntBuilder().unzip( src: cachedFile.getAbsolutePath(), - dest: new File().getAbsolutePath()); + dest: new File(".").getAbsolutePath()); } else if (fileExtension.equals("tar.gz")) { File tarFile = new File(eclipseCacheDirectory, cachedFile.getName()[0..- (".gz".length() + 1)]); if (!tarFile.isFile()) {

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44215 - in trunk/build/target-platforms: jbds and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-10-02 09:47:56 -0400 (Tue, 02 Oct 2012) New Revision: 44215 Added: trunk/build/target-platforms/jbds/jenkins/ trunk/build/target-platforms/jbds/jenkins/multiple2unified.xsl trunk/build/target-platforms/jbds/jenkins/pom.xml trunk/build/target-platforms/jenkins/ trunk/build/target-platforms/jenkins/multiple2jenkins.xsl trunk/build/target-platforms/jenkins/pom.xml Log: JBIDE-12773: Jenkins target-platfoms (same as unified, but using local FS URL) Added: trunk/build/target-platforms/jbds/jenkins/multiple2unified.xsl =================================================================== --- trunk/build/target-platforms/jbds/jenkins/multiple2unified.xsl (rev 0) +++ trunk/build/target-platforms/jbds/jenkins/multiple2unified.xsl 2012-10-02 13:47:56 UTC (rev 44215) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" + version="2.0"> + + <xsl:output method="xml" encoding="UTF-8" indent="yes"/> + <xsl:param name="destinationUrl"/> + + <xsl:template match="target"> + <target includeMode="feature" name="e42-wtp34-jbds6"> + <locations> + <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true"> + <repository location="{$destinationUrl}"/> + <xsl:apply-templates select="//unit" /> + </location> + </locations> + <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + </target> + </xsl:template> + + <xsl:template match="//unit"> + <xsl:copy-of select="."/> + </xsl:template> +</xsl:stylesheet> Property changes on: trunk/build/target-platforms/jbds/jenkins/multiple2unified.xsl ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/build/target-platforms/jbds/jenkins/pom.xml =================================================================== --- trunk/build/target-platforms/jbds/jenkins/pom.xml (rev 0) +++ trunk/build/target-platforms/jbds/jenkins/pom.xml 2012-10-02 13:47:56 UTC (rev 44215) @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>target-platforms</artifactId> + <version>4.0.0.Beta1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.target-platforms</groupId> + <artifactId>jbds-jenkins</artifactId> + <name>JBDS Unified (Aggregated) target platform for Jenkins</name> + <packaging>pom</packaging> + + <properties> + <unified.URL>file:///home/hudson/static_build_env/jbds/jbds-target-platform_4.0.juno.SR0/jbds600-e421-wtp341.target/</unified.URL> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.5.1</version> + <executions> + <execution> + <id>get-multiple-target</id> + <phase>generate-resources</phase> + <goals> + <goal>get</goal> + </goals> + <configuration> + <groupId>${project.groupId}</groupId> + <artifactId>jbds-multiple</artifactId> + <version>${project.version}</version> + <packaging>target</packaging> + <classifier>jbds-multiple</classifier> + <destination>${project.build.directory}/jbds-multiple.target</destination> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>xml-maven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <id>generate-unified.target</id> + <phase>generate-resources</phase>  + <goals> + <goal>transform</goal> + </goals> + <configuration> + <transformationSets> + <transformationSet> + <dir>${project.build.directory}</dir> + <includes> + <include>jbds-multiple.target</include> + </includes> + <stylesheet>multiple2unified.xsl</stylesheet> + <outputDir>${project.build.directory}/${project.artifactId}</outputDir> + <outputProperties> + <outputPropertie> + <name>indent</name> + <value>yes</value> + </outputPropertie> + </outputProperties> + <parameters> + <parameter> + <name>destinationUrl</name> + <value>${unified.URL}</value> + </parameter> + </parameters> + </transformationSet> + </transformationSets> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>target-platform-validation-plugin</artifactId> + <version>${tychoExtrasVersion}</version> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>validate-target-platform</goal> + </goals> + <configuration> + <targetFiles> + <param>${project.build.directory}/${project.artifactId}/jbds-multiple.target</param> + </targetFiles> + <failOnError>true</failOnError> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${project.build.directory}/${project.artifactId}/jbds-multiple.target</file> + <type>target</type> + <classifier>${project.artifactId}</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Property changes on: trunk/build/target-platforms/jbds/jenkins/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/build/target-platforms/jenkins/multiple2jenkins.xsl =================================================================== --- trunk/build/target-platforms/jenkins/multiple2jenkins.xsl (rev 0) +++ trunk/build/target-platforms/jenkins/multiple2jenkins.xsl 2012-10-02 13:47:56 UTC (rev 44215) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" + version="2.0"> + + <xsl:output method="xml" encoding="UTF-8" indent="yes"/> + <xsl:param name="destinationUrl"/> + + <xsl:template match="target"> + <target includeMode="feature" name="e42-wtp34-jbds6"> + <locations> + <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true"> + <repository location="{$destinationUrl}"/> + <xsl:apply-templates select="//unit" /> + </location> + </locations> + <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + </target> + </xsl:template> + + <xsl:template match="//unit"> + <xsl:copy-of select="."/> + </xsl:template> +</xsl:stylesheet> Property changes on: trunk/build/target-platforms/jenkins/multiple2jenkins.xsl ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/build/target-platforms/jenkins/pom.xml =================================================================== --- trunk/build/target-platforms/jenkins/pom.xml (rev 0) +++ trunk/build/target-platforms/jenkins/pom.xml 2012-10-02 13:47:56 UTC (rev 44215) @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>target-platforms</artifactId> + <version>4.0.0.Beta1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.target-platforms</groupId> + <artifactId>jenkins</artifactId> + <name>Unified (Aggregated) target platform for Jenkins</name> + <packaging>pom</packaging> + + <properties> + <unified.URL>file:///home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR1/e421-wtp341.target/</unified.URL> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.5.1</version> + <executions> + <execution> + <id>get-multiple-target</id> + <phase>generate-resources</phase> + <goals> + <goal>get</goal> + </goals> + <configuration> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + <packaging>target</packaging> + <classifier>multiple</classifier> + <destination>${project.build.directory}/multiple.target</destination> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>xml-maven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <id>generate-unified.target</id> + <phase>generate-resources</phase>  + <goals> + <goal>transform</goal> + </goals> + <configuration> + <transformationSets> + <transformationSet> + <dir>${project.build.directory}</dir> + <includes> + <include>multiple.target</include> + </includes> + <stylesheet>multiple2unified.xsl</stylesheet> + <outputDir>${project.build.directory}/${project.artifactId}</outputDir> + <outputProperties> + <outputPropertie> + <name>indent</name> + <value>yes</value> + </outputPropertie> + </outputProperties> + <parameters> + <parameter> + <name>destinationUrl</name> + <value>${unified.URL}</value> + </parameter> + </parameters> + </transformationSet> + </transformationSets> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>target-platform-validation-plugin</artifactId> + <version>${tychoExtrasVersion}</version> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>validate-target-platform</goal> + </goals> + <configuration> + <targetFiles> + <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + </targetFiles> + <failOnError>true</failOnError> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <type>target</type> + <classifier>${project.artifactId}</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Property changes on: trunk/build/target-platforms/jenkins/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/plain

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44214 - branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2012-10-02 08:50:36 -0400 (Tue, 02 Oct 2012) New Revision: 44214 Modified: branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF Log: [JBIDE-12772] opened version range for required jgit plugin (was: [1.1.0, 2.1.0), now:1.1.0) to allow installation on juno sr1 Modified: branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-10-02 12:25:19 UTC (rev 44213) +++ branches/jbosstools-4.0.0.Alpha2/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-10-02 12:50:36 UTC (rev 44214) @@ -11,7 +11,7 @@ org.jboss.ide.eclipse.as.ui;bundle-version="[2.3.0,3.0.0)", org.eclipse.egit.ui;bundle-version="1.1.0", org.eclipse.egit.core;bundle-version="1.1.0", - org.eclipse.jgit;bundle-version="[1.1.0,2.1.0)", + org.eclipse.jgit;bundle-version="1.1.0", com.jcraft.jsch;bundle-version="0.1.44", org.eclipse.jsch.core;bundle-version="[1.1.300,2.0.0)", org.jboss.ide.eclipse.as.core;bundle-version="2.3.0",

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44213 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: rest and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-10-02 08:25:19 -0400 (Tue, 02 Oct 2012) New Revision: 44213 Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationValidationTest.java Removed: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationPathAnnotationTest.java Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulHelper.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java Log: new tests implemented + useful method added into test base class Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-10-02 12:21:06 UTC (rev 44212) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-10-02 12:25:19 UTC (rev 44213) @@ -20,7 +20,7 @@ import org.jboss.tools.ws.ui.bot.test.rest.QueryAnnotationSupportTest; import org.jboss.tools.ws.ui.bot.test.rest.completion.RESTfulCompletionTest; import org.jboss.tools.ws.ui.bot.test.rest.explorer.RESTfulExplorerTest; -import org.jboss.tools.ws.ui.bot.test.rest.validation.ApplicationPathAnnotationTest; +import org.jboss.tools.ws.ui.bot.test.rest.validation.ApplicationValidationTest; import org.jboss.tools.ws.ui.bot.test.rest.validation.JaxRsValidatorTest; import org.jboss.tools.ws.ui.bot.test.rest.validation.RESTfulValidationTest; import org.jboss.tools.ws.ui.bot.test.sample.test.SampleRESTWebServiceTest; @@ -58,7 +58,7 @@ JAXRSToolingIntegrationTest.class, SOAPWSToolingIntegrationTest.class, // WSTesterPromptValuesSupportTest.class, // not implemented yet - ApplicationPathAnnotationTest.class, + ApplicationValidationTest.class, JaxRsValidatorTest.class, HTTPMethodAnnotationQuickFixTest.class, BottomUpWSTest.class, Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulHelper.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulHelper.java 2012-10-02 12:21:06 UTC (rev 44212) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulHelper.java 2012-10-02 12:25:19 UTC (rev 44213) @@ -50,12 +50,12 @@ ENABLE, DISABLE; } - private SWTBotTreeItem[] getRESTValidationErrors(String wsProjectName, String description) { + public SWTBotTreeItem[] getRESTValidationErrors(String wsProjectName, String description) { return ProblemsView.getFilteredErrorsTreeItems(bot, description, "/" + wsProjectName, null, "JAX-RS Problem"); } - private SWTBotTreeItem[] getRESTValidationWarnings(String wsProjectName, + public SWTBotTreeItem[] getRESTValidationWarnings(String wsProjectName, String description) { return ProblemsView.getFilteredWarningsTreeItems(bot, description, "/" + wsProjectName, null, "JAX-RS Problem"); @@ -65,10 +65,6 @@ return getRESTValidationErrors(wsProjectName, PATH_PARAM_VALID_ERROR); } - public SWTBotTreeItem[] getApplicationAnnotationValidationWarnings(String wsProjectName) { - return getRESTValidationWarnings(wsProjectName, null); - } - public void enableRESTValidation() { modifyRESTValidation(ConfigureOption.ENABLE); } Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-10-02 12:21:06 UTC (rev 44212) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-10-02 12:25:19 UTC (rev 44213) @@ -153,10 +153,16 @@ protected void assertCountOfApplicationAnnotationValidationWarnings(String projectName, int expectedCount) { - int foundWarnings = restfulHelper.getApplicationAnnotationValidationWarnings(projectName).length; - assertCountOfValidationError(expectedCount, foundWarnings); + int foundProblems = restfulHelper.getRESTValidationWarnings(projectName, null).length; + assertCountOfValidationError(expectedCount, foundProblems); } + protected void assertCountOfApplicationAnnotationValidationErrors(String projectName, + int expectedCount) { + int foundProblems = restfulHelper.getRESTValidationErrors(projectName, null).length; + assertCountOfValidationError(expectedCount, foundProblems); + } + private void assertCountOfValidationError(int expectedCount, int foundCount) { assertTrue("Expected count of validation errors: " + expectedCount + ". Count of found validation errors: " + foundCount, Deleted: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationPathAnnotationTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationPathAnnotationTest.java 2012-10-02 12:21:06 UTC (rev 44212) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationPathAnnotationTest.java 2012-10-02 12:25:19 UTC (rev 44213) @@ -1,79 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010-2012 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.ws.ui.bot.test.rest.validation; - -import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; -import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; -import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase; -import org.junit.Before; -import org.junit.Test; - -/** - * - * @author jjankovi - * - */ -public class ApplicationPathAnnotationTest extends RESTfulTestBase { - - - @Before - public void setup() { - - } - - @Test - public void testMultipleApplicationClasses() { - - /* prepare project */ - importRestWSProject("app1"); - - /* workaround for JBIDE-12690 - jbide12680Workaround("app1", "src", "test", "App.java"); */ - - /* test validation error */ - assertCountOfApplicationAnnotationValidationWarnings("app1", 2); - } - - @Test - public void testWebXmlAndApplicationClassWithWarning() { - - /* prepare project */ - importRestWSProject("app2"); - - /* workaround for JBIDE-12690 - jbide12680Workaround("app2", "src", "test", "App.java"); */ - - /* test validation error */ - assertCountOfApplicationAnnotationValidationWarnings("app2", 2); - } - - @Test - public void testWebXmlAndApplicationClassWithoutWarning() { - - /* prepare project */ - importRestWSProject("app3"); - - /* workaround for JBIDE-12690 - jbide12680Workaround("app3", "src", "test", "App.java"); */ - - /* test validation error */ - assertCountOfApplicationAnnotationValidationWarnings("app3", 0); - } - - private void jbide12680Workaround(String projectName, String... path) { - SWTBotEditor editor = packageExplorer.openFile(projectName, path); - SWTBotEclipseEditor eclipseEditor = editor.toTextEditor(); - eclipseEditor.insertText(" "); - eclipseEditor.save(); - } - -} Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationValidationTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationValidationTest.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationValidationTest.java 2012-10-02 12:25:19 UTC (rev 44213) @@ -0,0 +1,119 @@ +/******************************************************************************* + * Copyright (c) 2010-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.ws.ui.bot.test.rest.validation; + +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; +import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase; +import org.junit.Before; +import org.junit.Test; + +/** + * + * @author jjankovi + * + */ +public class ApplicationValidationTest extends RESTfulTestBase { + + + @Before + public void setup() { + + } + + @Test + public void testMultipleApplicationClasses() { + + /* prepare project */ + importRestWSProject("app1"); + + /* workaround for JBIDE-12690 */ + jbide12680Workaround("app1", "src", "test", "App.java"); + + /* test validation error */ + assertCountOfApplicationAnnotationValidationWarnings("app1", 2); + } + + @Test + public void testWebXmlAndApplicationClassWithWarning() { + + /* prepare project */ + importRestWSProject("app2"); + + /* workaround for JBIDE-12690 */ + jbide12680Workaround("app2", "src", "test", "App.java"); + + /* test validation error */ + assertCountOfApplicationAnnotationValidationWarnings("app2", 2); + } + + @Test + public void testWebXmlAndApplicationClassWithoutWarning() { + + /* prepare project */ + importRestWSProject("app3"); + + /* workaround for JBIDE-12690 */ + jbide12680Workaround("app3", "src", "test", "App.java"); + + /* test validation error */ + assertCountOfApplicationAnnotationValidationWarnings("app3", 0); + } + + @Test + public void testNotExtendingApplicationClass() { + + /* prepare project */ + importRestWSProject("app4"); + + /* workaround for JBIDE-12690 */ + jbide12680Workaround("app4", "src", "test", "App.java"); + + /* test validation error */ + assertCountOfApplicationAnnotationValidationErrors("app4", 1); + + /* fix class - should be no error */ + resourceHelper.replaceInEditor(editorForClass("app4", "src", + "test", "App.java").toTextEditor(), "@ApplicationPath(\"/rest\")", "", true); + + /* test validation error */ + assertCountOfApplicationAnnotationValidationErrors("app4", 0); + } + + @Test + public void testApplicationClassWithoutPath() { + + /* prepare project */ + importRestWSProject("app5"); + + /* workaround for JBIDE-12690 */ + jbide12680Workaround("app5", "src", "test", "App.java"); + + /* test validation error */ + assertCountOfApplicationAnnotationValidationErrors("app5", 1); + + /* fix class - should be no error */ + resourceHelper.replaceInEditor(editorForClass("app5", "src", + "test", "App.java").toTextEditor(), "extends Application", "", true); + + /* test validation error */ + assertCountOfApplicationAnnotationValidationErrors("app5", 0); + } + + private void jbide12680Workaround(String projectName, String... path) { + SWTBotEditor editor = packageExplorer.openFile(projectName, path); + SWTBotEclipseEditor eclipseEditor = editor.toTextEditor(); + eclipseEditor.insertText(" "); + eclipseEditor.save(); + } + +}

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44212 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects: app2/src/test and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-10-02 08:21:06 -0400 (Tue, 02 Oct 2012) New Revision: 44212 Removed: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test/RestService.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app2/src/test/RestService.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/RestService.java Log: delete needless classes from test projects Deleted: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test/RestService.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test/RestService.java 2012-10-02 12:19:50 UTC (rev 44211) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test/RestService.java 2012-10-02 12:21:06 UTC (rev 44212) @@ -1,14 +0,0 @@ -package test; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; - -@Path("/rest") -public class RestService { - - @GET - public void method() { - - } - -} Deleted: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app2/src/test/RestService.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app2/src/test/RestService.java 2012-10-02 12:19:50 UTC (rev 44211) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app2/src/test/RestService.java 2012-10-02 12:21:06 UTC (rev 44212) @@ -1,14 +0,0 @@ -package test; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; - -@Path("/rest") -public class RestService { - - @GET - public void method() { - - } - -} Deleted: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/RestService.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/RestService.java 2012-10-02 12:19:50 UTC (rev 44211) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/RestService.java 2012-10-02 12:21:06 UTC (rev 44212) @@ -1,14 +0,0 @@ -package test; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; - -@Path("/rest") -public class RestService { - - @GET - public void method() { - - } - -}

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44211 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects: app1/src/test and 23 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-10-02 08:19:50 -0400 (Tue, 02 Oct 2012) New Revision: 44211 Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.classpath trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.project trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/.jsdtscope trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.jdt.core.prefs trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.wst.common.component trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/WebContent/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/WebContent/META-INF/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/WebContent/META-INF/MANIFEST.MF trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/WebContent/WEB-INF/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/WebContent/WEB-INF/lib/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/build/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/src/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/src/test/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/src/test/App.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.classpath trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.project trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/.jsdtscope trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.jdt.core.prefs trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.wst.common.component trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/WebContent/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/WebContent/META-INF/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/WebContent/META-INF/MANIFEST.MF trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/WebContent/WEB-INF/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/WebContent/WEB-INF/lib/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/build/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/src/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/src/test/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/src/test/App.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.classpath trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.project trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/.jsdtscope trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.jdt.core.prefs trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.wst.common.component trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/WebContent/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/WebContent/META-INF/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/WebContent/META-INF/MANIFEST.MF trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/WebContent/WEB-INF/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/WebContent/WEB-INF/lib/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/WebContent/WEB-INF/web.xml trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/build/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/src/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/src/test/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/src/test/App.java Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test/App.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test/App2.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app2/src/test/App.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/App.java Log: new test project added Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test/App.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test/App.java 2012-10-02 12:19:17 UTC (rev 44210) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test/App.java 2012-10-02 12:19:50 UTC (rev 44211) @@ -1,19 +1,9 @@ package test; -import java.util.HashSet; -import java.util.Set; - import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; @ApplicationPath("/path") public class App extends Application { - - @Override - public Set<Class<?>> getClasses() { - Set<Class<?>> classes = new HashSet<Class<?>>(); - classes.add(RestService.class); - return super.getClasses(); - } } Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test/App2.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test/App2.java 2012-10-02 12:19:17 UTC (rev 44210) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test/App2.java 2012-10-02 12:19:50 UTC (rev 44211) @@ -1,19 +1,9 @@ package test; -import java.util.HashSet; -import java.util.Set; - import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; @ApplicationPath("/path2") public class App2 extends Application { - - @Override - public Set<Class<?>> getClasses() { - Set<Class<?>> classes = new HashSet<Class<?>>(); - classes.add(RestService.class); - return super.getClasses(); - } } Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app2/src/test/App.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app2/src/test/App.java 2012-10-02 12:19:17 UTC (rev 44210) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app2/src/test/App.java 2012-10-02 12:19:50 UTC (rev 44211) @@ -1,19 +1,9 @@ package test; -import java.util.HashSet; -import java.util.Set; - import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; @ApplicationPath("/path") public class App extends Application { - - @Override - public Set<Class<?>> getClasses() { - Set<Class<?>> classes = new HashSet<Class<?>>(); - classes.add(RestService.class); - return super.getClasses(); - } -} \ No newline at end of file +} Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/App.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/App.java 2012-10-02 12:19:17 UTC (rev 44210) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/App.java 2012-10-02 12:19:50 UTC (rev 44211) @@ -1,18 +1,7 @@ package test; -import java.util.HashSet; -import java.util.Set; - -import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; public class App extends Application { - - @Override - public Set<Class<?>> getClasses() { - Set<Class<?>> classes = new HashSet<Class<?>>(); - classes.add(RestService.class); - return super.getClasses(); - } } Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.classpath =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.classpath ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.project =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.project ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/.jsdtscope =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/.jsdtscope ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.jdt.core.prefs 2012-10-02 12:19:50 UTC (rev 44211) @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.wst.common.component =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.wst.common.component ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-10-02 12:19:50 UTC (rev 44211) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-10-02 12:19:50 UTC (rev 44211) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/WebContent/META-INF/MANIFEST.MF 2012-10-02 12:19:50 UTC (rev 44211) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/src/test/App.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/src/test/App.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app4/src/test/App.java 2012-10-02 12:19:50 UTC (rev 44211) @@ -0,0 +1,9 @@ +package test; + +import javax.ws.rs.ApplicationPath; + +@ApplicationPath("/rest") +public class App { + + +} Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.classpath =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.classpath ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.project =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.project ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/.jsdtscope =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/.jsdtscope ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.jdt.core.prefs 2012-10-02 12:19:50 UTC (rev 44211) @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.wst.common.component =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.wst.common.component ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-10-02 12:19:50 UTC (rev 44211) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-10-02 12:19:50 UTC (rev 44211) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/WebContent/META-INF/MANIFEST.MF 2012-10-02 12:19:50 UTC (rev 44211) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/src/test/App.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/src/test/App.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app5/src/test/App.java 2012-10-02 12:19:50 UTC (rev 44211) @@ -0,0 +1,8 @@ +package test; + +import javax.ws.rs.core.Application; + +public class App extends Application { + + +} Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.classpath =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.classpath ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.project =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.project ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/.jsdtscope =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/.jsdtscope ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.jdt.core.prefs 2012-10-02 12:19:50 UTC (rev 44211) @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.wst.common.component =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.wst.common.component ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-10-02 12:19:50 UTC (rev 44211) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-10-02 12:19:50 UTC (rev 44211) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/WebContent/META-INF/MANIFEST.MF 2012-10-02 12:19:50 UTC (rev 44211) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/WebContent/WEB-INF/web.xml =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/WebContent/WEB-INF/web.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/src/test/App.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/src/test/App.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app6/src/test/App.java 2012-10-02 12:19:50 UTC (rev 44211) @@ -0,0 +1,7 @@ +package test; + +import javax.ws.rs.core.Application; + +public class App extends Application { + +}

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44210 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2012-10-02 08:19:17 -0400 (Tue, 02 Oct 2012) New Revision: 44210 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF Log: [JBIDE-12772] opened version range for required jgit plugin (was: [1.1.0, 2.1.0), now:1.1.0) to allow installation on juno sr1 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-10-02 10:21:11 UTC (rev 44209) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-10-02 12:19:17 UTC (rev 44210) @@ -11,7 +11,7 @@ org.jboss.ide.eclipse.as.ui;bundle-version="[2.3.0,3.0.0)", org.eclipse.egit.ui;bundle-version="1.1.0", org.eclipse.egit.core;bundle-version="1.1.0", - org.eclipse.jgit;bundle-version="[1.1.0,2.1.0)", + org.eclipse.jgit;bundle-version="1.1.0", com.jcraft.jsch;bundle-version="0.1.44", org.eclipse.jsch.core;bundle-version="[1.1.300,2.0.0)", org.jboss.ide.eclipse.as.core;bundle-version="2.3.0",

12 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2012