June 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r31762 - in trunk/maven: plugins/org.jboss.tools.maven.project.examples/META-INF and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2011-06-01 19:01:32 -0400 (Wed, 01 Jun 2011) New Revision: 31762 Modified: trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF Log: JBIDE-9057 : allow maven plugins to depend on m2e 1.0.0 Modified: trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2011-06-01 22:59:21 UTC (rev 31761) +++ trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2011-06-01 23:01:32 UTC (rev 31762) @@ -12,16 +12,16 @@ org.eclipse.wst.common.frameworks;visibility:=reexport, org.eclipse.jst.common.frameworks;visibility:=reexport, org.eclipse.wst.common.modulecore;visibility:=reexport, - org.eclipse.m2e.core;bundle-version="0.13.0";visibility:=reexport, - org.eclipse.m2e.maven.runtime;bundle-version="0.13.0";visibility:=reexport, + org.eclipse.m2e.core;bundle-version="[0.13.0,1.0.1)";visibility:=reexport, + org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,1.0.1)";visibility:=reexport, org.eclipse.jdt.core;visibility:=reexport, - org.eclipse.m2e.jdt;bundle-version="0.13.0";visibility:=reexport, + org.eclipse.m2e.jdt;bundle-version="[0.13.0,1.0.1)";visibility:=reexport, org.eclipse.jst.j2ee;visibility:=reexport, org.eclipse.jst.j2ee.web;visibility:=reexport, org.jboss.tools.common;visibility:=reexport, org.eclipse.jdt.launching;visibility:=reexport, org.eclipse.ui.workbench;visibility:=reexport, - org.eclipse.m2e.model.edit;bundle-version="0.13.0";visibility:=reexport, + org.eclipse.m2e.model.edit;bundle-version="[0.13.0,1.0.1)";visibility:=reexport, org.eclipse.core.expressions, org.maven.ide.eclipse.wtp;bundle-version="0.13.0";visibility:=reexport Bundle-ActivationPolicy: lazy Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF 2011-06-01 22:59:21 UTC (rev 31761) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF 2011-06-01 23:01:32 UTC (rev 31762) @@ -10,8 +10,8 @@ org.jboss.tools.maven.core, org.jboss.tools.project.examples, org.eclipse.ui.ide, - org.eclipse.m2e.archetype.common;bundle-version="0.13.0", - org.eclipse.m2e.core.ui;bundle-version="0.13.0" + org.eclipse.m2e.archetype.common;bundle-version="[0.13.0,1.0.1)", + org.eclipse.m2e.core.ui;bundle-version="[0.13.0,1.0.1)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2011-06-01 22:59:21 UTC (rev 31761) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2011-06-01 23:01:32 UTC (rev 31762) @@ -36,8 +36,8 @@ org.eclipse.jst.jee.ejb, org.eclipse.jst.jee.ui, org.eclipse.jst.jee.web, - org.eclipse.m2e.lifecyclemapping.defaults;bundle-version="0.13.0", - org.eclipse.m2e.launching;bundle-version="0.13.0" + org.eclipse.m2e.lifecyclemapping.defaults;bundle-version="[0.13.0,1.0.1)", + org.eclipse.m2e.launching;bundle-version="[0.13.0,1.0.1)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Eclipse-RegisterBuddy: org.apache.log4j

13 years

1
0
0 / 0

JBoss Tools SVN: r31761 - trunk/forge/plugins/org.jboss.tools.seam.forge/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2011-06-01 18:59:21 -0400 (Wed, 01 Jun 2011) New Revision: 31761 Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/META-INF/MANIFEST.MF Log: JBIDE-9057 : allow forge plugin to depend on m2e 1.0.0 Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/META-INF/MANIFEST.MF =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/META-INF/MANIFEST.MF 2011-06-01 22:43:30 UTC (rev 31760) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/META-INF/MANIFEST.MF 2011-06-01 22:59:21 UTC (rev 31761) @@ -11,8 +11,8 @@ org.eclipse.jdt.launching, org.eclipse.ui.editors, org.eclipse.ui.ide, - org.eclipse.m2e.core;bundle-version="0.13.0", - org.eclipse.m2e.maven.runtime;bundle-version="0.13.0", + org.eclipse.m2e.core;bundle-version="[0.13.0,1.0.1)", + org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,1.0.1)", org.eclipse.jdt.core, org.eclipse.ui.views Bundle-RequiredExecutionEnvironment: JavaSE-1.6

13 years

1
0
0 / 0

JBoss Tools SVN: r31760 - in branches/jbosstools-3.2.x/build: results and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-06-01 18:43:30 -0400 (Wed, 01 Jun 2011) New Revision: 31760 Modified: branches/jbosstools-3.2.x/build/parent/pom.xml branches/jbosstools-3.2.x/build/results/buildResults.xsl branches/jbosstools-3.2.x/build/target-platform/publish.sh branches/jbosstools-3.2.x/build/target-platform/target2p2mirror.xml Log: move from wtp323 to wtp324 Modified: branches/jbosstools-3.2.x/build/parent/pom.xml =================================================================== --- branches/jbosstools-3.2.x/build/parent/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) +++ branches/jbosstools-3.2.x/build/parent/pom.xml 2011-06-01 22:43:30 UTC (rev 31760) @@ -40,7 +40,7 @@  - <local.site>file:///home/hudson/static_build_env/jbds/target-platform/e362-wtp323.target/</local.site> + <local.site>file:///home/hudson/static_build_env/jbds/target-platform/e362-wtp324.target/</local.site> <target.platform.site>${local.site}</target.platform.site>

13 years

1
0
0 / 0

