October 2012 - jbosstools-commits

JBoss Tools SVN: r44310 - in trunk/jsf/tests: org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-10-04 15:00:25 -0400 (Thu, 04 Oct 2012) New Revision: 44310 Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/EntityHome.java trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/EntityManager.java trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/Home.java trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/Person.java trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/PersonHome.java trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/paramValidation.xhtml trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ParameterizedClassValidationTest.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java Log: https://issues.jboss.org/browse/JBIDE-12778 EL completition doesn't understand Seam EntityHome<E> anymore Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/EntityHome.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/EntityHome.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/EntityHome.java 2012-10-04 19:00:25 UTC (rev 44310) @@ -0,0 +1,15 @@ +package demo.param; + +public class EntityHome<E> extends Home<EntityManager, E> { + + public boolean isManaged() { + return true; + } + + public E find() { + return getInstance(); + } + + public void create() { + } +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/EntityHome.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/EntityManager.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/EntityManager.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/EntityManager.java 2012-10-04 19:00:25 UTC (rev 44310) @@ -0,0 +1,5 @@ +package demo.param; + +public class EntityManager { + +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/EntityManager.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/Home.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/Home.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/Home.java 2012-10-04 19:00:25 UTC (rev 44310) @@ -0,0 +1,22 @@ +package demo.param; + +public abstract class Home<T, E> { + + protected E instance; + + public E getInstance() { + return instance; + } + + public void setInstance(E instance) { + this.instance = instance; + } + + public String getId() { + return null; + } + + public String getVersion() { + return ""; + } +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/Home.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/Person.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/Person.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/Person.java 2012-10-04 19:00:25 UTC (rev 44310) @@ -0,0 +1,24 @@ +package demo.param; + + +public class Person { + + private Long id; + private String name; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/Person.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/PersonHome.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/PersonHome.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/PersonHome.java 2012-10-04 19:00:25 UTC (rev 44310) @@ -0,0 +1,12 @@ +package demo.param; + +import javax.faces.bean.ManagedBean; + +@ManagedBean +public class PersonHome extends EntityHome<Person> { + + @Override + public String getId() { + return super.getId(); + } +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/JavaSource/demo/param/PersonHome.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/paramValidation.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/paramValidation.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/jsf2pr/WebContent/paramValidation.xhtml 2012-10-04 19:00:25 UTC (rev 44310) @@ -0,0 +1,15 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html"> + + <h:outputText value="#{personHome.instance.name}" /> + <h:outputText value="#{personHome.instance.broken}" /> + <h:outputText value="#{personHome.broken}" /> + <h:outputText value="#{personHome.create()}" /> + <h:outputText value="#{personHome.find().id}" /> + <h:outputText value="#{personHome.find().broken}" /> + <h:outputText value="#{personHome.managed}" /> + <h:outputText value="#{personHome.id}" /> + <h:outputText value="#{personHome.version}" /> +</html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2012-10-04 18:41:31 UTC (rev 44309) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2012-10-04 19:00:25 UTC (rev 44310) @@ -29,6 +29,7 @@ import org.jboss.tools.jsf.test.validation.FacesConfigValidatorTest; import org.jboss.tools.jsf.test.validation.JSF2ComponentsInClassFolderTest; import org.jboss.tools.jsf.test.validation.JSF2ComponentsValidatorTest; +import org.jboss.tools.jsf.test.validation.ParameterizedClassValidationTest; import org.jboss.tools.jsf.test.validation.VarAttributesTest; import org.jboss.tools.jsf.test.validation.WTPValidationTest; import org.jboss.tools.jsf.test.validation.WebContentTest; @@ -105,6 +106,7 @@ XHTMLDetectorAndValidatorTest.class, BuilderValidationTest.class, VarAttributesTest.class, + ParameterizedClassValidationTest.class, WTPValidationTest.class ),"org.jboss.tools.jsf.base.test","projects/jsf2pr","jsf2pr")); Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ParameterizedClassValidationTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ParameterizedClassValidationTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ParameterizedClassValidationTest.java 2012-10-04 19:00:25 UTC (rev 44310) @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (c) 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.jsf.test.validation; + +import java.text.MessageFormat; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.jboss.tools.jst.web.kb.internal.validation.ELValidationMessages; +import org.jboss.tools.test.util.ProjectImportTestSetup; +import org.jboss.tools.tests.AbstractResourceMarkerTest; + +/** + * @author Alexey Kazakov + */ +public class ParameterizedClassValidationTest extends TestCase { + + IProject project; + IFile xhtml; + String messageBroken = MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new Object[]{"broken"}); + String[] messagesOk = new String[] {MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new Object[]{"personHome"}), + MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new Object[]{"instance"}), + MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new Object[]{"name"}), + MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new Object[]{"create"}), + MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new Object[]{"find"}), + MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new Object[]{"id"}), + MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new Object[]{"managed"}), + MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new Object[]{"version"})}; + + @Override + protected void setUp() throws Exception { + project = ProjectImportTestSetup.loadProject("jsf2pr"); + xhtml = project.getFile("WebContent/paramValidation.xhtml"); + } + + public void testBroken() throws Exception { + AbstractResourceMarkerTest.assertMarkerIsCreated(xhtml, messageBroken, 7, 8, 11); + } + + public void testOk() throws Exception { + for (String message : messagesOk) { + for(int i = 6; i<15; i++) { + AbstractResourceMarkerTest.assertMarkerIsNotCreated(xhtml, message, i); + } + } + } +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ParameterizedClassValidationTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44309 - in trunk/build/target-platforms: jbdevstudio-JunoSR1/local and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-10-04 14:41:31 -0400 (Thu, 04 Oct 2012) New Revision: 44309 Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml Log: Ultimate fix on the dependency plugin. Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml 2012-10-04 18:23:35 UTC (rev 44308) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml 2012-10-04 18:41:31 UTC (rev 44309) @@ -104,7 +104,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> + <version>2.5.1</version> <executions> <execution> <id>get-multiple</id> @@ -113,13 +113,12 @@ </goals> <phase>package</phase> <configuration> - <artifact> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <classifier>multiple</classifier> - <type>target</type> - </artifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + <classifier>multiple</classifier> + <packaging>target</packaging> + <destination>${project.build.directory}/multiple.target</destination> </configuration> </execution> </executions> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml 2012-10-04 18:23:35 UTC (rev 44308) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml 2012-10-04 18:41:31 UTC (rev 44309) @@ -104,7 +104,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> + <version>2.5.1</version> <executions> <execution> <id>get-multiple</id> @@ -113,13 +113,12 @@ </goals> <phase>package</phase> <configuration> - <artifact> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <classifier>multiple</classifier> - <type>target</type> - </artifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + <classifier>multiple</classifier> + <packaging>target</packaging> + <destination>${project.build.directory}/multiple.target</destination> </configuration> </execution> </executions> Modified: trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml 2012-10-04 18:23:35 UTC (rev 44308) +++ trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml 2012-10-04 18:41:31 UTC (rev 44309) @@ -104,7 +104,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> + <version>2.5.1</version> <executions> <execution> <id>get-multiple</id> @@ -113,13 +113,12 @@ </goals> <phase>package</phase> <configuration> - <artifact> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <classifier>multiple</classifier> - <type>target</type> - </artifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + <classifier>multiple</classifier> + <packaging>target</packaging> + <destination>${project.build.directory}/multiple.target</destination> </configuration> </execution> </executions> Modified: trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml 2012-10-04 18:23:35 UTC (rev 44308) +++ trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml 2012-10-04 18:41:31 UTC (rev 44309) @@ -104,7 +104,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> + <version>2.5.1</version> <executions> <execution> <id>get-multiple</id> @@ -113,13 +113,12 @@ </goals> <phase>package</phase> <configuration> - <artifact> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <classifier>multiple</classifier> - <type>target</type> - </artifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + <classifier>multiple</classifier> + <packaging>target</packaging> + <destination>${project.build.directory}/multiple.target</destination> </configuration> </execution> </executions>

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44308 - in trunk/build/target-platforms: jbdevstudio-JunoSR1/local and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-10-04 14:23:35 -0400 (Thu, 04 Oct 2012) New Revision: 44308 Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml Log: Copy-paste typo... Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml 2012-10-04 18:19:19 UTC (rev 44307) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml 2012-10-04 18:23:35 UTC (rev 44308) @@ -118,7 +118,7 @@ <artifactId>multiple</artifactId> <version>${project.version}</version> <classifier>multiple</classifier> - <<type>target</type> + <type>target</type> </artifact> </configuration> </execution> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml 2012-10-04 18:19:19 UTC (rev 44307) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml 2012-10-04 18:23:35 UTC (rev 44308) @@ -118,7 +118,7 @@ <artifactId>multiple</artifactId> <version>${project.version}</version> <classifier>multiple</classifier> - <<type>target</type> + <type>target</type> </artifact> </configuration> </execution> Modified: trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml 2012-10-04 18:19:19 UTC (rev 44307) +++ trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml 2012-10-04 18:23:35 UTC (rev 44308) @@ -118,7 +118,7 @@ <artifactId>multiple</artifactId> <version>${project.version}</version> <classifier>multiple</classifier> - <<type>target</type> + <type>target</type> </artifact> </configuration> </execution> Modified: trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml 2012-10-04 18:19:19 UTC (rev 44307) +++ trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml 2012-10-04 18:23:35 UTC (rev 44308) @@ -118,7 +118,7 @@ <artifactId>multiple</artifactId> <version>${project.version}</version> <classifier>multiple</classifier> - <<type>target</type> + <type>target</type> </artifact> </configuration> </execution>

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44307 - in trunk/build/target-platforms: jbdevstudio-JunoSR1/local and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-10-04 14:19:19 -0400 (Thu, 04 Oct 2012) New Revision: 44307 Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml Log: Re-added dependency plugin Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml 2012-10-04 18:19:19 UTC (rev 44307) @@ -102,6 +102,29 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <id>get-multiple</id> + <goals> + <goal>get</goal> + </goals> + <phase>package</phase> + <configuration> + <artifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + <classifier>multiple</classifier> + <<type>target</type> + </artifact> + </configuration> + </execution> + </executions> + </plugin> + <plugin>  <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml 2012-10-04 18:19:19 UTC (rev 44307) @@ -102,6 +102,29 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <id>get-multiple</id> + <goals> + <goal>get</goal> + </goals> + <phase>package</phase> + <configuration> + <artifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + <classifier>multiple</classifier> + <<type>target</type> + </artifact> + </configuration> + </execution> + </executions> + </plugin> + <plugin>  <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> Modified: trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) +++ trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml 2012-10-04 18:19:19 UTC (rev 44307) @@ -102,6 +102,29 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <id>get-multiple</id> + <goals> + <goal>get</goal> + </goals> + <phase>package</phase> + <configuration> + <artifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + <classifier>multiple</classifier> + <<type>target</type> + </artifact> + </configuration> + </execution> + </executions> + </plugin> + <plugin>  <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> Modified: trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) +++ trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml 2012-10-04 18:19:19 UTC (rev 44307) @@ -102,6 +102,29 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <id>get-multiple</id> + <goals> + <goal>get</goal> + </goals> + <phase>package</phase> + <configuration> + <artifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + <classifier>multiple</classifier> + <<type>target</type> + </artifact> + </configuration> + </execution> + </executions> + </plugin> + <plugin>  <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId>

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44306 - in trunk/build/target-platforms: jbdevstudio-JunoSR0b/local and 11 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-10-04 14:11:04 -0400 (Thu, 04 Oct 2012) New Revision: 44306 Removed: trunk/build/target-platforms/scripts/multiple2other.xsl Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/jenkins/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR0b/unified/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR1/jenkins/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR1/unified/pom.xml trunk/build/target-platforms/jbosstools-JunoSR0b/jenkins/pom.xml trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml trunk/build/target-platforms/jbosstools-JunoSR0b/unified/pom.xml trunk/build/target-platforms/jbosstools-JunoSR1/jenkins/pom.xml trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml trunk/build/target-platforms/jbosstools-JunoSR1/unified/pom.xml Log: JBIDE-12773: Use new target-platform-utils plugin to "flatten" targets from multiple Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/jenkins/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0b/jenkins/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0b/jenkins/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -12,73 +12,31 @@ <name>jbdevstudio-JunoSR0b Unified (Aggregate) Target Platform for Jenkins</name> <packaging>pom</packaging> - <properties> - <unified.URL>file:///home/hudson/static_build_env/jbds/jbds-target-platform_4.0.juno.SR0b/jbds600-e420-wtp340.target/</unified.URL> - </properties> - <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</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> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>file:///home/hudson/static_build_env/jbds/jbds-target-platform_4.0.juno.SR0b/jbds600-e420-wtp340.target/</targetRepositoryUrl> </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>../../scripts/multiple2other.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> @@ -90,7 +48,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -111,7 +69,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -27,66 +27,28 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</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> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>file://${repoDir}</targetRepositoryUrl> </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>../../scripts/multiple2other.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>file://${repoDir}</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> @@ -98,7 +60,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -119,7 +81,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/unified/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0b/unified/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0b/unified/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -12,73 +12,31 @@ <name>jbdevstudio-JunoSR0b Unified (Aggregate) Target Platform</name> <packaging>pom</packaging> - <properties> - <unified.URL>http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform_4.0.ju...</unified.URL> - </properties> - <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</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> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform_4.0.ju...</targetRepositoryUrl> </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>../../scripts/multiple2other.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> @@ -90,7 +48,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -111,7 +69,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR1/jenkins/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1/jenkins/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1/jenkins/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -12,73 +12,31 @@ <name>jbdevstudio-JunoSR1 Unified (Aggregate) Target Platform for Jenkins</name> <packaging>pom</packaging> - <properties> - <unified.URL>file:///home/hudson/static_build_env/jbds/jbds-target-platform_4.0.juno.SR1/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> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</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> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>file:///home/hudson/static_build_env/jbds/jbds-target-platform_4.0.juno.SR1/jbds600-e421-wtp341.target/</targetRepositoryUrl> </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>../../scripts/multiple2other.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> @@ -90,7 +48,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -111,7 +69,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -27,66 +27,28 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</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> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>file://${repoDir}</targetRepositoryUrl> </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>../../scripts/multiple2other.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>file://${repoDir}</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> @@ -98,7 +60,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -119,7 +81,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR1/unified/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1/unified/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1/unified/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -12,73 +12,31 @@ <name>jbdevstudio-JunoSR1 Unified (Aggregate) Target Platform</name> <packaging>pom</packaging> - <properties> - <unified.URL>http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform_4.0.ju...</unified.URL> - </properties> - <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</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> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform_4.0.ju...</targetRepositoryUrl> </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>../../scripts/multiple2other.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> @@ -90,7 +48,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -111,7 +69,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbosstools-JunoSR0b/jenkins/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0b/jenkins/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbosstools-JunoSR0b/jenkins/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -12,73 +12,31 @@ <name>jbosstools-JunoSR0b Unified (Aggregate) Target Platform for Jenkins</name> <packaging>pom</packaging> - <properties> - <unified.URL>file:///home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR0b/e420-wtp340.target/</unified.URL> - </properties> - <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</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> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>file:///home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR0b/e420-wtp340.target/</targetRepositoryUrl> </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>../../scripts/multiple2other.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> @@ -90,7 +48,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -111,7 +69,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -27,66 +27,28 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</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> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>file://${repoDir}</targetRepositoryUrl> </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>../../scripts/multiple2other.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>file://${repoDir}</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> @@ -98,7 +60,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -119,7 +81,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbosstools-JunoSR0b/unified/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0b/unified/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbosstools-JunoSR0b/unified/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -12,73 +12,31 @@ <name>jbosstools-JunoSR0b Unified (Aggregate) Target Platform</name> <packaging>pom</packaging> - <properties> - <unified.URL>http://download.jboss.org/jbosstools/updates/juno/SR0b/latest/</unified.URL> - </properties> - <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</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> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>http://download.jboss.org/jbosstools/updates/juno/SR0b/latest/</targetRepositoryUrl> </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>../../scripts/multiple2other.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> @@ -90,7 +48,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -111,7 +69,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbosstools-JunoSR1/jenkins/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1/jenkins/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbosstools-JunoSR1/jenkins/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -12,73 +12,31 @@ <name>jbosstools-JunoSR1 Unified (Aggregate) 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> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</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> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>file:///home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR1/e421-wtp341.target/</targetRepositoryUrl> </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>../../scripts/multiple2other.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> @@ -90,7 +48,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -111,7 +69,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -27,66 +27,28 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</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> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>file://${repoDir}</targetRepositoryUrl> </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>../../scripts/multiple2other.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>file://${repoDir}</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> @@ -98,7 +60,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -119,7 +81,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbosstools-JunoSR1/unified/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1/unified/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbosstools-JunoSR1/unified/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -12,73 +12,31 @@ <name>jbosstools-JunoSR1 Unified (Aggregate) Target Platform</name> <packaging>pom</packaging> - <properties> - <unified.URL>http://download.jboss.org/jbosstools/updates/juno/SR1/latest/</unified.URL> - </properties> - <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</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> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>http://download.jboss.org/jbosstools/updates/juno/SR1/latest/</targetRepositoryUrl> </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>../../scripts/multiple2other.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> @@ -90,7 +48,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -111,7 +69,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Deleted: trunk/build/target-platforms/scripts/multiple2other.xsl =================================================================== --- trunk/build/target-platforms/scripts/multiple2other.xsl 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/scripts/multiple2other.xsl 2012-10-04 18:11:04 UTC (rev 44306) @@ -1,23 +0,0 @@ -<?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>

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44305 - branches/jbosstools-4.0.0.Alpha2/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2012-10-04 13:56:27 -0400 (Thu, 04 Oct 2012) New Revision: 44305 Modified: branches/jbosstools-4.0.0.Alpha2/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java Log: JBIDE-12495 critical to branch alpha2 Modified: branches/jbosstools-4.0.0.Alpha2/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java =================================================================== --- branches/jbosstools-4.0.0.Alpha2/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java 2012-10-04 17:33:05 UTC (rev 44304) +++ branches/jbosstools-4.0.0.Alpha2/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java 2012-10-04 17:56:27 UTC (rev 44305) @@ -112,8 +112,8 @@ private static List nullSafe(List list) { return list == null ? new ArrayList() : list; } - private static boolean isEmpty(String s) { - return s != null && !"".equals(s); //$NON-NLS-1$ + private static boolean isEmpty(String s) { + return (s == null || s.isEmpty()); } private static void marshallAddPackages(XMLMemento memento, List packages) throws XbException { Iterator i = packages.iterator();

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44304 - in trunk/build/tycho-plugins: target-platform-utils and 8 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-10-04 13:33:05 -0400 (Thu, 04 Oct 2012) New Revision: 44304 Added: trunk/build/tycho-plugins/target-platform-utils/ trunk/build/tycho-plugins/target-platform-utils/pom.xml trunk/build/tycho-plugins/target-platform-utils/src/ trunk/build/tycho-plugins/target-platform-utils/src/main/ trunk/build/tycho-plugins/target-platform-utils/src/main/java/ trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/ trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/ trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/ trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/ trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/ trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/FlattenTargetMojo.java trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/TargetArtifact.java Modified: trunk/build/tycho-plugins/pom.xml Log: A target-platform-utils maven plugin Modified: trunk/build/tycho-plugins/pom.xml =================================================================== --- trunk/build/tycho-plugins/pom.xml 2012-10-04 16:31:51 UTC (rev 44303) +++ trunk/build/tycho-plugins/pom.xml 2012-10-04 17:33:05 UTC (rev 44304) @@ -13,6 +13,7 @@ <modules> <module>repository-utils</module> + <module>target-platform-utils</module> </modules> <build> Added: trunk/build/tycho-plugins/target-platform-utils/pom.xml =================================================================== --- trunk/build/tycho-plugins/target-platform-utils/pom.xml (rev 0) +++ trunk/build/tycho-plugins/target-platform-utils/pom.xml 2012-10-04 17:33:05 UTC (rev 44304) @@ -0,0 +1,44 @@ +<?xml version="1.0"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>tycho-plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>maven-plugin</packaging> + <name>target-platform-utils Maven Mojo</name> + <url>http://maven.apache.org</url> + <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-annotations</artifactId> + <version>1.5.4</version> + </dependency> + <dependency> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-facade</artifactId> + <version>0.15.0</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> Property changes on: trunk/build/tycho-plugins/target-platform-utils/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/FlattenTargetMojo.java =================================================================== --- trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/FlattenTargetMojo.java (rev 0) +++ trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/FlattenTargetMojo.java 2012-10-04 17:33:05 UTC (rev 44304) @@ -0,0 +1,144 @@ +/** + * Copyright (c) 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 + * + * Contributor: + * Mickael Istria (Red Hat, Inc.) - initial API and implementation + */ +package org.jboss.tools.tycho.targets; + +import java.io.File; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.resolver.ArtifactResolutionRequest; +import org.apache.maven.execution.MavenSession; +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.repository.RepositorySystem; +import org.codehaus.plexus.component.annotations.Requirement; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +/** + * Takes a multi-site .target file as input and flatten it to have same IUs, but from a single site. + * + * @goal flatten-target + */ +public class FlattenTargetMojo extends AbstractMojo +{ + + /** + * @parameter default-value="${project}" + * @readonly + */ + private MavenProject project; + /** + * @parameter expression="${session}" + * @readonly + */ + private MavenSession session; + + /** + * @component + */ + @Requirement + private RepositorySystem repositorySystem; + + /** + * Location of the output file. + * @parameter expression="${project.build.directory}/${project.artifactId}.target" + * @required + */ + private File outputFile; + + /** + * Target to transform (as a file) + * @parameter + */ + private File sourceTargetFile; + + /** + * @parameter + */ + private TargetArtifact sourceTargetArtifact; + + /** + * @parameter + * @required + */ + private String targetRepositoryUrl; + + public void execute() throws MojoExecutionException { + if (!this.outputFile.getParentFile().exists()) { + this.outputFile.getParentFile().mkdirs(); + } + + if ((this.sourceTargetFile != null && this.sourceTargetArtifact != null) || + (this.sourceTargetFile == null && this.sourceTargetArtifact == null)) { + throw new MojoExecutionException("Set either 'sourceTargetFile' XOR 'sourceTargetArtifact'"); + } + + if (this.sourceTargetArtifact != null) { + if (!this.sourceTargetArtifact.isCorrectlySet()) { + throw new MojoExecutionException("'sourceTargetArtifact' must define groupId, artifactId and version"); + } + getLog().info("Downloading " + sourceTargetArtifact.toString()); + Artifact artifact = this.repositorySystem.createArtifactWithClassifier(this.sourceTargetArtifact.getGroupId(), this.sourceTargetArtifact.getArtifactId(), this.sourceTargetArtifact.getVersion(), "target", + this.sourceTargetArtifact.getArtifactId()); + ArtifactResolutionRequest request = new ArtifactResolutionRequest(); + request.setArtifact(artifact); + request.setLocalRepository(this.session.getLocalRepository()); + request.setRemoteRepositories(this.project.getRemoteArtifactRepositories()); + this.repositorySystem.resolve(request); + + if (!artifact.isResolved()) { + throw new RuntimeException("Could not resolve target platform specification artifact " + artifact); + } + + this.sourceTargetFile = artifact.getFile(); + } + + try { + DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); + Document targetDoc = docBuilder.parse(this.sourceTargetFile); + NodeList locations = ((Element) ((Element)targetDoc.getElementsByTagName("target").item(0)).getElementsByTagName("locations").item(0)).getElementsByTagName("location"); + getLog().debug("number of locations: " + locations.getLength()); + Element targetItem = (Element) locations.item(0); + ((Element)targetItem.getElementsByTagName("repository").item(0)).setAttribute("location", this.targetRepositoryUrl); + while (locations.getLength() > 1) { + Element location = (Element)locations.item(1); + NodeList children = location.getChildNodes(); + while (children.getLength() > 0) { + if ((children.item(0) instanceof Element) && ((Element)children.item(0)).getTagName().equals("repository")) { + location.removeChild(children.item(0)); + } else { + targetItem.appendChild(children.item(0)); + } + } + location.getParentNode().removeChild(location); + } + + //write the content into xml file + Transformer transformer = TransformerFactory.newInstance().newTransformer(); + transformer.setOutputProperty(OutputKeys.INDENT, Boolean.TRUE.toString()); + DOMSource source = new DOMSource(targetDoc); + StreamResult result = new StreamResult(outputFile); + transformer.transform(source, result); + } catch (Exception ex) { + throw new MojoExecutionException("Error processing files", ex); + } + } +} Property changes on: trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/FlattenTargetMojo.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/TargetArtifact.java =================================================================== --- trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/TargetArtifact.java (rev 0) +++ trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/TargetArtifact.java 2012-10-04 17:33:05 UTC (rev 44304) @@ -0,0 +1,27 @@ +package org.jboss.tools.tycho.targets; + +public class TargetArtifact { + + private String groupId; + private String artifactId; + private String version; + + public String getGroupId() { + return this.groupId; + } + public String getArtifactId() { + return this.artifactId; + } + public String getVersion() { + return this.version; + } + + public boolean isCorrectlySet() { + return this.groupId != null && this.artifactId != null && this.version != null; + } + + @Override + public String toString() { + return this.groupId + ":" + this.artifactId + ":" + this.version; + } +} Property changes on: trunk/build/tycho-plugins/target-platform-utils/src/main/java/org/jboss/tools/tycho/targets/TargetArtifact.java ___________________________________________________________________ Added: svn:mime-type + text/plain

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44303 - trunk/build/aggregate.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-10-04 12:31:51 -0400 (Thu, 04 Oct 2012) New Revision: 44303 Added: trunk/build/aggregate/p2stats.sh Log: new prototype script for adding p2 stats to an existing repo -- need to convert to Ant so it can be called by Maven (JBIDE-12432) Added: trunk/build/aggregate/p2stats.sh =================================================================== --- trunk/build/aggregate/p2stats.sh (rev 0) +++ trunk/build/aggregate/p2stats.sh 2012-10-04 16:31:51 UTC (rev 44303) @@ -0,0 +1,53 @@ +#!/bin/bash + +# to enable debugging set to "echo"; to disable set to ":" +debug=":" + +# fetch Eclipse +eclipse=~/eclipse/42clean/eclipse/eclipse + +installWTPRelengTools=0; +if [[ ${installWTPRelengTools} -eq 1 ]]; then + # fetch wtp.releng tool; want more verbose output? use -consolelog -debug -console + ${eclipse} -application org.eclipse.equinox.p2.director -noSplash \ + -repository http://download.eclipse.org/webtools/releng/repository/ \ + -installIUs org.eclipse.wtp.releng.tools.feature.feature.group +fi + +# set up properties +BUILD_HOME=${HOME}/testbuildhome +SOURCE_REPO=/tmp/testartifactrepo/ + +TARGET_PLATFORM=juno +TARGET_FOLDER=4.0.0.Beta1 + +# get artifacts jar to work on +unzip -oq ~/truu/product/site/target/site_assembly.zip -d ${SOURCE_REPO} + +# set up script params; '&' should NOT be unescaped; p2 api (or underlying xml) will escape it. +# to add p2MirrorsURL, use something like "-Dp2MirrorsURL=http://www.eclipse.org/downloads/download.php?format=xml&file=/project/releases/repository/" +devArgs=" " +devArgs="${devArgs} -DartifactRepoDirectory=${SOURCE_REPO} -DmetadataRepoDirectory=${SOURCE_REPO} " +devArgs="${devArgs} -Dp2StatsURI=https://devstudio.jboss.com/usage/${TARGET_PLATFORM}/${TARGET_FOLDER}/ -DstatsArtifactsSuffix= " +devArgs="${devArgs} -DstatsTrackedArtifacts=org.jboss.tools.jmx.feature,org.jboss.ide.eclipse.archives.feature,org.jboss.ide.eclipse.as.serverAdapter.wtp.feature,org.jboss.ide.eclipse.as.feature" + +JAVA_6_HOME=/opt/jdk1.6.0 +devJRE=${JAVA_6_HOME}/bin/java +APP_NAME=org.eclipse.wtp.releng.tools.addRepoProperties +devworkspace="${BUILD_HOME}"/addRepoPropertiesWorkspace + +$debug " cmd: " $0 +$debug " APP_NAME: " $APP_NAME +$debug " devworkspace: " $devworkspace +$debug " devJRE: " $devJRE +$debug " devArgs: " $devArgs +$debug +if [[ $debug == "echo" ]]; then $devJRE -version; fi +$debug + +if [[ -d ${devworkspace} ]]; then rm -fr ${devworkspace}; fi +mkdir -p ${devworkspace} +# more debug output with -consolelog -debug -console +${eclipse} -nosplash -data $devworkspace --launcher.suppressErrors -application ${APP_NAME} -vm $devJRE -vmargs $devArgs + +echo "Repo in ${SOURCE_REPO} processed." \ No newline at end of file Property changes on: trunk/build/aggregate/p2stats.sh ___________________________________________________________________ Added: svn:executable + *

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44302 - in trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui: internal/jobs and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2012-10-04 11:46:44 -0400 (Thu, 04 Oct 2012) New Revision: 44302 Added: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/DeleteExistingClasspathEntriesJob.java Removed: 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/DependencyConversionPreviewPage.java 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/IdentifyMavenDependencyPage.java Log: JBIDE-12529 delete all non (source / JRE / Maven) classpath entries 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-04 14:59:00 UTC (rev 44301) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/ConvertToMavenDependencyWizard.java 2012-10-04 15:46:44 UTC (rev 44302) @@ -15,14 +15,11 @@ import org.apache.maven.model.Dependency; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jdt.internal.corext.refactoring.reorg.JavaDeleteProcessor; -import org.eclipse.jdt.internal.ui.refactoring.reorg.DeleteUserInterfaceManager; -import org.eclipse.jdt.ui.refactoring.RefactoringSaveHelper; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.ltk.core.refactoring.Refactoring; -import org.eclipse.ltk.core.refactoring.participants.DeleteRefactoring; +import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation; +import org.eclipse.ltk.ui.refactoring.resource.DeleteResourcesWizard; import org.jboss.tools.maven.conversion.core.ProjectDependency; +import org.jboss.tools.maven.conversion.ui.internal.jobs.DeleteExistingClasspathEntriesJob; /** * Convert project dependencies to Maven dependencies wizard @@ -66,20 +63,33 @@ } + @SuppressWarnings("restriction") @Override public boolean performFinish() { if (identificationPage != null) { dependencies = identificationPage.getDependencies(); if (identificationPage.isDeleteJars()) { + /* Delete classpath entries of Java Projects*/ + //FIXME use Refactoring API for that!!! + DeleteExistingClasspathEntriesJob deleteJob = new DeleteExistingClasspathEntriesJob(project); + deleteJob.schedule(); + try { + deleteJob.join();//wait for job to finish to prevent bad concurrency issues + } catch (InterruptedException e) { + //ignore + } + //Only delete jars that are directly under a project's hierarchy IResource[] resourcesToDelete = identificationPage.getResourcesToDelete(); if (resourcesToDelete != null && resourcesToDelete.length > 0) { + //Use refactoring API to delete jars + DeleteResourcesWizard wizard = new DeleteResourcesWizard(resourcesToDelete); try { - Refactoring refactoring= new DeleteRefactoring(new JavaDeleteProcessor(resourcesToDelete)); - DeleteUserInterfaceManager.getDefault().getStarter(refactoring).activate(refactoring, getShell(), RefactoringSaveHelper.SAVE_NOTHING); - } catch (CoreException e) { - e.printStackTrace(); + RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(wizard); + op.run(getShell(), "Delete project relative jars"); + } catch(InterruptedException e) { + // ignore } } } Deleted: 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-04 14:59:00 UTC (rev 44301) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/DeleteExistingJarsJob.java 2012-10-04 15:46:44 UTC (rev 44302) @@ -1,150 +0,0 @@ -/************************************************************************************* - * 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.ui.dialog; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.MultiStatus; -import org.eclipse.core.runtime.Status; -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.jboss.tools.maven.conversion.core.ProjectDependency; -import org.jboss.tools.maven.conversion.ui.dialog.xpl.ConversionUtils; -import org.jboss.tools.maven.core.MavenCoreActivator; - -public class DeleteExistingJarsJob extends Job { - - private Set<IClasspathEntry> entries; - - private IJavaProject javaProject; - - public DeleteExistingJarsJob(IProject project, List<ProjectDependency> entries2) { - super("Delete classpath entries" - + ((project == null) ? "" : "for " + project.getName())); - this.javaProject = JavaCore.create(project); - 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 { - - for (IClasspathEntry e : entries) { - collectDeletableEntries(e, pathsToRemove, filesToRemove); - } - - updateClasspath(pathsToRemove, monitor); - /* Need to use the refactoring API - deleteFiles(filesToRemove, monitor); - */ - - } catch (CoreException e) { - return new Status(IStatus.ERROR, MavenCoreActivator.PLUGIN_ID, "Unable to delete classpath entries", e); - } - - return Status.OK_STATUS; - } - - private void deleteFiles(Set<IFile> filesToRemove, IProgressMonitor monitor) - throws CoreException { - List<IStatus> exceptions = new ArrayList<IStatus>(); - for (IFile f : filesToRemove) { - if (f.exists()) { - try { - f.delete(true, monitor); - } catch (CoreException e) { - exceptions.add(new Status(Status.ERROR, MavenCoreActivator.PLUGIN_ID, 0, "Unable to delete "+f.getFullPath(), e)); - } - } - } - - if (!exceptions.isEmpty()) { - IStatus[] statuses = new IStatus[exceptions.size()]; - exceptions.toArray(statuses); - IStatus status = new MultiStatus(MavenCoreActivator.PLUGIN_ID, Status.ERROR, statuses ,"Unable to delete files", null); - throw new CoreException(status ); - } - } - - private void updateClasspath(Set<IPath> pathsToRemove, IProgressMonitor monitor) throws CoreException { - if (pathsToRemove.isEmpty()) { - return; - } - ArrayList<IClasspathEntry> newEntries = new ArrayList<IClasspathEntry>(); - for (IClasspathEntry entry : javaProject.getRawClasspath()) { - if (!pathsToRemove.contains(entry.getPath())) { - newEntries.add(entry); - } - } - javaProject.setRawClasspath( - newEntries.toArray(new IClasspathEntry[newEntries.size()]), - null); - } - - private void collectDeletableEntries(IClasspathEntry entry, - Set<IPath> pathsToRemove, Set<IFile> filesToRemove) - throws CoreException { - if ((entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY - && entry.getPath() != null)) { - - if (pathsToRemove != null) { - pathsToRemove.add(entry.getPath()); - } - - if (filesToRemove != null) { - IFile f = ConversionUtils.getIFile(entry); - if (f != null && f.exists() - && javaProject.getProject().equals(f.getProject())) { - filesToRemove.add(f); - } - } - return; - } - - if (pathsToRemove == null) { - return; - } - if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) { - IPath path = entry.getPath(); - pathsToRemove.add(path); - IClasspathContainer container = JavaCore.getClasspathContainer( path, javaProject); - if (container != null) { - IClasspathEntry[] cpes = container.getClasspathEntries(); - if (cpes != null && cpes.length > 0) { - collectDeletableEntries(entry, null, filesToRemove); - } - } - } - // TODO handle other entry kinds - } - -} \ No newline at end of file Deleted: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/DependencyConversionPreviewPage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/DependencyConversionPreviewPage.java 2012-10-04 14:59:00 UTC (rev 44301) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/DependencyConversionPreviewPage.java 2012-10-04 15:46:44 UTC (rev 44302) @@ -1,57 +0,0 @@ -/************************************************************************************* - * 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.ui.dialog; - -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; - -public class DependencyConversionPreviewPage extends WizardPage { - - private Button deleteJarsBtn; - - private boolean deleteJars; - - protected DependencyConversionPreviewPage(String pageName) { - super(pageName); - } - - @Override - public void createControl(Composite parent) { - Composite container = new Composite(parent, SWT.NONE); - container.setEnabled(true); - setControl(container); - - deleteJarsBtn = addCheckButton(container, "Delete local project jars after conversion", deleteJars); - - } - - private Button addCheckButton(Composite container, String label, - boolean selected) { - Button checkBtn = new Button(container, SWT.CHECK); - checkBtn.setText(label); - checkBtn.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false, 2, 1)); - checkBtn.setSelection(selected); - return checkBtn; - } - - @Override - public boolean isPageComplete() { - return false; - } - - public boolean isDeleteJars() { - return deleteJars; - } - -} 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-04 14:59:00 UTC (rev 44301) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java 2012-10-04 15:46:44 UTC (rev 44302) @@ -33,6 +33,8 @@ import org.eclipse.core.runtime.jobs.IJobChangeListener; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.DialogSettings; +import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.ArrayContentProvider; @@ -112,6 +114,8 @@ private Link warningLink; + private IDialogSettings dialogSettings; + private static String MESSAGE = "Identify existing project references as Maven dependencies. Double-click on a Maven dependency to edit its details"; @@ -120,6 +124,7 @@ this.project = project; initialEntries = Collections.unmodifiableList(entries); initDependencyMap(); + initDialogSettings(); } private void initDependencyMap() { @@ -128,8 +133,29 @@ dependencyMap.put(entry, null); } } + + /** Loads the dialog settings using the page name as a section name. */ + private void initDialogSettings() { + IDialogSettings pluginSettings; + + // This is strictly to get SWT Designer working locally without blowing up. + if( MavenDependencyConversionActivator.getDefault() == null ) { + pluginSettings = new DialogSettings("Workbench"); + } + else { + pluginSettings = MavenDependencyConversionActivator.getDefault().getDialogSettings(); + } + + dialogSettings = pluginSettings.getSection(getName()); + if(dialogSettings == null) { + dialogSettings = pluginSettings.addNewSection(getName()); + pluginSettings.addSection(dialogSettings); + } + } public void dispose() { + + dialogSettings.put("isDeleteJars", isDeleteJars()); if (jarImage != null) jarImage.dispose(); if (okImage != null) okImage.dispose(); if (projectImage != null) projectImage.dispose(); @@ -209,6 +235,7 @@ } }); + deleteJars = dialogSettings.getBoolean("isDeleteJars"); deleteJarsBtn = addCheckButton(container, "Delete original references from project", deleteJars); deleteJarsBtn.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { Copied: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/DeleteExistingClasspathEntriesJob.java (from rev 44218, 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/internal/jobs/DeleteExistingClasspathEntriesJob.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/jobs/DeleteExistingClasspathEntriesJob.java 2012-10-04 15:46:44 UTC (rev 44302) @@ -0,0 +1,78 @@ +/************************************************************************************* + * 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.ui.internal.jobs; + +import java.util.ArrayList; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +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.ui.internal.MavenDependencyConversionActivator; + +public class DeleteExistingClasspathEntriesJob extends Job { + + private IProject project; + + public DeleteExistingClasspathEntriesJob(IProject project) { + super("Delete classpath entries" + + ((project == null) ? "" : "for " + project.getName())); + this.project = project; + } + + @Override + protected IStatus run(IProgressMonitor monitor) { + try { + if (!project.hasNature(JavaCore.NATURE_ID)) { + return Status.OK_STATUS; + } + } catch (CoreException ignore) { + return Status.OK_STATUS; + } + IJavaProject javaProject = JavaCore.create(project); + if(javaProject != null) { + // remove classpatch containers from JavaProject + try { + ArrayList<IClasspathEntry> newEntries = new ArrayList<IClasspathEntry>(); + for(IClasspathEntry entry : javaProject.getRawClasspath()) { + //Keep Source/ JRE / Maven containers + if(isKept(entry)) { + newEntries.add(entry); + } + } + javaProject.setRawClasspath(newEntries.toArray(new IClasspathEntry[newEntries.size()]), monitor); + } catch (JavaModelException e) { + IStatus error = new Status(IStatus.ERROR, MavenDependencyConversionActivator.PLUGIN_ID, "Unable to update classpath", e); + return error; + } + } + + return Status.OK_STATUS; + } + + + private boolean isKept(IClasspathEntry cpe) { + if(IClasspathEntry.CPE_SOURCE == cpe.getEntryKind() || + (IClasspathEntry.CPE_CONTAINER == cpe.getEntryKind() + && ("org.eclipse.jdt.launching.JRE_CONTAINER".equals(cpe.getPath().segment(0)) + || MavenClasspathHelpers.isMaven2ClasspathContainer(cpe.getPath())))) { + return true; + } + return false; + } +} \ No newline at end of file

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44301 - trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation.

by jbosstools-commits＠lists.jboss.org

Author: psrna Date: 2012-10-04 10:59:00 -0400 (Thu, 04 Oct 2012) New Revision: 44301 Modified: trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation/InstallTest.java Log: increased timeout for continueInstall to 40m (was 20m) Modified: trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation/InstallTest.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation/InstallTest.java 2012-10-04 14:41:55 UTC (rev 44300) +++ trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation/InstallTest.java 2012-10-04 14:59:00 UTC (rev 44301) @@ -145,7 +145,7 @@ public String getFailureMessage() { return null; } - }, 20 * 60000); // 20 minutes_tino + }, 40 * 60000); // 40 minutes_tino if (bot.activeShell().getText().equals("Security Warning")) { bot.button("OK").click(); System.err.println("OK clicked");

11 years, 7 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