JBoss Tools SVN: r31759 - in trunk: bot.tests/features and 51 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-06-01 18:14:36 -0400 (Wed, 01 Jun 2011) New Revision: 31759 Added: trunk/bpmn/features/org.jboss.tools.bpmn2.feature/pom.xml trunk/bpmn/features/pom.xml trunk/bpmn/plugins/org.eclipse.bpmn2.edit/pom.xml trunk/bpmn/plugins/org.eclipse.bpmn2.editor/pom.xml trunk/bpmn/plugins/org.eclipse.bpmn2/pom.xml trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/pom.xml trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/pom.xml trunk/bpmn/plugins/org.jboss.tools.jbpm/pom.xml trunk/bpmn/plugins/pom.xml trunk/bpmn/pom.xml trunk/bpmn/tests/org.eclipse.bpmn2.tests/pom.xml trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/pom.xml trunk/bpmn/tests/pom.xml Modified: trunk/bot.tests/features/org.jboss.tools.bot.test.feature/pom.xml trunk/bot.tests/features/pom.xml trunk/bot.tests/plugins/pom.xml trunk/bot.tests/pom.xml trunk/bot.tests/site/pom.xml trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/META-INF/MANIFEST.MF trunk/bpmn/tests/org.eclipse.bpmn2.tests/META-INF/MANIFEST.MF trunk/build/pom.xml trunk/forge/features/org.jboss.tools.seam.forge.feature/pom.xml trunk/forge/features/pom.xml trunk/forge/plugins/org.jboss.tools.seam.forge/pom.xml trunk/forge/plugins/pom.xml trunk/forge/pom.xml trunk/forge/site/pom.xml trunk/gwt/features/org.jboss.tools.gwt.feature/pom.xml trunk/gwt/features/pom.xml trunk/gwt/plugins/org.jboss.tools.gwt.core/pom.xml trunk/gwt/plugins/org.jboss.tools.gwt.ui/pom.xml trunk/gwt/plugins/pom.xml trunk/gwt/pom.xml trunk/gwt/site/pom.xml trunk/gwt/tests/pom.xml trunk/maven/pom.xml trunk/profiler/features/org.jboss.tools.profiler.feature/pom.xml trunk/profiler/features/pom.xml trunk/profiler/plugins/org.jboss.tools.profiler.ui/pom.xml trunk/profiler/plugins/pom.xml trunk/profiler/pom.xml trunk/profiler/site/pom.xml trunk/profiler/tests/pom.xml trunk/site/pom.xml trunk/site/site.xml trunk/usage/plugins/pom.xml trunk/workingset/features/org.jboss.tools.workingset.feature/pom.xml trunk/workingset/features/pom.xml trunk/workingset/plugins/org.jboss.tools.workingset.core/pom.xml trunk/workingset/plugins/org.jboss.tools.workingset.ui/pom.xml trunk/workingset/plugins/pom.xml trunk/workingset/pom.xml trunk/workingset/tests/org.jboss.tools.workingset.core.test/pom.xml trunk/workingset/tests/pom.xml Log: https://issues.jboss.org/browse/JBIDE-8518 fix pom.xml files in JBT and JBDS repo such that only component root poms reference parent pom (all others just look up to .. for parent) cdi counfig.ui.test plugin fix final fix for: profiler workingset bpmn forge usage site maven bot.test gwt Modified: trunk/bot.tests/features/org.jboss.tools.bot.test.feature/pom.xml =================================================================== --- trunk/bot.tests/features/org.jboss.tools.bot.test.feature/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/bot.tests/features/org.jboss.tools.bot.test.feature/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.bottests</groupId> + <artifactId>features</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.bot.test.feature</artifactId> Modified: trunk/bot.tests/features/pom.xml =================================================================== --- trunk/bot.tests/features/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/bot.tests/features/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,10 +1,15 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.tests.features</artifactId> - <name>org.jboss.tools.tests.features</name> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>bottests</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.bottests</groupId> + <artifactId>features</artifactId> <version>0.0.1-SNAPSHOT</version> + <name>bottests.features</name> <packaging>pom</packaging> <modules> <module>org.jboss.tools.bot.test.feature</module> Modified: trunk/bot.tests/plugins/pom.xml =================================================================== --- trunk/bot.tests/plugins/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/bot.tests/plugins/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,6 +1,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>bottests</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.tests.plugins</artifactId> <name>org.jboss.tools.tests.plugins</name> Modified: trunk/bot.tests/pom.xml =================================================================== --- trunk/bot.tests/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/bot.tests/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,19 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.2-SNAPSHOT</version> + <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.bot.tests.all</artifactId> - <name>org.jboss.tools.bot.tests.all</name> + <artifactId>bottests</artifactId> <version>0.0.1-SNAPSHOT</version> + <name>bot.tests.all</name> <packaging>pom</packaging> <modules> <module>plugins</module> <module>features</module> <module>site</module> </modules> -</project> \ No newline at end of file +</project> Modified: trunk/bot.tests/site/pom.xml =================================================================== --- trunk/bot.tests/site/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/bot.tests/site/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <artifactId>bottests</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.bot.tests.site</artifactId> - <name>org.jboss.tools.bot.tests.site</name> + <artifactId>bottests.site</artifactId> + <name>bottests.site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> -</project> \ No newline at end of file +</project> Added: trunk/bpmn/features/org.jboss.tools.bpmn2.feature/pom.xml =================================================================== --- trunk/bpmn/features/org.jboss.tools.bpmn2.feature/pom.xml (rev 0) +++ trunk/bpmn/features/org.jboss.tools.bpmn2.feature/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools.bpmn</groupId> + <artifactId>features</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.bpmn.features</groupId> + <artifactId>org.jboss.tools.bpmn2.feature</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> Added: trunk/bpmn/features/pom.xml =================================================================== --- trunk/bpmn/features/pom.xml (rev 0) +++ trunk/bpmn/features/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -0,0 +1,18 @@ +<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>bpmn</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.bpmn</groupId> + <artifactId>features</artifactId> + <version>0.0.1-SNAPSHOT</version> + <name>bpmn.features</name> + <packaging>pom</packaging> + <modules> + <module>org.jboss.tools.bpmn2.feature</module> + </modules> +</project> + Added: trunk/bpmn/plugins/org.eclipse.bpmn2/pom.xml =================================================================== --- trunk/bpmn/plugins/org.eclipse.bpmn2/pom.xml (rev 0) +++ trunk/bpmn/plugins/org.eclipse.bpmn2/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools.bpmn</groupId> + <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.bpmn.plugins</groupId> + <artifactId>org.eclipse.bpmn2</artifactId> + <version>0.7.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> Added: trunk/bpmn/plugins/org.eclipse.bpmn2.edit/pom.xml =================================================================== --- trunk/bpmn/plugins/org.eclipse.bpmn2.edit/pom.xml (rev 0) +++ trunk/bpmn/plugins/org.eclipse.bpmn2.edit/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools.bpmn</groupId> + <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.bpmn.plugins</groupId> + <artifactId>org.eclipse.bpmn2.edit</artifactId> + <version>0.7.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> Added: trunk/bpmn/plugins/org.eclipse.bpmn2.editor/pom.xml =================================================================== --- trunk/bpmn/plugins/org.eclipse.bpmn2.editor/pom.xml (rev 0) +++ trunk/bpmn/plugins/org.eclipse.bpmn2.editor/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools.bpmn</groupId> + <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.bpmn.plugins</groupId> + <artifactId>org.eclipse.bpmn2.editor</artifactId> + <version>0.7.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/META-INF/MANIFEST.MF =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/META-INF/MANIFEST.MF 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/META-INF/MANIFEST.MF 2011-06-01 22:14:36 UTC (rev 31759) @@ -2,5 +2,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.jboss.tools.bpmn2.model Bundle-SymbolicName: org.jboss.tools.bpmn2.model -Bundle-Version: 0.1.0 +Bundle-Version: 0.1.0.qualifier Require-Bundle: org.eclipse.emf.ecore Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/pom.xml =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/pom.xml (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools.bpmn</groupId> + <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.bpmn.plugins</groupId> + <artifactId>org.jboss.tools.bpmn2.model</artifactId> + <version>0.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/pom.xml =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/pom.xml (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools.bpmn</groupId> + <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.bpmn.plugins</groupId> + <artifactId>org.jboss.tools.bpmn2.process.diagram</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> Added: trunk/bpmn/plugins/org.jboss.tools.jbpm/pom.xml =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.jbpm/pom.xml (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.jbpm/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools.bpmn</groupId> + <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.bpmn.plugins</groupId> + <artifactId>org.jboss.tools.jbpm</artifactId> + <version>5.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> Added: trunk/bpmn/plugins/pom.xml =================================================================== --- trunk/bpmn/plugins/pom.xml (rev 0) +++ trunk/bpmn/plugins/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -0,0 +1,23 @@ +<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>bpmn</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.bpmn</groupId> + <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> + <name>bpmn.plugins</name> + <packaging>pom</packaging> + <modules> + <module>org.eclipse.bpmn2</module> + <module>org.eclipse.bpmn2.edit</module> + <module>org.eclipse.bpmn2.editor</module> + <module>org.jboss.tools.bpmn2.model</module> + <module>org.jboss.tools.bpmn2.process.diagram</module> + <module>org.jboss.tools.jbpm</module> + </modules> +</project> + Added: trunk/bpmn/pom.xml =================================================================== --- trunk/bpmn/pom.xml (rev 0) +++ trunk/bpmn/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -0,0 +1,37 @@ +<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>org.jboss.tools.parent.pom</artifactId> + <version>0.0.2-SNAPSHOT</version> + <relativePath>../build/parent/pom.xml</relativePath> + </parent> + <groupId>org.jboss.tools</groupId> + <artifactId>bpmn</artifactId> + <name>bpmn.all</name> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <modules> + <module>plugins</module> + <module>tests</module> + <module>features</module> + </modules> + <repositories> + + <repository> + <id>indigo</id> + <url>http://download.eclipse.org/modeling/gmf/updates/milestones/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + + </repositories> + +</project> + Modified: trunk/bpmn/tests/org.eclipse.bpmn2.tests/META-INF/MANIFEST.MF =================================================================== --- trunk/bpmn/tests/org.eclipse.bpmn2.tests/META-INF/MANIFEST.MF 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/bpmn/tests/org.eclipse.bpmn2.tests/META-INF/MANIFEST.MF 2011-06-01 22:14:36 UTC (rev 31759) @@ -6,4 +6,4 @@ Bundle-Vendor: Eclipse Modeling Project Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.junit, - org.eclipse.bpmn2;bundle-version="1.0.0" + org.eclipse.bpmn2 Added: trunk/bpmn/tests/org.eclipse.bpmn2.tests/pom.xml =================================================================== --- trunk/bpmn/tests/org.eclipse.bpmn2.tests/pom.xml (rev 0) +++ trunk/bpmn/tests/org.eclipse.bpmn2.tests/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools.bpmn</groupId> + <artifactId>tests</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.bpmn.tests</groupId> + <artifactId>org.eclipse.bpmn2.tests</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> + + <properties> + <emma.filter>org.jboss.tools.bpmn.*</emma.filter> + <emma.instrument.bundles>org.eclipse.bpmn2,org.eclipse.bpmn2.edit,org.eclipse.bpmn2.editor,org.jboss.tools.bpmn2.model,org.jboss.tools.bpmn2.process.diagram,org.jboss.tools.jbpm</emma.instrument.bundles> + </properties> +</project> Added: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/pom.xml =================================================================== --- trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/pom.xml (rev 0) +++ trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools.bpmn</groupId> + <artifactId>tests</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.bpmn.tests</groupId> + <artifactId>org.jboss.tools.bpmn.ui.bot.test</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> + + <properties> + <emma.filter>org.eclipse.bpmn2.*</emma.filter> + <emma.instrument.bundles>org.eclipse.bpmn2,org.eclipse.bpmn2.edit,org.eclipse.bpmn2.editor,org.jboss.tools.bpmn2.model,org.jboss.tools.bpmn2.process.diagram,org.jboss.tools.jbpm</emma.instrument.bundles> + </properties> +</project> Added: trunk/bpmn/tests/pom.xml =================================================================== --- trunk/bpmn/tests/pom.xml (rev 0) +++ trunk/bpmn/tests/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -0,0 +1,19 @@ +<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>bpmn</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.bpmn</groupId> + <artifactId>tests</artifactId> + <name>bpmn.tests</name> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <modules> + <module>org.eclipse.bpmn2.tests</module> + <module>org.jboss.tools.bpmn.ui.bot.test</module> + </modules> +</project> + Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/build/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -342,6 +342,23 @@ </profile> <profile> + <id>forge</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../forge</module> + </modules> + </profile> + + <profile> + <id>forge-bootstrap</id> + <modules> + <module>../forge</module> + </modules> + </profile> + + <profile> <id>cdi</id> <activation> <activeByDefault>true</activeByDefault> @@ -556,12 +573,12 @@ <profile> <id>gwt</id> <activation> - <activeByDefault>true</activeByDefault> + <activeByDefault>false</activeByDefault> </activation> -  <modules> <module>../gwt</module> - </modules> --> + </modules> </profile> <profile> @@ -577,6 +594,7 @@ <profile> <id>deltacloud-bootstrap</id> <modules> + <module>../tests</module> <module>../as</module> <module>../deltacloud</module> </modules> @@ -611,7 +629,6 @@ <module>../usage</module> </modules> </profile> - <profile> <id>aggregate-coverage</id> Modified: trunk/forge/features/org.jboss.tools.seam.forge.feature/pom.xml =================================================================== --- trunk/forge/features/org.jboss.tools.seam.forge.feature/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/forge/features/org.jboss.tools.seam.forge.feature/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.forge</groupId> + <artifactId>features</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.forge.features</groupId> - <artifactId>org.jboss.tools.seam.forge.feature</artifactId> + <artifactId>org.jboss.tools.seam.forge.feature</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> \ No newline at end of file Modified: trunk/forge/features/pom.xml =================================================================== --- trunk/forge/features/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/forge/features/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,10 +1,16 @@ <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"> + 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>forge</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.forge</groupId> <artifactId>features</artifactId> + <version>0.0.1-SNAPSHOT</version> <name>forge.features</name> - <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>org.jboss.tools.seam.forge.feature</module> Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/pom.xml =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.forge</groupId> + <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.forge.plugins</groupId> - <artifactId>org.jboss.tools.seam.forge</artifactId> + <artifactId>org.jboss.tools.seam.forge</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> \ No newline at end of file Modified: trunk/forge/plugins/pom.xml =================================================================== --- trunk/forge/plugins/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/forge/plugins/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,10 +1,16 @@ <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"> + 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>forge</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.forge</groupId> <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> <name>forge.plugins</name> - <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>org.jboss.tools.seam.forge</module> Modified: trunk/forge/pom.xml =================================================================== --- trunk/forge/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/forge/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,15 +1,22 @@ <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"> + 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>org.jboss.tools.parent.pom</artifactId> + <version>0.0.2-SNAPSHOT</version> + <relativePath>../build/parent/pom.xml</relativePath> + </parent> <groupId>org.jboss.tools</groupId> <artifactId>forge</artifactId> - <name>forge.all</name> <version>0.0.1-SNAPSHOT</version> + <name>forge.all</name> <packaging>pom</packaging> <modules> <module>features</module> <module>plugins</module> - <module>site</module> - </modules> + <module>site</module> + </modules> </project> Modified: trunk/forge/site/pom.xml =================================================================== --- trunk/forge/site/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/forge/site/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <artifactId>forge</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.forge</groupId> - <artifactId>forge.site</artifactId> + <artifactId>forge.site</artifactId> <name>forge.site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> Modified: trunk/gwt/features/org.jboss.tools.gwt.feature/pom.xml =================================================================== --- trunk/gwt/features/org.jboss.tools.gwt.feature/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/gwt/features/org.jboss.tools.gwt.feature/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.gwt</groupId> + <artifactId>features</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.gwt.features</groupId> - <artifactId>org.jboss.tools.gwt.feature</artifactId> + <artifactId>org.jboss.tools.gwt.feature</artifactId> <version>1.0.1-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> Modified: trunk/gwt/features/pom.xml =================================================================== --- trunk/gwt/features/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/gwt/features/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,10 +1,16 @@ <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"> + 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>gwt</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.gwt</groupId> <artifactId>features</artifactId> + <version>0.0.1-SNAPSHOT</version> <name>gwt.features</name> - <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>org.jboss.tools.gwt.feature</module> Modified: trunk/gwt/plugins/org.jboss.tools.gwt.core/pom.xml =================================================================== --- trunk/gwt/plugins/org.jboss.tools.gwt.core/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/gwt/plugins/org.jboss.tools.gwt.core/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.gwt</groupId> + <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.gwt.plugins</groupId> - <artifactId>org.jboss.tools.gwt.core</artifactId> + <artifactId>org.jboss.tools.gwt.core</artifactId> <version>1.0.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> Modified: trunk/gwt/plugins/org.jboss.tools.gwt.ui/pom.xml =================================================================== --- trunk/gwt/plugins/org.jboss.tools.gwt.ui/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/gwt/plugins/org.jboss.tools.gwt.ui/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.gwt</groupId> + <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.gwt.plugins</groupId> - <artifactId>org.jboss.tools.gwt.ui</artifactId> + <artifactId>org.jboss.tools.gwt.ui</artifactId> <version>1.0.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> Modified: trunk/gwt/plugins/pom.xml =================================================================== --- trunk/gwt/plugins/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/gwt/plugins/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,10 +1,16 @@ <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"> + 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>gwt</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.gwt</groupId> <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> <name>gwt.plugins</name> - <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>org.jboss.tools.gwt.core</module> Modified: trunk/gwt/pom.xml =================================================================== --- trunk/gwt/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/gwt/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,10 +1,16 @@ <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>org.jboss.tools.parent.pom</artifactId> + <version>0.0.2-SNAPSHOT</version> + <relativePath>../build/parent/pom.xml</relativePath> + </parent> <groupId>org.jboss.tools</groupId> <artifactId>gwt</artifactId> - <name>gwt.all</name> <version>0.0.1-SNAPSHOT</version> + <name>gwt.all</name> <packaging>pom</packaging> <modules> <module>features</module> Modified: trunk/gwt/site/pom.xml =================================================================== --- trunk/gwt/site/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/gwt/site/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <artifactId>gwt</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.gwt</groupId> - <artifactId>gwt.site</artifactId> + <artifactId>gwt.site</artifactId> <name>gwt.site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> Modified: trunk/gwt/tests/pom.xml =================================================================== --- trunk/gwt/tests/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/gwt/tests/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,6 +1,12 @@ <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"> + 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>gwt</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.gwt</groupId> <artifactId>tests</artifactId> <name>gwt.tests</name> Modified: trunk/maven/pom.xml =================================================================== --- trunk/maven/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/maven/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -10,8 +10,8 @@ </parent> <groupId>org.jboss.tools</groupId> <artifactId>maven</artifactId> - <name>maven.all</name> <version>0.0.1-SNAPSHOT</version> + <name>maven.all</name> <packaging>pom</packaging> <modules> <module>features</module> Modified: trunk/profiler/features/org.jboss.tools.profiler.feature/pom.xml =================================================================== --- trunk/profiler/features/org.jboss.tools.profiler.feature/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/profiler/features/org.jboss.tools.profiler.feature/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.profiler</groupId> + <artifactId>features</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.profiler.features</groupId> - <artifactId>org.jboss.tools.profiler.feature</artifactId> + <artifactId>org.jboss.tools.profiler.feature</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> \ No newline at end of file Modified: trunk/profiler/features/pom.xml =================================================================== --- trunk/profiler/features/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/profiler/features/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,10 +1,16 @@ <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"> + 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>profiler</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.profiler</groupId> <artifactId>features</artifactId> + <version>0.0.1-SNAPSHOT</version> <name>profiler.features</name> - <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>org.jboss.tools.profiler.feature</module> Modified: trunk/profiler/plugins/org.jboss.tools.profiler.ui/pom.xml =================================================================== --- trunk/profiler/plugins/org.jboss.tools.profiler.ui/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/profiler/plugins/org.jboss.tools.profiler.ui/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.profiler</groupId> + <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.profiler.plugins</groupId> - <artifactId>org.jboss.tools.profiler.ui</artifactId> + <artifactId>org.jboss.tools.profiler.ui</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> \ No newline at end of file Modified: trunk/profiler/plugins/pom.xml =================================================================== --- trunk/profiler/plugins/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/profiler/plugins/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,10 +1,16 @@ <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"> + 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>profiler</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.profiler</groupId> <artifactId>plugins</artifactId> - <name>profiler.plugins</name> <version>0.0.1-SNAPSHOT</version> + <name>profiler.plugins</name> <packaging>pom</packaging> <modules> <module>org.jboss.tools.profiler.ui</module> Modified: trunk/profiler/pom.xml =================================================================== --- trunk/profiler/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/profiler/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,16 +1,23 @@ <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"> + 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>org.jboss.tools.parent.pom</artifactId> + <version>0.0.2-SNAPSHOT</version> + <relativePath>../build/parent/pom.xml</relativePath> + </parent> <groupId>org.jboss.tools</groupId> <artifactId>profiler</artifactId> + <version>0.0.1-SNAPSHOT</version> <name>profiler.all</name> - <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>features</module> <module>plugins</module> <module>tests</module> - <module>site</module> - </modules> + <module>site</module> + </modules> </project> Modified: trunk/profiler/site/pom.xml =================================================================== --- trunk/profiler/site/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/profiler/site/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <artifactId>profiler</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.profiler</groupId> <artifactId>profiler.site</artifactId> Modified: trunk/profiler/tests/pom.xml =================================================================== --- trunk/profiler/tests/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/profiler/tests/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,12 +1,16 @@ <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"> + 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>profiler</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.profiler</groupId> <artifactId>tests</artifactId> + <version>0.0.1-SNAPSHOT</version> <name>profiler.tests</name> - <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> </modules> Modified: trunk/site/pom.xml =================================================================== --- trunk/site/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/site/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -2,9 +2,10 @@ 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>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.2-SNAPSHOT</version> + <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.site</artifactId> Modified: trunk/site/site.xml =================================================================== --- trunk/site/site.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/site/site.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,238 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> <site> -  + <description> - JBoss Tools 3.2.0 Update Site / p2 Repo - </description> +JBoss Tools 3.3.0 Update Site / p2 Repo + </description> -  -  - <feature url="features/org.jboss.tools.richfaces.feature_0.0.0.jar" id="org.jboss.tools.richfaces.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="WebTools" /> - </feature> - <feature url="features/org.jboss.tools.seam.feature_0.0.0.jar" id="org.jboss.tools.seam.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="WebTools" /> - </feature> - <feature url="features/org.jboss.tools.cdi.feature_0.0.0.jar" id="org.jboss.tools.cdi.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="WebTools" /> - <category name="GeneralTools" /> - </feature> - <feature url="features/org.jboss.tools.jmx.feature_0.0.0.jar" id="org.jboss.tools.jmx.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="GeneralTools" /> - </feature> - <feature url="features/org.jboss.ide.eclipse.as.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="WebTools" /> - </feature> - <feature url="features/org.jboss.ide.eclipse.archives.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="GeneralTools" /> - </feature> - <feature url="features/org.hibernate.eclipse.feature_0.0.0.jar" id="org.hibernate.eclipse.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="WebTools" /> - <category name="DataTools" /> - <category name="GeneralTools" /> - </feature> - <feature url="features/org.jboss.ide.eclipse.freemarker.feature_0.0.0.jar" id="org.jboss.ide.eclipse.freemarker.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="GeneralTools" /> - </feature> - <feature url="features/org.jboss.tools.struts.feature_0.0.0.jar" id="org.jboss.tools.struts.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="WebTools" /> - </feature> - <feature url="features/org.jboss.tools.esb.feature_0.0.0.jar" id="org.jboss.tools.esb.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="SOATools" /> - </feature> - <feature url="features/org.jboss.tools.ws.feature_0.0.0.jar" id="org.jboss.tools.ws.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="SOATools" /> - </feature> - <feature url="features/org.jboss.tools.portlet.feature_0.0.0.jar" id="org.jboss.tools.portlet.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="WebTools" /> - </feature> - <feature url="features/org.jboss.tools.smooks.feature_0.0.0.jar" id="org.jboss.tools.smooks.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="SOATools" /> - <category name="DataTools" /> - <category name="GeneralTools" /> - </feature> - <feature url="features/org.drools.eclipse.task.feature_0.0.0.jar" id="org.drools.eclipse.task.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="SOATools" /> - </feature> - <feature url="features/org.guvnor.tools.feature_0.0.0.jar" id="org.guvnor.tools.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="SOATools" /> - </feature> - <feature url="features/org.jboss.tools.project.examples.feature_0.0.0.jar" id="org.jboss.tools.project.examples.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="GeneralTools" /> - </feature> + <feature url="features/org.jboss.tools.richfaces.feature_0.0.0.jar" id="org.jboss.tools.richfaces.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.seam.feature_0.0.0.jar" id="org.jboss.tools.seam.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.cdi.feature_0.0.0.jar" id="org.jboss.tools.cdi.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.cdi.seam.feature_0.0.0.jar" id="org.jboss.tools.cdi.seam.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.jmx.feature_0.0.0.jar" id="org.jboss.tools.jmx.feature" version="0.0.0" /> + <feature url="features/org.jboss.ide.eclipse.as.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.feature" version="0.0.0" /> + <feature url="features/org.jboss.ide.eclipse.archives.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature" version="0.0.0" /> + <feature url="features/org.hibernate.eclipse.feature_0.0.0.jar" id="org.hibernate.eclipse.feature" version="0.0.0" /> -  -  + <feature url="features/org.jboss.ide.eclipse.freemarker.feature_0.0.0.jar" id="org.jboss.ide.eclipse.freemarker.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.struts.feature_0.0.0.jar" id="org.jboss.tools.struts.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.esb.feature_0.0.0.jar" id="org.jboss.tools.esb.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.ws.feature_0.0.0.jar" id="org.jboss.tools.ws.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.portlet.feature_0.0.0.jar" id="org.jboss.tools.portlet.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.smooks.feature_0.0.0.jar" id="org.jboss.tools.smooks.feature" version="0.0.0" /> + <feature url="features/org.drools.eclipse.task.feature_0.0.0.jar" id="org.drools.eclipse.task.feature" version="0.0.0" /> + <feature url="features/org.guvnor.tools.feature_0.0.0.jar" id="org.guvnor.tools.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.project.examples.feature_0.0.0.jar" id="org.jboss.tools.project.examples.feature" version="0.0.0" /> -  - <feature url="features/org.jboss.tools.community.project.examples.feature_0.0.0.jar" - id="org.jboss.tools.community.project.examples.feature" - version="0.0.0"> - <category name="AllTools" /> - <category name="GeneralTools" /> - </feature> - <feature url="features/org.jboss.tools.birt.feature_0.0.0.jar" id="org.jboss.tools.birt.feature" version="0.0.0"> - <category name="ReportTools" /> - </feature> - <feature url="features/org.jboss.tools.maven.feature_0.0.0.jar" id="org.jboss.tools.maven.feature" version="0.0.0"> - <category name="MavenTools" /> - </feature> - <feature url="features/org.jboss.tools.maven.seam.feature_0.0.0.jar" id="org.jboss.tools.maven.seam.feature" version="0.0.0"> - <category name="MavenTools" /> - </feature> - <feature url="features/org.jboss.tools.maven.jsf.feature_0.0.0.jar" id="org.jboss.tools.maven.jsf.feature" version="0.0.0"> - <category name="MavenTools" /> - </feature> - <feature url="features/org.jboss.tools.maven.cdi.feature_0.0.0.jar" id="org.jboss.tools.maven.cdi.feature" version="0.0.0"> - <category name="MavenTools" /> - </feature> - <feature url="features/org.jboss.tools.maven.hibernate.feature_0.0.0.jar" id="org.jboss.tools.maven.hibernate.feature" version="0.0.0"> - <category name="MavenTools" /> - </feature> - <feature url="features/org.jboss.tools.maven.portlet.feature_0.0.0.jar" id="org.jboss.tools.maven.portlet.feature" version="0.0.0"> - <category name="MavenTools" /> - </feature> - <feature url="features/org.jboss.tools.xulrunner.feature_0.0.0.jar" id="org.jboss.tools.xulrunner.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="WebTools" /> - </feature> - <feature url="features/org.jboss.tools.jbpm.convert.feature_0.0.0.jar" id="org.jboss.tools.jbpm.convert.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="SOATools" /> - </feature> - <feature url="features/org.jboss.tools.jbpm.common.feature_0.0.0.jar" id="org.jboss.tools.jbpm.common.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="SOATools" /> - </feature> - <feature url="features/org.jboss.tools.jbpm3.feature_0.0.0.jar" id="org.jboss.tools.jbpm3.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="SOATools" /> - </feature> - <feature url="features/org.jboss.tools.jbpm4.feature_0.0.0.jar" id="org.jboss.tools.jbpm4.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="SOATools" /> - </feature> - <feature url="features/org.jboss.tools.bpel.feature_0.0.0.jar" id="org.jboss.tools.bpel.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="SOATools" /> - </feature> - <feature url="features/org.jboss.tools.modeshape.rest.feature_0.0.0.jar" id="org.jboss.tools.modeshape.rest.feature" version="0.0.0"> - <category name="AllTools" /> - <category name="GeneralTools" /> - </feature> - <feature url="features/org.jboss.tools.runtime.feature_0.0.0.jar" id="org.jboss.tools.runtime.feature" version="0.0.0"> - <category name="AllTools" /> - </feature> - - <feature url="features/org.jboss.tools.deltacloud.feature_0.0.0.jar" id="org.jboss.tools.deltacloud.feature" version="0.0.0"> - <category name="CloudTools" /> - <category name="AllTools" /> - </feature> - - <feature url="features/org.jboss.tools.usage.feature_0.0.0.jar" id="org.jboss.tools.usage.feature" version="0.0.0"> - <category name="AllTools" /> - </feature> - - <category-def name="SDKTools" label="JBoss Tools SDK"> - <description>JBoss Tools SDK contains plugins where an SDK package - exists. These contain both source and runtimes. Use these if you want - to debug and/or provide patches to JBoss Tools plugins. - </description> - </category-def> - - <category-def name="AllTools" label="All JBoss Tools 3.2.0"> - <description> - Contains ALL the plugins that are available from - JBoss Tools except those - related to integration with 3rd party - plugins. Selecting this - category will give you all tools needed for - both Web, Seam and SOA - Development. - </description> - </category-def> - - <category-def name="SOATools" label="SOA Development"> - <description> - Tools to help create SOA applications. Use these if you - work with jBPM, - Drools, JBoss ESB, JBoss WebServices or Smooks. - </description> - </category-def> - - <category-def name="WebTools" label="Web and Java EE Development"> - <description> - Tools to help create web and enterprise applications, - using JSF, Facelets, - Seam, Hibernate/JPA, CSS, Webservices and more. - </description> - </category-def> - - <category-def name="GeneralTools" label="Application Development"> - <description>Tools for general application development.</description> - </category-def> - - <category-def name="DataTools" label="Data Services"> - <description>Tools related to data services such as persistence and - transformation.</description> - </category-def> - -  - <category-def name="MavenTools" label="Maven Support"> - <description>Plugins related to Maven and m2eclipse support. Use these - to enable use of Maven.</description> - </category-def> - -  - <category-def name="ReportTools" label="Business Intelligence, Reporting and Charting"> - <description>Business Intelligence, Reporting and Charting. Use these - if you plan to integrate Hibernate or Seam with Eclipse BIRT. - </description> - </category-def> - - <category-def name="TestPerfTools" label="Test and Performance"> - <description>Tools used to improve testing and performance. - </description> - </category-def> - - <category-def name="CloudTools" label="Cloud"> - <description>Tools for Cloud Development - </description> - </category-def> + <feature url="features/org.jboss.tools.community.project.examples.feature_0.0.0.jar" id="org.jboss.tools.community.project.examples.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.maven.feature_0.0.0.jar" id="org.jboss.tools.maven.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.maven.seam.feature_0.0.0.jar" id="org.jboss.tools.maven.seam.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.maven.jsf.feature_0.0.0.jar" id="org.jboss.tools.maven.jsf.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.maven.cdi.feature_0.0.0.jar" id="org.jboss.tools.maven.cdi.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.maven.hibernate.feature_0.0.0.jar" id="org.jboss.tools.maven.hibernate.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.maven.portlet.feature_0.0.0.jar" id="org.jboss.tools.maven.portlet.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.xulrunner.feature_0.0.0.jar" id="org.jboss.tools.xulrunner.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.jbpm.convert.feature_0.0.0.jar" id="org.jboss.tools.jbpm.convert.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.jbpm.common.feature_0.0.0.jar" id="org.jboss.tools.jbpm.common.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.jbpm3.feature_0.0.0.jar" id="org.jboss.tools.jbpm3.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.jbpm4.feature_0.0.0.jar" id="org.jboss.tools.jbpm4.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.bpel.feature_0.0.0.jar" id="org.jboss.tools.bpel.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.modeshape.rest.feature_0.0.0.jar" id="org.jboss.tools.modeshape.rest.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.runtime.feature_0.0.0.jar" id="org.jboss.tools.runtime.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.deltacloud.feature_0.0.0.jar" id="org.jboss.tools.deltacloud.feature" version="0.0.0" /> + <feature url="features/org.jboss.tools.usage.feature_0.0.0.jar" id="org.jboss.tools.usage.feature" version="0.0.0" /> </site> Modified: trunk/usage/plugins/pom.xml =================================================================== --- trunk/usage/plugins/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/usage/plugins/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -8,8 +8,8 @@ </parent> <groupId>org.jboss.tools.usage</groupId> <artifactId>plugins</artifactId> - <name>usage.plugins</name> <version>0.0.1-SNAPSHOT</version> + <name>usage.plugins</name> <packaging>pom</packaging> <modules> <module>org.jboss.tools.usage</module> Modified: trunk/workingset/features/org.jboss.tools.workingset.feature/pom.xml =================================================================== --- trunk/workingset/features/org.jboss.tools.workingset.feature/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/workingset/features/org.jboss.tools.workingset.feature/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.workingset</groupId> + <artifactId>features</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.workingset.features</groupId> - <artifactId>org.jboss.tools.workingset.feature</artifactId> + <artifactId>org.jboss.tools.workingset.feature</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> \ No newline at end of file Modified: trunk/workingset/features/pom.xml =================================================================== --- trunk/workingset/features/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/workingset/features/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,10 +1,16 @@ <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"> + 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>workingset</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.workingset</groupId> <artifactId>features</artifactId> + <version>0.0.1-SNAPSHOT</version> <name>workingset.features</name> - <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>org.jboss.tools.workingset.feature</module> Modified: trunk/workingset/plugins/org.jboss.tools.workingset.core/pom.xml =================================================================== --- trunk/workingset/plugins/org.jboss.tools.workingset.core/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/workingset/plugins/org.jboss.tools.workingset.core/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.workingset</groupId> + <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.workingset.plugins</groupId> - <artifactId>org.jboss.tools.workingset.core</artifactId> + <artifactId>org.jboss.tools.workingset.core</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> \ No newline at end of file Modified: trunk/workingset/plugins/org.jboss.tools.workingset.ui/pom.xml =================================================================== --- trunk/workingset/plugins/org.jboss.tools.workingset.ui/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/workingset/plugins/org.jboss.tools.workingset.ui/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.workingset</groupId> + <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.workingset.plugins</groupId> - <artifactId>org.jboss.tools.workingset.ui</artifactId> + <artifactId>org.jboss.tools.workingset.ui</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> \ No newline at end of file Modified: trunk/workingset/plugins/pom.xml =================================================================== --- trunk/workingset/plugins/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/workingset/plugins/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,10 +1,16 @@ <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"> + 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>workingset</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.workingset</groupId> <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> <name>workingset.plugins</name> - <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>org.jboss.tools.workingset.core</module> Modified: trunk/workingset/pom.xml =================================================================== --- trunk/workingset/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/workingset/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,10 +1,16 @@ <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>org.jboss.tools.parent.pom</artifactId> + <version>0.0.2-SNAPSHOT</version> + <relativePath>../build/parent/pom.xml</relativePath> + </parent> <groupId>org.jboss.tools</groupId> <artifactId>workingset</artifactId> + <version>0.0.1-SNAPSHOT</version> <name>workingset.all</name> - <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>features</module> Modified: trunk/workingset/tests/org.jboss.tools.workingset.core.test/pom.xml =================================================================== --- trunk/workingset/tests/org.jboss.tools.workingset.core.test/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/workingset/tests/org.jboss.tools.workingset.core.test/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,16 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.workingset</groupId> + <artifactId>tests</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.workingset.tests</groupId> - <artifactId>org.jboss.tools.workingset.core.test</artifactId> + <artifactId>org.jboss.tools.workingset.core.test</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> - + <properties> <emma.filter>org.jboss.tools.workingset*</emma.filter> <emma.instrument.bundles>org.jboss.tools.workingset.core</emma.instrument.bundles> Modified: trunk/workingset/tests/pom.xml =================================================================== --- trunk/workingset/tests/pom.xml 2011-06-01 21:45:38 UTC (rev 31758) +++ trunk/workingset/tests/pom.xml 2011-06-01 22:14:36 UTC (rev 31759) @@ -1,10 +1,16 @@ <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"> + 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>workingset</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.workingset</groupId> <artifactId>tests</artifactId> + <version>0.0.1-SNAPSHOT</version> <name>workingset.tests</name> - <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>org.jboss.tools.workingset.core.test</module>

13 years

1
0
0 / 0

JBoss Tools SVN: r31758 - trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-06-01 17:45:38 -0400 (Wed, 01 Jun 2011) New Revision: 31758 Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation/BuilderOrderMarkerResolutionTest.java Log: JBIDE-9028 https://issues.jboss.org/browse/JBIDE-9028 Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation/BuilderOrderMarkerResolutionTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation/BuilderOrderMarkerResolutionTest.java 2011-06-01 21:30:31 UTC (rev 31757) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation/BuilderOrderMarkerResolutionTest.java 2011-06-01 21:45:38 UTC (rev 31758) @@ -12,15 +12,19 @@ import junit.framework.TestCase; +import org.eclipse.core.internal.preferences.EclipsePreferences; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.ui.IMarkerResolution; import org.eclipse.ui.ide.IDE; -import org.eclipse.wst.validation.internal.plugin.ValidationPlugin; +import org.jboss.tools.common.preferences.SeverityPreferences; import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager; +import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences; import org.jboss.tools.test.util.JobUtils; public class BuilderOrderMarkerResolutionTest extends TestCase { @@ -34,7 +38,8 @@ private void checkResolution(IProject project, String markerType, String resolutionClassName) throws CoreException { try{ - IMarker[] markers = project.findMarkers(ValidationPlugin.VALIDATION_BUILDER_ID, true, IResource.DEPTH_ZERO); + IMarker[] markers = getBuilderOrderMarkers(); + assertTrue(markers.length > 0); for (int i = 0; i < markers.length; i++) { IMarker marker = markers[i]; IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry().getResolutions(marker); @@ -56,6 +61,38 @@ } } + private IMarker[] getBuilderOrderMarkers() throws CoreException { + return project.findMarkers(ValidatorManager.ORDER_PROBLEM_MARKER_TYPE, true, IResource.DEPTH_ZERO); + } + + public void testWrongBuildOrderPreference() throws CoreException { + IMarker[] markers = getBuilderOrderMarkers(); + assertEquals(1, markers.length); + assertEquals(IMarker.SEVERITY_ERROR, markers[0].getAttribute(IMarker.SEVERITY, -1)); + + modifyPreference(SeverityPreferences.IGNORE); + markers = getBuilderOrderMarkers(); + assertEquals(0, markers.length); + + modifyPreference(SeverityPreferences.WARNING); + markers = getBuilderOrderMarkers(); + assertEquals(1, markers.length); + assertEquals(IMarker.SEVERITY_WARNING, markers[0].getAttribute(IMarker.SEVERITY, -1)); + + modifyPreference(SeverityPreferences.ERROR); + markers = getBuilderOrderMarkers(); + assertEquals(1, markers.length); + assertEquals(IMarker.SEVERITY_ERROR, markers[0].getAttribute(IMarker.SEVERITY, -1)); + } + + void modifyPreference(String value) throws CoreException { + EclipsePreferences ps = (EclipsePreferences)ELSeverityPreferences.getInstance().getProjectPreferences(project); + ps.put(ELSeverityPreferences.WRONG_BUILDER_ORDER_PREFERENCE_NAME, value); + JobUtils.waitForIdle(); + project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); + JobUtils.waitForIdle(); + } + public void testBuilderOrderResolution() throws CoreException { checkResolution(project, ValidatorManager.ORDER_PROBLEM_MARKER_TYPE,

13 years

1
0
0 / 0

JBoss Tools SVN: r31757 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-06-01 17:30:31 -0400 (Wed, 01 Jun 2011) New Revision: 31757 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java Log: [JBIDE-9054] removed unneeded method Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2011-06-01 21:26:56 UTC (rev 31756) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2011-06-01 21:30:31 UTC (rev 31757) @@ -184,23 +184,6 @@ } /** - * Removes the marker that indicates that the given deployment (in form of a module tree) - * could not be deployed (.failed). Does nothing if the marker does not exist. - * - * @param method the method to use to manipulate the files on the server - * @param jbServer the server to manipulate - * @param moduleTree the deployment (in form of a module tree) - * @param monitor the monitor to use when giving progress feedback - * @return the result of the removal operation - * @throws CoreException - */ - public static IStatus removeDeployFailedMarkerIfExists(IJBossServerPublishMethod method, - IDeployableServer jbServer, IModule[] module, IProgressMonitor monitor) throws CoreException { - IPath depPath = PublishUtil.getDeployPath(method, module, jbServer); - return removeDeployedMarkerIfExists(jbServer.getServer(), depPath, method, monitor); - } - - /** * Returns <code>true</code> if the given server supports the marker deployment method introduced in JBoss AS7. * * @param the server to query

13 years

1
0
0 / 0

JBoss Tools SVN: r31756 - in trunk/modeshape: plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: elvisisking Date: 2011-06-01 17:26:56 -0400 (Wed, 01 Jun 2011) New Revision: 31756 Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.doc.user/META-INF/MANIFEST.MF trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.doc.user/build.properties trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.java trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.properties trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ModeShapeMessageConsole.java trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF Log: JBIDE-7223 ModeShapeMessageConsole Illegally Extends MessageConsole. Changed ModeShapeMessageConsole now extends IOConsole. Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.java 2011-06-01 21:19:11 UTC (rev 31755) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.java 2011-06-01 21:26:56 UTC (rev 31756) @@ -66,6 +66,7 @@ public static I18n publishedResourcePropertyErrorMsg; public static I18n publishingConsoleName; + public static I18n publishingConsoleProblemMsg; public static I18n publishingConsoleProblemCreatingHyperlinkMsg; public static I18n publishingConsoleFilePathNotFoundMsg; Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.properties =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.properties 2011-06-01 21:19:11 UTC (rev 31755) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.properties 2011-06-01 21:26:56 UTC (rev 31756) @@ -62,7 +62,8 @@ publishedResourcePropertyErrorMsg = Error obtaining the "published" property from the resource "{0}" publishingConsoleName = ModeShape -publishingConsoleProblemCreatingHyperlinkMsg = Unexpected problem creating hyperlink in ModeShape Message Console view +publishingConsoleProblemMsg = Unexpected problem writing to the ModeShape Message Console +publishingConsoleProblemCreatingHyperlinkMsg = Unexpected problem creating hyperlink in ModeShape Message Console publishingConsoleFilePathNotFoundMsg = A hyperlink could not be created in the ModeShape Message Console because the file path of "{0}" could not be found. preferencePageDescription = General settings for ModeShape Tools: Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ModeShapeMessageConsole.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ModeShapeMessageConsole.java 2011-06-01 21:19:11 UTC (rev 31755) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ModeShapeMessageConsole.java 2011-06-01 21:26:56 UTC (rev 31756) @@ -13,6 +13,8 @@ import static org.jboss.tools.modeshape.rest.IUiConstants.ModeShape_IMAGE_16x; +import java.io.IOException; + import org.eclipse.core.resources.IFile; import org.eclipse.debug.ui.console.FileLink; import org.eclipse.jface.text.BadLocationException; @@ -27,8 +29,8 @@ import org.eclipse.ui.console.ConsolePlugin; import org.eclipse.ui.console.IConsole; import org.eclipse.ui.console.IConsoleManager; -import org.eclipse.ui.console.MessageConsole; -import org.eclipse.ui.console.MessageConsoleStream; +import org.eclipse.ui.console.IOConsole; +import org.eclipse.ui.console.IOConsoleOutputStream; import org.jboss.tools.modeshape.rest.Activator; import org.jboss.tools.modeshape.rest.RestClientI18n; import org.modeshape.common.util.CheckArg; @@ -39,7 +41,7 @@ * The <code>ModeShapeMessageConsole</code> is a message console view where status of publishing operations are logged. This class * ensures all writes to the console are done in the UI thread. */ -public final class ModeShapeMessageConsole extends MessageConsole { +public final class ModeShapeMessageConsole extends IOConsole { /** * Start tag for adding emphasis to a message. Tag will appear in a properties file. @@ -169,49 +171,68 @@ addDocumentListener(message, file); } - MessageConsoleStream stream = newMessageStream(); + IOConsoleOutputStream stream = ModeShapeMessageConsole.this.newOutputStream(); - for (int beginIndex = 0, endIndex = 0, msgLength = message.length(); endIndex < msgLength;) { - int startTagIndex = message.indexOf(EMPHASIS_START_TAG, beginIndex); - int endTagIndex = ((startTagIndex < 0) ? -1 : message.indexOf(EMPHASIS_END_TAG, - startTagIndex - + EMPHASIS_START_TAG.length())); - - // ignore tags if both tags are not found - if ((endTagIndex < 0) && (startTagIndex >= 0)) { - startTagIndex = -1; + try { + for (int beginIndex = 0, endIndex = 0, msgLength = message.length(); endIndex < msgLength;) { + int startTagIndex = message.indexOf(EMPHASIS_START_TAG, beginIndex); + int endTagIndex = ((startTagIndex < 0) ? -1 : message.indexOf(EMPHASIS_END_TAG, + startTagIndex + + EMPHASIS_START_TAG.length())); + + // ignore tags if both tags are not found + if ((endTagIndex < 0) && (startTagIndex >= 0)) { + startTagIndex = -1; + } + + // determine if in emphasize mode + boolean emphasize = (beginIndex == startTagIndex); + + // skip over start tag and set stream to bold font style + if (emphasize) { + beginIndex += EMPHASIS_START_TAG.length(); + stream.setFontStyle(SWT.BOLD); + endIndex = endTagIndex; + } else { + stream.setFontStyle(SWT.NORMAL); + endIndex = ((startTagIndex < 0) ? msgLength : startTagIndex); + } + + // print to console and close stream + stream.write(message.substring(beginIndex, endIndex)); + stream.close(); + + // need to construct a new stream as changes to font style seem to only work one time + stream = ModeShapeMessageConsole.this.newOutputStream(); + + // skip over end tag + if (emphasize) { + endIndex += EMPHASIS_END_TAG.length(); + } + + beginIndex = endIndex; } - // determine if in emphasize mode - boolean emphasize = (beginIndex == startTagIndex); - - // skip over start tag and set stream to bold font style - if (emphasize) { - beginIndex += EMPHASIS_START_TAG.length(); - stream.setFontStyle(SWT.BOLD); - endIndex = endTagIndex; - } else { - stream.setFontStyle(SWT.NORMAL); - endIndex = ((startTagIndex < 0) ? msgLength : startTagIndex); + if (doLineFeedAtEnd) { + stream.write("\n"); //$NON-NLS-1$ } - - // print to console - stream.print(message.substring(beginIndex, endIndex)); - - // need to construct a new stream as changes to font style seem to only work one time - stream = newMessageStream(); - - // skip over end tag - if (emphasize) { - endIndex += EMPHASIS_END_TAG.length(); + } catch (IOException e) { + Activator.getDefault().log(new Status(Severity.ERROR, + RestClientI18n.publishingConsoleProblemMsg.text(), + e)); + } finally { + if (stream != null) { + if (!stream.isClosed()) { + try { + stream.close(); + } catch (IOException e) { + Activator.getDefault().log(new Status(Severity.ERROR, + RestClientI18n.publishingConsoleProblemMsg.text(), + e)); + } + } } - - beginIndex = endIndex; } - - if (doLineFeedAtEnd) { - stream.println(); - } } } }); Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.doc.user/META-INF/MANIFEST.MF =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.doc.user/META-INF/MANIFEST.MF 2011-06-01 21:19:11 UTC (rev 31755) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.doc.user/META-INF/MANIFEST.MF 2011-06-01 21:26:56 UTC (rev 31756) @@ -6,3 +6,4 @@ Bundle-Vendor: %bundleVendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.doc.user/build.properties =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.doc.user/build.properties 2011-06-01 21:19:11 UTC (rev 31755) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.doc.user/build.properties 2011-06-01 21:26:56 UTC (rev 31756) @@ -4,10 +4,6 @@ plugin.xml,\ toc.xml,\ ModeShapeHelpContexts.xml -src.includes = build.properties,\ - doc.zip,\ +src.includes = doc.zip,\ toc.xml,\ - plugin.xml,\ - META-INF/,\ - ModeShapeHelpContexts.xml,\ - plugin.properties + ModeShapeHelpContexts.xml Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF =================================================================== --- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF 2011-06-01 21:19:11 UTC (rev 31755) +++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF 2011-06-01 21:26:56 UTC (rev 31756) @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.jboss.tools.modeshape.rest.test Bundle-Version: 1.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.jboss.tools.modeshape.rest;bundle-version="1.0.0", +Require-Bundle: org.jboss.tools.modeshape.rest, org.junit4 Bundle-ClassPath: hamcrest-core-1.1.jar, .,

13 years

1
0
0 / 0

JBoss Tools SVN: r31755 - in trunk/maven/plugins/org.jboss.tools.maven.jsf: src/org/jboss/tools/maven/jsf/configurators and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2011-06-01 17:19:11 -0400 (Wed, 01 Jun 2011) New Revision: 31755 Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java Log: JBIDE-8687 JSF tooling adds an Faces Servlet declaration with no servlet mappings on project import Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jsf/META-INF/MANIFEST.MF 2011-06-01 21:18:21 UTC (rev 31754) +++ trunk/maven/plugins/org.jboss.tools.maven.jsf/META-INF/MANIFEST.MF 2011-06-01 21:19:11 UTC (rev 31755) @@ -4,15 +4,15 @@ Bundle-SymbolicName: org.jboss.tools.maven.jsf;singleton:=true Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.jboss.tools.maven.jsf.MavenJSFActivator -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, +Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", + org.eclipse.core.runtime;bundle-version="3.7.0", org.jboss.tools.maven.core, org.jboss.tools.maven.ui, org.jboss.tools.common.model, - org.eclipse.jst.j2ee.core, - org.eclipse.jst.j2ee, - org.eclipse.wst.common.emfworkbench.integration, - org.eclipse.jst.jsf.core + org.eclipse.jst.j2ee.core;bundle-version="1.2.100", + org.eclipse.jst.j2ee;bundle-version="1.1.500", + org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100", + org.eclipse.jst.jsf.core;bundle-version="1.3.4" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %Bundle-Vendor Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2011-06-01 21:18:21 UTC (rev 31754) +++ trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2011-06-01 21:19:11 UTC (rev 31755) @@ -11,7 +11,6 @@ package org.jboss.tools.maven.jsf.configurators; import java.io.File; -import java.io.IOException; import java.util.List; import org.apache.maven.artifact.Artifact; @@ -27,6 +26,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jst.jsf.core.internal.project.facet.IJSFFacetInstallDataModelProperties; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.project.MavenProjectChangedEvent; import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator; @@ -38,9 +38,6 @@ import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; import org.jboss.tools.maven.core.IJBossMavenConstants; import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider; import org.jboss.tools.maven.jsf.MavenJSFActivator; @@ -177,41 +174,9 @@ fproj.installProjectFacet(jsfVersion12, model, monitor); } else if (jsfVersionString.startsWith("2.0")) { //$NON-NLS-1$ - String webXmlString = null; - IFile webXml = null; - webXml = getWebXml(fproj, mavenProject); - boolean webXmlExists = webXml != null && webXml.exists(); - if (!configureWebxml() && webXmlExists) { - IStructuredModel webXmlModel = null; - try { - webXmlModel = StructuredModelManager.getModelManager().getModelForRead(webXml); - IStructuredDocument doc = webXmlModel.getStructuredDocument(); - webXmlString = doc.get(); - } catch (IOException e) { - MavenJSFActivator.log(e); - } finally { - if (webXmlModel != null) { - webXmlModel.releaseFromRead(); - } - } - } IDataModel model = MavenJSFActivator.getDefault().createJSFDataModel(fproj,jsfVersion20); + model.setBooleanProperty(IJSFFacetInstallDataModelProperties.CONFIGURE_SERVLET,configureWebxml()); fproj.installProjectFacet(jsfVersion20, model, monitor); - if (!configureWebxml() && webXmlExists && webXmlString != null) { - IStructuredModel webXmlModel = null; - try { - webXmlModel = StructuredModelManager.getModelManager().getModelForEdit(webXml); - IStructuredDocument doc = webXmlModel.getStructuredDocument(); - doc.set(webXmlString); - webXmlModel.save(); - } catch (IOException e) { - MavenJSFActivator.log(e); - } finally { - if (webXmlModel != null) { - webXmlModel.releaseFromEdit(); - } - } - } } if (shouldFixFacesConfig && generatedFacesConfig.exists()) {

13 years

1
0
0 / 0

JBoss Tools SVN: r31754 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7 and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-06-01 17:18:21 -0400 (Wed, 01 Jun 2011) New Revision: 31754 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java Log: [JBIDE-9054] renamed #addDeployMarker to #addDoDeployMarker to match the marker file name Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2011-06-01 21:14:50 UTC (rev 31753) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2011-06-01 21:18:21 UTC (rev 31754) @@ -117,7 +117,7 @@ AbstractServerToolsPublisher.getSubMon(monitor, 150) ); if( DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server)) - DeploymentMarkerUtils.addDeployMarker(method, ServerConverter.getDeployableServer(server), module, monitor); + DeploymentMarkerUtils.addDoDeployMarker(method, ServerConverter.getDeployableServer(server), module, monitor); } catch(CoreException ce) { return ce.getStatus(); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-06-01 21:14:50 UTC (rev 31753) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-06-01 21:18:21 UTC (rev 31754) @@ -97,7 +97,7 @@ callback.copyFile(mf, new Path(depPath.lastSegment()), monitor); // Add marker - DeploymentMarkerUtils.addDeployMarker(method, ds, module, new NullProgressMonitor()); + DeploymentMarkerUtils.addDoDeployMarker(method, ds, module, new NullProgressMonitor()); } monitor.done(); return s; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2011-06-01 21:14:50 UTC (rev 31753) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2011-06-01 21:18:21 UTC (rev 31754) @@ -61,10 +61,10 @@ * @return the result of the marker addition operation * @throws CoreException */ - public static IStatus addDeployMarker(IJBossServerPublishMethod method, IDeployableServer server, + public static IStatus addDoDeployMarker(IJBossServerPublishMethod method, IDeployableServer server, IModule[] moduleTree, IProgressMonitor monitor) throws CoreException { IPath depPath = PublishUtil.getDeployPath(method, moduleTree, server); - return addDeployMarker(method, server.getServer(), depPath, monitor); + return addDoDeployMarker(method, server.getServer(), depPath, monitor); } /** @@ -78,7 +78,7 @@ * @return the result of the marker addition operation * @throws CoreException */ - public static IStatus addDeployMarker(IJBossServerPublishMethod method, IServer server, + public static IStatus addDoDeployMarker(IJBossServerPublishMethod method, IServer server, IPath depPath, IProgressMonitor monitor) throws CoreException { IPath folder = depPath.removeLastSegments(1); IPublishCopyCallbackHandler callback = method.getCallbackHandler(folder, server); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-01 21:14:50 UTC (rev 31753) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-01 21:18:21 UTC (rev 31754) @@ -141,7 +141,7 @@ Iterator<IPath> i = l.iterator(); IPath p; while (i.hasNext()) { - DeploymentMarkerUtils.addDeployMarker(method, getServer(), i.next(), new SubProgressMonitor(monitor, + DeploymentMarkerUtils.addDoDeployMarker(method, getServer(), i.next(), new SubProgressMonitor(monitor, 1)); } super.publishFinish(new SubProgressMonitor(monitor, 1));

13 years

1
0
0 / 0

JBoss Tools SVN: r31753 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-06-01 17:14:50 -0400 (Wed, 01 Jun 2011) New Revision: 31753 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java Log: [JBIDE-9041] now always removing former deploys (to remove prior deployments in exploded/war format) Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2011-06-01 21:14:23 UTC (rev 31752) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2011-06-01 21:14:50 UTC (rev 31753) @@ -16,7 +16,6 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.wst.server.core.IModule; @@ -79,21 +78,22 @@ IDeployableServer server2 = ServerConverter.getDeployableServer(server); String remoteTempDeployRoot = getDeployRoot(module, ServerConverter.getDeployableServer(server)); IPath sourcePath = PublishUtil.getDeployPath(module, remoteTempDeployRoot, server2); - IPath destFolder = PublishUtil.getDeployPath(method, module, server2); + IPath destination = PublishUtil.getDeployPath(method, module, server2); String name = sourcePath.lastSegment(); IStatus result = null; - removeDeployFailedMarker(monitor); - - // Am I a removal? If yes, remove me, and return - if( publishType == IJBossServerPublisher.REMOVE_PUBLISH) { - result = removeRemoteDeployment(sourcePath, destFolder, name, monitor); - } else if( publishType != IJBossServerPublisher.NO_PUBLISH ){ + + /* + * always completely remove prior deployment (prior deployfailed marker, deployed folder etc.) + * this is needed since we might have switched from exploded to war + */ + result = removeRemoteDeployment(sourcePath, destination.removeLastSegments(1), name, monitor); + if( publishType != IJBossServerPublisher.REMOVE_PUBLISH){ // Locally zip it up into the remote tmp folder result = super.publishModule(method, server, module, publishType, delta, AbstractServerToolsPublisher.getSubMon(monitor, 50)); if( result.isOK() ) { - result = remoteFullPublish(sourcePath, destFolder.removeLastSegments(1), name, + result = remoteFullPublish(sourcePath, destination.removeLastSegments(1), name, AbstractServerToolsPublisher.getSubMon(monitor, 150)); } } @@ -112,7 +112,6 @@ IPath destFolder, String name, IProgressMonitor monitor) { // Now transfer the file to RSE try { - deleteRemoteResource(destFolder, name, new NullProgressMonitor()); IModuleFile mf = new ModuleFile(sourcePath.toFile(), name, new Path("/")); //$NON-NLS-1$ method.getCallbackHandler(destFolder, server).copyFile(mf, new Path(name), AbstractServerToolsPublisher.getSubMon(monitor, 150) @@ -124,23 +123,14 @@ } return Status.OK_STATUS; } - - private IStatus removeDeployFailedMarker(IProgressMonitor monitor) { - try { - if (DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server)) { - return DeploymentMarkerUtils.removeDeployFailedMarkerIfExists(method, server, module, monitor); - } - } catch(CoreException ce) { - return ce.getStatus(); - } - return Status.OK_STATUS; - } private IStatus removeRemoteDeployment( IPath sourcePath, IPath destFolder, String name, IProgressMonitor monitor) throws CoreException { try { - if( DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server)) - return DeploymentMarkerUtils.removeDeployedMarkerIfExists(method, server, module, monitor); + if( DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server)) { + DeploymentMarkerUtils.removeDeployedMarkerIfExists(method, server, module, monitor); + DeploymentMarkerUtils.removeDeployFailedMarkerIfExists(method, server, module, monitor); + } return deleteRemoteResource(destFolder, name, monitor); } catch(CoreException ce) { return ce.getStatus();

13 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits June 2011