jbosstools-commits June 2010

jbosstools-commits@lists.jboss.org

1 participants
684 discussions

JBoss Tools SVN: r22971 - trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2010-06-24 02:00:38 -0400 (Thu, 24 Jun 2010) New Revision: 22971 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/Java2WSCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommand.java Log: JBIDE-6499: commit to trunk Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/Java2WSCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/Java2WSCommand.java 2010-06-23 23:25:26 UTC (rev 22970) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/Java2WSCommand.java 2010-06-24 06:00:38 UTC (rev 22971) @@ -66,6 +66,7 @@ command.add("-c"); //$NON-NLS-1$ command.add(getClasspath(iProject)); + command.add("-t"); //$NON-NLS-1$ } private String getClasspath(IProject iProject) throws IOException { Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommand.java 2010-06-23 23:25:26 UTC (rev 22970) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommand.java 2010-06-24 06:00:38 UTC (rev 22971) @@ -58,6 +58,7 @@ if(model.enableSOAP12()){ command.add("-e"); //$NON-NLS-1$ } + command.add("-v"); //$NON-NLS-1$ } }

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22970 - in trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui: views and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2010-06-23 19:25:26 -0400 (Wed, 23 Jun 2010) New Revision: 22970 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXRSTester.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java Log: JBIDE-6497 - couple of tweaks for issues found in preparation for next week's demo Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXRSTester.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXRSTester.java 2010-06-23 18:54:11 UTC (rev 22969) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXRSTester.java 2010-06-23 23:25:26 UTC (rev 22970) @@ -152,6 +152,9 @@ // get the parms string String query = buildWebQuery(parameters); + + // Clear the address of any leading/trailing spaces + address = address.trim(); // build the complete URL URL url = null; Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java 2010-06-23 18:54:11 UTC (rev 22969) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java 2010-06-23 23:25:26 UTC (rev 22970) @@ -227,6 +227,11 @@ updatePropertyButtons(); } + public void removeAll() { + this.mPropsList.removeAll(); + updatePropertyButtons(); + } + public void dispose() { super.dispose(); } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java 2010-06-23 18:54:11 UTC (rev 22969) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java 2010-06-23 23:25:26 UTC (rev 22970) @@ -634,6 +634,7 @@ bodyText.setEnabled(true); methodCombo.setEnabled(false); parmsList.setEnabled(false); + parmsList.removeAll(); dlsList.setEnabled(false); parmsTab.getControl().setEnabled(false); headerTab.getControl().setEnabled(true); @@ -662,6 +663,10 @@ headerTab.getControl().setEnabled(true); methodCombo.setText(GET); wsdlButton.setEnabled(false); + + if (bodyText.getText().trim().length() > 0) { + bodyText.setText(""); //$NON-NLS-1$ + } } setMenusForCurrentState(); }

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22969 - in workspace/dgolovin/org.company.component.core: .settings and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-06-23 14:54:11 -0400 (Wed, 23 Jun 2010) New Revision: 22969 Added: workspace/dgolovin/org.company.component.core/.classpath workspace/dgolovin/org.company.component.core/.project workspace/dgolovin/org.company.component.core/.settings/ workspace/dgolovin/org.company.component.core/.settings/org.eclipse.jdt.core.prefs workspace/dgolovin/org.company.component.core/META-INF/ workspace/dgolovin/org.company.component.core/META-INF/MANIFEST.MF workspace/dgolovin/org.company.component.core/build.properties workspace/dgolovin/org.company.component.core/pom.xml workspace/dgolovin/org.company.component.core/src/ workspace/dgolovin/org.company.component.core/src/org/ workspace/dgolovin/org.company.component.core/src/org/company/ workspace/dgolovin/org.company.component.core/src/org/company/component/ workspace/dgolovin/org.company.component.core/src/org/company/component/core/ workspace/dgolovin/org.company.component.core/src/org/company/component/core/TestSuite1.java workspace/dgolovin/org.company.component.core/src/org/company/component/core/TestSuite2.java workspace/dgolovin/org.company.component.core/src/org/company/component/core/TestSuite3.java Log: Share project "org.company.component.core" into "https://svn.jboss.org/repos/jbosstools" Added: workspace/dgolovin/org.company.component.core/.classpath =================================================================== --- workspace/dgolovin/org.company.component.core/.classpath (rev 0) +++ workspace/dgolovin/org.company.component.core/.classpath 2010-06-23 18:54:11 UTC (rev 22969) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: workspace/dgolovin/org.company.component.core/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: workspace/dgolovin/org.company.component.core/.project =================================================================== --- workspace/dgolovin/org.company.component.core/.project (rev 0) +++ workspace/dgolovin/org.company.component.core/.project 2010-06-23 18:54:11 UTC (rev 22969) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.company.component.core</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Property changes on: workspace/dgolovin/org.company.component.core/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: workspace/dgolovin/org.company.component.core/.settings/org.eclipse.jdt.core.prefs =================================================================== --- workspace/dgolovin/org.company.component.core/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ workspace/dgolovin/org.company.component.core/.settings/org.eclipse.jdt.core.prefs 2010-06-23 18:54:11 UTC (rev 22969) @@ -0,0 +1,8 @@ +#Wed Jun 23 09:53:25 PDT 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: workspace/dgolovin/org.company.component.core/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: workspace/dgolovin/org.company.component.core/META-INF/MANIFEST.MF =================================================================== --- workspace/dgolovin/org.company.component.core/META-INF/MANIFEST.MF (rev 0) +++ workspace/dgolovin/org.company.component.core/META-INF/MANIFEST.MF 2010-06-23 18:54:11 UTC (rev 22969) @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Core Component +Bundle-SymbolicName: org.company.component.core +Bundle-Version: 1.0.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Require-Bundle: org.junit Property changes on: workspace/dgolovin/org.company.component.core/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Added: workspace/dgolovin/org.company.component.core/build.properties =================================================================== --- workspace/dgolovin/org.company.component.core/build.properties (rev 0) +++ workspace/dgolovin/org.company.component.core/build.properties 2010-06-23 18:54:11 UTC (rev 22969) @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . Property changes on: workspace/dgolovin/org.company.component.core/build.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: workspace/dgolovin/org.company.component.core/pom.xml =================================================================== --- workspace/dgolovin/org.company.component.core/pom.xml (rev 0) +++ workspace/dgolovin/org.company.component.core/pom.xml 2010-06-23 18:54:11 UTC (rev 22969) @@ -0,0 +1,107 @@ +<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> + <groupId>org.company.component</groupId> + <artifactId>core</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> + + <properties> + <tychoVersion>0.9.0-SNAPSHOT</tychoVersion> + </properties> + + <profiles> + <profile> + <id>helios</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>helios</id> + <url>http://download.eclipse.org/releases/helios/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + </repositories> + </profile> + </profiles> + + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tychoVersion}</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tychoVersion}</version> + <configuration> + <resolver>p2</resolver> + <ignoreTychoRepositories>true</ignoreTychoRepositories> + </configuration> + </plugin> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <version>${tychoVersion}</version> + <configuration> + <dependencies> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.eclipse.platform.ide</artifactId> + <version>0.0.0</version> + </dependency> + </dependencies> + <skip>false</skip> + <argLine>-Dparam1=v1 -Dparam2=v2</argLine> + <product>org.eclipse.sdk.ide</product> + <application>org.eclipse.ui.ide.workbench</application> + <parallel>true</parallel> + <includes> + <include>org/company/component/core/TestSuite1.class</include> + </includes> + </configuration> + <executions> + <execution> + <id>suite2</id> + <phase>integration-test</phase> + <configuration> + <skip>false</skip> + <argLine>-Dparam1=v3 -Dparam2=v4</argLine> + <includes> + <include>org/company/component/core/TestSuite2.class</include> + </includes> + </configuration> + <goals> + <goal>test</goal> + </goals> + </execution> + <execution> + <id>suite3</id> + <phase>integration-test</phase> + <configuration> + <skip>false</skip> + <argLine>-Dparam1=v5 -Dparam2=v6</argLine> + <includes> + <include>org/company/component/core/TestSuite3.class</include> + </includes> + </configuration> + <goals> + <goal>test</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Property changes on: workspace/dgolovin/org.company.component.core/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: workspace/dgolovin/org.company.component.core/src/org/company/component/core/TestSuite1.java =================================================================== --- workspace/dgolovin/org.company.component.core/src/org/company/component/core/TestSuite1.java (rev 0) +++ workspace/dgolovin/org.company.component.core/src/org/company/component/core/TestSuite1.java 2010-06-23 18:54:11 UTC (rev 22969) @@ -0,0 +1,20 @@ +package org.company.component.core; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +public class TestSuite1 extends TestCase{ + public static Test suite() { + TestSuite suite = new TestSuite(); + suite.addTestSuite(TestSuite1.class); + return suite; + } + + public void test1Suite1() { + assertTrue("Test1 failed", false); + } + + public void test2Suite1() { + } +} Property changes on: workspace/dgolovin/org.company.component.core/src/org/company/component/core/TestSuite1.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: workspace/dgolovin/org.company.component.core/src/org/company/component/core/TestSuite2.java =================================================================== --- workspace/dgolovin/org.company.component.core/src/org/company/component/core/TestSuite2.java (rev 0) +++ workspace/dgolovin/org.company.component.core/src/org/company/component/core/TestSuite2.java 2010-06-23 18:54:11 UTC (rev 22969) @@ -0,0 +1,20 @@ +package org.company.component.core; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + + +public class TestSuite2 extends TestCase{ + public static Test suite() { + TestSuite suite = new TestSuite(); + suite.addTestSuite(TestSuite2.class); + return suite; + } + + public void test1Suite2() { + } + + public void test2Suite2() { + } +} Property changes on: workspace/dgolovin/org.company.component.core/src/org/company/component/core/TestSuite2.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: workspace/dgolovin/org.company.component.core/src/org/company/component/core/TestSuite3.java =================================================================== --- workspace/dgolovin/org.company.component.core/src/org/company/component/core/TestSuite3.java (rev 0) +++ workspace/dgolovin/org.company.component.core/src/org/company/component/core/TestSuite3.java 2010-06-23 18:54:11 UTC (rev 22969) @@ -0,0 +1,20 @@ +package org.company.component.core; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + + +public class TestSuite3 extends TestCase{ + public static Test suite() { + TestSuite suite = new TestSuite(); + suite.addTestSuite(TestSuite3.class); + return suite; + } + + public void test1Suite3() { + } + + public void test2Suite3() { + } +} \ No newline at end of file Property changes on: workspace/dgolovin/org.company.component.core/src/org/company/component/core/TestSuite3.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22968 - workspace/dgolovin.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-06-23 14:53:41 -0400 (Wed, 23 Jun 2010) New Revision: 22968 Added: workspace/dgolovin/org.company.component.core/ Log: Share project "org.company.component.core" into "https://svn.jboss.org/repos/jbosstools"

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22967 - trunk/common/plugins/org.jboss.tools.common.model/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-06-23 14:42:23 -0400 (Wed, 23 Jun 2010) New Revision: 22967 Modified: trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF Log: fix line endings Modified: trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) +++ trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF 2010-06-23 18:42:23 UTC (rev 22967) @@ -1,85 +1,85 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-ActivationPolicy: lazy -Bundle-Name: %Bundle-Name.0 -Bundle-Activator: org.jboss.tools.common.model.plugin.ModelPlugin -Bundle-Vendor: %providerName -Plugin-Class: org.jboss.tools.common.model.plugin.ModelPlugin -Bundle-SymbolicName: org.jboss.tools.common.model;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.common.ant.model, - org.jboss.tools.common.ant.model.handlers, - org.jboss.tools.common.ant.parser, - org.jboss.tools.common.java.model.handler, - org.jboss.tools.common.meta, - org.jboss.tools.common.meta.action, - org.jboss.tools.common.meta.constraint, - org.jboss.tools.common.meta.help, - org.jboss.tools.common.meta.key, - org.jboss.tools.common.model, - org.jboss.tools.common.model.adapter, - org.jboss.tools.common.model.event, - org.jboss.tools.common.model.exception, - org.jboss.tools.common.model.filesystems, - org.jboss.tools.common.model.icons, - org.jboss.tools.common.model.impl, - org.jboss.tools.common.model.impl.bundle, - org.jboss.tools.common.model.impl.trees, - org.jboss.tools.common.model.markers, - org.jboss.tools.common.model.options, - org.jboss.tools.common.model.options.impl, - org.jboss.tools.common.model.plugin, - org.jboss.tools.common.model.project, - org.jboss.tools.common.model.project.ext, - org.jboss.tools.common.model.project.ext.store, - org.jboss.tools.common.model.project.ext.event, - org.jboss.tools.common.model.project.ext.impl, - org.jboss.tools.common.model.undo, - org.jboss.tools.common.model.util, - org.jboss.tools.common.model.util.extension, - org.jboss.tools.common.model.project, - org.jboss.tools.common.model.handlers, - org.jboss.tools.common.model.java.handlers, - org.jboss.tools.common.model.markers, - org.jboss.tools.common.java.generation, - org.jboss.tools.common.meta.action.impl, - org.jboss.tools.common.meta.action.impl.handlers, - org.jboss.tools.common.meta.constraint.impl, - org.jboss.tools.common.meta.impl, - org.jboss.tools.common.meta.impl.adapters, - org.jboss.tools.common.meta.impl.documentation, - org.jboss.tools.common.model.engines.impl, - org.jboss.tools.common.model.files.handlers, - org.jboss.tools.common.model.filesystems.impl, - org.jboss.tools.common.model.filesystems.impl.example, - org.jboss.tools.common.model.filesystems.impl.handlers, - org.jboss.tools.common.model.icons.impl, - org.jboss.tools.common.model.loaders, - org.jboss.tools.common.model.loaders.impl, - org.jboss.tools.common.model.search, - org.jboss.tools.common.model.search.impl, - images, - org.jboss.tools.common.model.refactoring -Require-Bundle: org.jboss.tools.common;visibility:=reexport, - org.eclipse.ui.ide, - org.eclipse.ui.views, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.ui.editors, - org.eclipse.jdt.core;visibility:=reexport, - org.eclipse.swt;visibility:=reexport, - org.eclipse.ui, - org.eclipse.jdt.ui, - org.eclipse.debug.core, - org.eclipse.debug.ui, - org.eclipse.help, - org.eclipse.ant.ui, - org.eclipse.ant.core, - org.eclipse.ltk.core.refactoring, - org.eclipse.ltk.ui.refactoring, - org.eclipse.wst.common.uriresolver, - org.eclipse.wst.common.modulecore, - org.eclipse.core.resources;visibility:=reexport, - org.eclipse.core.runtime;visibility:=reexport -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-ActivationPolicy: lazy +Bundle-Name: %Bundle-Name.0 +Bundle-Activator: org.jboss.tools.common.model.plugin.ModelPlugin +Bundle-Vendor: %providerName +Plugin-Class: org.jboss.tools.common.model.plugin.ModelPlugin +Bundle-SymbolicName: org.jboss.tools.common.model;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.common.ant.model, + org.jboss.tools.common.ant.model.handlers, + org.jboss.tools.common.ant.parser, + org.jboss.tools.common.java.model.handler, + org.jboss.tools.common.meta, + org.jboss.tools.common.meta.action, + org.jboss.tools.common.meta.constraint, + org.jboss.tools.common.meta.help, + org.jboss.tools.common.meta.key, + org.jboss.tools.common.model, + org.jboss.tools.common.model.adapter, + org.jboss.tools.common.model.event, + org.jboss.tools.common.model.exception, + org.jboss.tools.common.model.filesystems, + org.jboss.tools.common.model.icons, + org.jboss.tools.common.model.impl, + org.jboss.tools.common.model.impl.bundle, + org.jboss.tools.common.model.impl.trees, + org.jboss.tools.common.model.markers, + org.jboss.tools.common.model.options, + org.jboss.tools.common.model.options.impl, + org.jboss.tools.common.model.plugin, + org.jboss.tools.common.model.project, + org.jboss.tools.common.model.project.ext, + org.jboss.tools.common.model.project.ext.store, + org.jboss.tools.common.model.project.ext.event, + org.jboss.tools.common.model.project.ext.impl, + org.jboss.tools.common.model.undo, + org.jboss.tools.common.model.util, + org.jboss.tools.common.model.util.extension, + org.jboss.tools.common.model.project, + org.jboss.tools.common.model.handlers, + org.jboss.tools.common.model.java.handlers, + org.jboss.tools.common.model.markers, + org.jboss.tools.common.java.generation, + org.jboss.tools.common.meta.action.impl, + org.jboss.tools.common.meta.action.impl.handlers, + org.jboss.tools.common.meta.constraint.impl, + org.jboss.tools.common.meta.impl, + org.jboss.tools.common.meta.impl.adapters, + org.jboss.tools.common.meta.impl.documentation, + org.jboss.tools.common.model.engines.impl, + org.jboss.tools.common.model.files.handlers, + org.jboss.tools.common.model.filesystems.impl, + org.jboss.tools.common.model.filesystems.impl.example, + org.jboss.tools.common.model.filesystems.impl.handlers, + org.jboss.tools.common.model.icons.impl, + org.jboss.tools.common.model.loaders, + org.jboss.tools.common.model.loaders.impl, + org.jboss.tools.common.model.search, + org.jboss.tools.common.model.search.impl, + images, + org.jboss.tools.common.model.refactoring +Require-Bundle: org.jboss.tools.common;visibility:=reexport, + org.eclipse.ui.ide, + org.eclipse.ui.views, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.ui.editors, + org.eclipse.jdt.core;visibility:=reexport, + org.eclipse.swt;visibility:=reexport, + org.eclipse.ui, + org.eclipse.jdt.ui, + org.eclipse.debug.core, + org.eclipse.debug.ui, + org.eclipse.help, + org.eclipse.ant.ui, + org.eclipse.ant.core, + org.eclipse.ltk.core.refactoring, + org.eclipse.ltk.ui.refactoring, + org.eclipse.wst.common.uriresolver, + org.eclipse.wst.common.modulecore, + org.eclipse.core.resources;visibility:=reexport, + org.eclipse.core.runtime;visibility:=reexport +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22966 - in trunk: archives/plugins/org.jboss.ide.eclipse.archives.ui/META-INF and 72 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-06-23 14:39:59 -0400 (Wed, 23 Jun 2010) New Revision: 22966 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/META-INF/MANIFEST.MF trunk/birt/features/org.jboss.tools.birt.feature/feature.xml trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.gef/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.meta.ui/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.verification/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF trunk/common/tests/org.jboss.tools.common.el.core.test/META-INF/MANIFEST.MF trunk/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF trunk/common/tests/org.jboss.tools.common.verification.test/META-INF/MANIFEST.MF trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF trunk/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF trunk/esb/tests/org.jboss.tools.esb.core.test/META-INF/MANIFEST.MF trunk/flow/plugins/org.jboss.tools.flow.common/META-INF/MANIFEST.MF trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/META-INF/MANIFEST.MF trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml trunk/jmx/features/org.jboss.tools.jmx.feature/feature.xml trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.verification/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF trunk/maven/features/org.jboss.tools.maven.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml trunk/seam/plugins/org.jboss.tools.seam.pages.xml/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.tools.seam.text.ext/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.tools.seam.ui.pages/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.tools.seam.xml.ui/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.tools.seam.xml/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/META-INF/MANIFEST.MF trunk/struts/plugins/org.jboss.tools.struts.text.ext/META-INF/MANIFEST.MF trunk/struts/plugins/org.jboss.tools.struts.ui/META-INF/MANIFEST.MF trunk/struts/plugins/org.jboss.tools.struts.validator.ui/META-INF/MANIFEST.MF trunk/struts/plugins/org.jboss.tools.struts.verification/META-INF/MANIFEST.MF trunk/struts/plugins/org.jboss.tools.struts/META-INF/MANIFEST.MF trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF/MANIFEST.MF trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF trunk/workingset/features/org.jboss.tools.workingset.feature/feature.xml trunk/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF trunk/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx/META-INF/MANIFEST.MF trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/META-INF/MANIFEST.MF trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF trunk/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF Log: fix line endings Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,39 +1,39 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.jboss.ide.eclipse.archives.core;singleton:=true -Bundle-Version: 3.1.0.qualifier -Bundle-Activator: org.jboss.ide.eclipse.archives.core.ArchivesCorePlugin -Bundle-Vendor: %Bundle-Vendor.0 -Bundle-Localization: plugin -Require-Bundle: org.apache.ant, - org.eclipse.core.commands, - org.eclipse.core.filesystem, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.core.variables -Bundle-ActivationPolicy: lazy -Bundle-ClassPath: archivescore.jar, - archivescore-eclipse.jar, - lib/concurrent-1.3.4.jar, - lib/jboss-xml-binding.jar, - lib/xercesImpl-2.9.1.jar, - lib/jboss-common-logging-log4j-2.0.4.GA.jar, - lib/jboss-common-logging-spi-2.0.4.GA.jar, - lib/jboss-common-core-2.2.1.GA.jar, - lib/truezip-6.6.jar -Export-Package: de.schlichtherle.io;x-friends:="org.jboss.ide.eclipse.archives.test", - org.jboss.ide.eclipse.archives.core, - org.jboss.ide.eclipse.archives.core.ant, - org.jboss.ide.eclipse.archives.core.asf, - org.jboss.ide.eclipse.archives.core.build, - org.jboss.ide.eclipse.archives.core.model, - org.jboss.ide.eclipse.archives.core.model.internal;x-friends:="org.jboss.ide.eclipse.archives.test", - org.jboss.ide.eclipse.archives.core.model.internal.xb;x-friends:="org.jboss.ide.eclipse.archives.test", - org.jboss.ide.eclipse.archives.core.model.other.internal, - org.jboss.ide.eclipse.archives.core.model.types, - org.jboss.ide.eclipse.archives.core.project, - org.jboss.ide.eclipse.archives.core.util;x-friends:="org.jboss.ide.eclipse.archives.test", - org.jboss.ide.eclipse.archives.core.util.internal;x-friends:="org.jboss.ide.eclipse.archives.test", - org.jboss.ide.eclipse.archives.core.xpl +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-SymbolicName: org.jboss.ide.eclipse.archives.core;singleton:=true +Bundle-Version: 3.1.0.qualifier +Bundle-Activator: org.jboss.ide.eclipse.archives.core.ArchivesCorePlugin +Bundle-Vendor: %Bundle-Vendor.0 +Bundle-Localization: plugin +Require-Bundle: org.apache.ant, + org.eclipse.core.commands, + org.eclipse.core.filesystem, + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.core.variables +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: archivescore.jar, + archivescore-eclipse.jar, + lib/concurrent-1.3.4.jar, + lib/jboss-xml-binding.jar, + lib/xercesImpl-2.9.1.jar, + lib/jboss-common-logging-log4j-2.0.4.GA.jar, + lib/jboss-common-logging-spi-2.0.4.GA.jar, + lib/jboss-common-core-2.2.1.GA.jar, + lib/truezip-6.6.jar +Export-Package: de.schlichtherle.io;x-friends:="org.jboss.ide.eclipse.archives.test", + org.jboss.ide.eclipse.archives.core, + org.jboss.ide.eclipse.archives.core.ant, + org.jboss.ide.eclipse.archives.core.asf, + org.jboss.ide.eclipse.archives.core.build, + org.jboss.ide.eclipse.archives.core.model, + org.jboss.ide.eclipse.archives.core.model.internal;x-friends:="org.jboss.ide.eclipse.archives.test", + org.jboss.ide.eclipse.archives.core.model.internal.xb;x-friends:="org.jboss.ide.eclipse.archives.test", + org.jboss.ide.eclipse.archives.core.model.other.internal, + org.jboss.ide.eclipse.archives.core.model.types, + org.jboss.ide.eclipse.archives.core.project, + org.jboss.ide.eclipse.archives.core.util;x-friends:="org.jboss.ide.eclipse.archives.test", + org.jboss.ide.eclipse.archives.core.util.internal;x-friends:="org.jboss.ide.eclipse.archives.test", + org.jboss.ide.eclipse.archives.core.xpl Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,26 +1,26 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.jboss.ide.eclipse.archives.ui;singleton:=true -Bundle-Version: 3.1.0.qualifier -Bundle-Activator: org.jboss.ide.eclipse.archives.ui.PackagesUIPlugin -Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, - org.eclipse.ui.ide, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.jboss.ide.eclipse.archives.core, - org.eclipse.debug.ui;bundle-version="3.4.0", - org.eclipse.core.variables;bundle-version="3.2.100", - org.eclipse.ui.navigator;bundle-version="3.3.100" -Bundle-ActivationPolicy: lazy -Export-Package: org.jboss.ide.eclipse.archives.ui, - org.jboss.ide.eclipse.archives.ui.actions, - org.jboss.ide.eclipse.archives.ui.preferences, - org.jboss.ide.eclipse.archives.ui.providers, - org.jboss.ide.eclipse.archives.ui.util.composites, - org.jboss.ide.eclipse.archives.ui.views, - org.jboss.ide.eclipse.archives.ui.wizards, - org.jboss.ide.eclipse.archives.ui.wizards.pages -Bundle-Vendor: %Bundle-Vendor.0 +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-SymbolicName: org.jboss.ide.eclipse.archives.ui;singleton:=true +Bundle-Version: 3.1.0.qualifier +Bundle-Activator: org.jboss.ide.eclipse.archives.ui.PackagesUIPlugin +Bundle-Localization: plugin +Require-Bundle: org.eclipse.ui, + org.eclipse.ui.ide, + org.eclipse.core.runtime, + org.eclipse.core.resources, + org.jboss.ide.eclipse.archives.core, + org.eclipse.debug.ui;bundle-version="3.4.0", + org.eclipse.core.variables;bundle-version="3.2.100", + org.eclipse.ui.navigator;bundle-version="3.3.100" +Bundle-ActivationPolicy: lazy +Export-Package: org.jboss.ide.eclipse.archives.ui, + org.jboss.ide.eclipse.archives.ui.actions, + org.jboss.ide.eclipse.archives.ui.preferences, + org.jboss.ide.eclipse.archives.ui.providers, + org.jboss.ide.eclipse.archives.ui.util.composites, + org.jboss.ide.eclipse.archives.ui.views, + org.jboss.ide.eclipse.archives.ui.wizards, + org.jboss.ide.eclipse.archives.ui.wizards.pages +Bundle-Vendor: %Bundle-Vendor.0 Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/birt/features/org.jboss.tools.birt.feature/feature.xml =================================================================== --- trunk/birt/features/org.jboss.tools.birt.feature/feature.xml 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/birt/features/org.jboss.tools.birt.feature/feature.xml 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,49 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.birt.feature" - label="%featureName" - version="1.1.0.qualifier" - provider-name="%providerName" - plugin="org.jboss.tools.birt.oda.ui"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <requires> - <import feature="org.eclipse.birt" version="2.5.0" match="greaterOrEqual"/> - <import feature="org.eclipse.birt.integration.wtp" version="2.5.0" match="greaterOrEqual"/> - <import feature="org.eclipse.birt.chart" version="2.5.0" match="greaterOrEqual"/> - <import feature="org.eclipse.birt.chart.integration.wtp" version="2.5.0" match="greaterOrEqual"/> - </requires> - - <plugin - id="org.jboss.tools.birt.oda" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.birt.oda.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.birt.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.birt.feature" + label="%featureName" + version="1.1.0.qualifier" + provider-name="%providerName" + plugin="org.jboss.tools.birt.oda.ui"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <requires> + <import feature="org.eclipse.birt" version="2.5.0" match="greaterOrEqual"/> + <import feature="org.eclipse.birt.integration.wtp" version="2.5.0" match="greaterOrEqual"/> + <import feature="org.eclipse.birt.chart" version="2.5.0" match="greaterOrEqual"/> + <import feature="org.eclipse.birt.chart.integration.wtp" version="2.5.0" match="greaterOrEqual"/> + </requires> + + <plugin + id="org.jboss.tools.birt.oda" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.birt.oda.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.birt.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,19 +1,19 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.model; singleton:=true -Bundle-Version: 0.5.0.qualifier -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.bpel.apache.ode.deploy.model.dd, - org.eclipse.bpel.apache.ode.deploy.model.dd.impl, - org.eclipse.bpel.apache.ode.deploy.model.dd.util -Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.bpel.model;bundle-version="[0.4.0,2.0.0)", - org.eclipse.wst.wsdl, - org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)", - org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - javax.wsdl;bundle-version="[1.5.0,1.6.0)" -Bundle-ActivationPolicy: lazy +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.model; singleton:=true +Bundle-Version: 0.5.0.qualifier +Bundle-Vendor: %providerName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Export-Package: org.eclipse.bpel.apache.ode.deploy.model.dd, + org.eclipse.bpel.apache.ode.deploy.model.dd.impl, + org.eclipse.bpel.apache.ode.deploy.model.dd.util +Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, + org.eclipse.bpel.model;bundle-version="[0.4.0,2.0.0)", + org.eclipse.wst.wsdl, + org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)", + org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", + javax.wsdl;bundle-version="[1.5.0,1.6.0)" +Bundle-ActivationPolicy: lazy Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,27 +1,27 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.ui; singleton:=true -Bundle-Version: 0.5.0.qualifier -Bundle-Activator: org.eclipse.bpel.apache.ode.deploy.ui.Activator -Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)", - org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", - org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)", - org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)", - org.eclipse.ui.forms;bundle-version="[3.3.100,4.0.0)", - org.eclipse.bpel.apache.ode.deploy.model;bundle-version="[0.4.0,2.0.0)", - org.eclipse.bpel.model;bundle-version="[0.4.0,2.0.0)", - org.eclipse.wst.wsdl, - org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)", - javax.wsdl;bundle-version="[1.5.0,1.6.0)", - org.eclipse.core.databinding;bundle-version="[1.1.0,2.0.0)", - org.eclipse.jface.databinding, - org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)", - org.eclipse.bpel.ui;bundle-version="[0.4.0,2.0.0)", - org.eclipse.jdt.core;bundle-version="[3.5.0,4.0.0)", - org.eclipse.wst.common.modulecore -Bundle-ActivationPolicy: lazy -Bundle-Vendor: %providerName +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.ui; singleton:=true +Bundle-Version: 0.5.0.qualifier +Bundle-Activator: org.eclipse.bpel.apache.ode.deploy.ui.Activator +Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", + org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", + org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)", + org.eclipse.ui.forms;bundle-version="[3.3.100,4.0.0)", + org.eclipse.bpel.apache.ode.deploy.model;bundle-version="[0.4.0,2.0.0)", + org.eclipse.bpel.model;bundle-version="[0.4.0,2.0.0)", + org.eclipse.wst.wsdl, + org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)", + javax.wsdl;bundle-version="[1.5.0,1.6.0)", + org.eclipse.core.databinding;bundle-version="[1.1.0,2.0.0)", + org.eclipse.jface.databinding, + org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)", + org.eclipse.bpel.ui;bundle-version="[0.4.0,2.0.0)", + org.eclipse.jdt.core;bundle-version="[3.5.0,4.0.0)", + org.eclipse.wst.common.modulecore +Bundle-ActivationPolicy: lazy +Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,61 +1,61 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.bpel.common.model; singleton:=true -Bundle-Version: 0.5.0.qualifier -Bundle-Activator: org.eclipse.bpel.common.extension.model.Activator -Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)" -Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.bpel.common, - org.eclipse.bpel.common.extension.model; - uses:="org.eclipse.core.runtime, - org.eclipse.emf.ecore, - org.eclipse.emf.common.util, - org.osgi.framework, - org.eclipse.emf.common.notify", - org.eclipse.bpel.common.extension.model.adapters;uses:="org.eclipse.emf.ecore,org.eclipse.bpel.common.extension.model,org.eclipse.emf.common.notify", - org.eclipse.bpel.common.extension.model.adapters.impl; - uses:="org.eclipse.emf.ecore, - org.eclipse.emf.common.notify.impl, - org.eclipse.bpel.common.extension.model, - org.eclipse.emf.common.notify, - org.eclipse.bpel.common.extension.model.adapters", - org.eclipse.bpel.common.extension.model.impl; - uses:="org.eclipse.emf.ecore, - org.eclipse.emf.common.util, - org.eclipse.bpel.common.extension.model, - org.eclipse.emf.ecore.impl, - org.eclipse.emf.common.notify, - org.eclipse.bpel.common.extension.model.adapters", - org.eclipse.bpel.common.extension.model.notify;uses:="org.eclipse.emf.common.notify", - org.eclipse.bpel.common.extension.model.notify.impl;uses:="org.eclipse.emf.ecore,org.eclipse.bpel.common.extension.model.notify,org.eclipse.emf.common.notify.impl", - org.eclipse.bpel.common.extension.model.util; - uses:="org.eclipse.emf.ecore, - org.eclipse.emf.common.notify.impl, - org.eclipse.bpel.common.extension.model, - org.eclipse.emf.common.notify", - org.eclipse.bpel.fnmeta, - org.eclipse.bpel.fnmeta.model;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util", - org.eclipse.bpel.fnmeta.model.impl; - uses:="org.eclipse.emf.ecore, - org.eclipse.emf.common.util, - org.eclipse.bpel.fnmeta.model, - org.eclipse.emf.common.notify, - org.eclipse.emf.ecore.impl", - org.eclipse.bpel.fnmeta.model.proxy, - org.eclipse.bpel.fnmeta.model.util; - uses:="org.eclipse.emf.ecore.xmi.impl, - org.eclipse.emf.ecore.resource, - org.eclipse.emf.ecore, - org.eclipse.emf.common.notify.impl, - org.eclipse.emf.common.util, - org.eclipse.bpel.fnmeta.model, - org.eclipse.emf.common.notify, - org.eclipse.emf.ecore.resource.impl, - org.eclipse.emf.ecore.xmi.util", - org.eclipse.bpel.names -Bundle-Vendor: %providerName -Bundle-ClassPath: . -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.bpel.common.model; singleton:=true +Bundle-Version: 0.5.0.qualifier +Bundle-Activator: org.eclipse.bpel.common.extension.model.Activator +Bundle-Localization: plugin +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)" +Bundle-ActivationPolicy: lazy +Export-Package: org.eclipse.bpel.common, + org.eclipse.bpel.common.extension.model; + uses:="org.eclipse.core.runtime, + org.eclipse.emf.ecore, + org.eclipse.emf.common.util, + org.osgi.framework, + org.eclipse.emf.common.notify", + org.eclipse.bpel.common.extension.model.adapters;uses:="org.eclipse.emf.ecore,org.eclipse.bpel.common.extension.model,org.eclipse.emf.common.notify", + org.eclipse.bpel.common.extension.model.adapters.impl; + uses:="org.eclipse.emf.ecore, + org.eclipse.emf.common.notify.impl, + org.eclipse.bpel.common.extension.model, + org.eclipse.emf.common.notify, + org.eclipse.bpel.common.extension.model.adapters", + org.eclipse.bpel.common.extension.model.impl; + uses:="org.eclipse.emf.ecore, + org.eclipse.emf.common.util, + org.eclipse.bpel.common.extension.model, + org.eclipse.emf.ecore.impl, + org.eclipse.emf.common.notify, + org.eclipse.bpel.common.extension.model.adapters", + org.eclipse.bpel.common.extension.model.notify;uses:="org.eclipse.emf.common.notify", + org.eclipse.bpel.common.extension.model.notify.impl;uses:="org.eclipse.emf.ecore,org.eclipse.bpel.common.extension.model.notify,org.eclipse.emf.common.notify.impl", + org.eclipse.bpel.common.extension.model.util; + uses:="org.eclipse.emf.ecore, + org.eclipse.emf.common.notify.impl, + org.eclipse.bpel.common.extension.model, + org.eclipse.emf.common.notify", + org.eclipse.bpel.fnmeta, + org.eclipse.bpel.fnmeta.model;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util", + org.eclipse.bpel.fnmeta.model.impl; + uses:="org.eclipse.emf.ecore, + org.eclipse.emf.common.util, + org.eclipse.bpel.fnmeta.model, + org.eclipse.emf.common.notify, + org.eclipse.emf.ecore.impl", + org.eclipse.bpel.fnmeta.model.proxy, + org.eclipse.bpel.fnmeta.model.util; + uses:="org.eclipse.emf.ecore.xmi.impl, + org.eclipse.emf.ecore.resource, + org.eclipse.emf.ecore, + org.eclipse.emf.common.notify.impl, + org.eclipse.emf.common.util, + org.eclipse.bpel.fnmeta.model, + org.eclipse.emf.common.notify, + org.eclipse.emf.ecore.resource.impl, + org.eclipse.emf.ecore.xmi.util", + org.eclipse.bpel.names +Bundle-Vendor: %providerName +Bundle-ClassPath: . +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,33 +1,33 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.bpel.common.ui; singleton:=true -Bundle-Version: 0.5.0.qualifier -Bundle-Activator: org.eclipse.bpel.common.ui.CommonUIPlugin -Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)", - org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", - org.eclipse.gef;bundle-version="[3.4.0,4.0.0)", - org.eclipse.emf.ecore.change;bundle-version="[2.4.0,3.0.0)", - org.eclipse.bpel.model;bundle-version="[0.4.0,1.0.0)" -Eclipse-LazyStart: true -Export-Package: org.eclipse.bpel.common.ui, - org.eclipse.bpel.common.ui.assist, - org.eclipse.bpel.common.ui.calendar, - org.eclipse.bpel.common.ui.command, - org.eclipse.bpel.common.ui.composite, - org.eclipse.bpel.common.ui.decorator, - org.eclipse.bpel.common.ui.details, - org.eclipse.bpel.common.ui.details.viewers, - org.eclipse.bpel.common.ui.details.widgets, - org.eclipse.bpel.common.ui.editmodel, - org.eclipse.bpel.common.ui.figures, - org.eclipse.bpel.common.ui.flatui, - org.eclipse.bpel.common.ui.layouts, - org.eclipse.bpel.common.ui.markers, - org.eclipse.bpel.common.ui.palette, - org.eclipse.bpel.common.ui.tray -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-Vendor: %providerName +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.bpel.common.ui; singleton:=true +Bundle-Version: 0.5.0.qualifier +Bundle-Activator: org.eclipse.bpel.common.ui.CommonUIPlugin +Bundle-Localization: plugin +Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", + org.eclipse.gef;bundle-version="[3.4.0,4.0.0)", + org.eclipse.emf.ecore.change;bundle-version="[2.4.0,3.0.0)", + org.eclipse.bpel.model;bundle-version="[0.4.0,1.0.0)" +Eclipse-LazyStart: true +Export-Package: org.eclipse.bpel.common.ui, + org.eclipse.bpel.common.ui.assist, + org.eclipse.bpel.common.ui.calendar, + org.eclipse.bpel.common.ui.command, + org.eclipse.bpel.common.ui.composite, + org.eclipse.bpel.common.ui.decorator, + org.eclipse.bpel.common.ui.details, + org.eclipse.bpel.common.ui.details.viewers, + org.eclipse.bpel.common.ui.details.widgets, + org.eclipse.bpel.common.ui.editmodel, + org.eclipse.bpel.common.ui.figures, + org.eclipse.bpel.common.ui.flatui, + org.eclipse.bpel.common.ui.layouts, + org.eclipse.bpel.common.ui.markers, + org.eclipse.bpel.common.ui.palette, + org.eclipse.bpel.common.ui.tray +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Vendor: %providerName Modified: trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,32 +1,32 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.bpel.model; singleton:=true -Bundle-Version: 0.5.0.qualifier -Bundle-Activator: org.eclipse.bpel.model.BPELPlugin$Implementation -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", - org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)", - org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)", - org.eclipse.wst.wsdl, - org.apache.xerces;bundle-version="[2.9.0,3.0.0)", - javax.wsdl;bundle-version="[1.5.0,1.6.0)", - org.eclipse.bpel.common.model;bundle-version="[0.4.0,2.0.0)" -Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.bpel.model, - org.eclipse.bpel.model.adapters, - org.eclipse.bpel.model.extensions, - org.eclipse.bpel.model.impl, - org.eclipse.bpel.model.messageproperties, - org.eclipse.bpel.model.messageproperties.util, - org.eclipse.bpel.model.partnerlinktype, - org.eclipse.bpel.model.partnerlinktype.util, - org.eclipse.bpel.model.proxy, - org.eclipse.bpel.model.reordering, - org.eclipse.bpel.model.reordering.extensions, - org.eclipse.bpel.model.resource, - org.eclipse.bpel.model.terms, - org.eclipse.bpel.model.util -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.bpel.model; singleton:=true +Bundle-Version: 0.5.0.qualifier +Bundle-Activator: org.eclipse.bpel.model.BPELPlugin$Implementation +Bundle-Vendor: %providerName +Bundle-Localization: plugin +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)", + org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)", + org.eclipse.wst.wsdl, + org.apache.xerces;bundle-version="[2.9.0,3.0.0)", + javax.wsdl;bundle-version="[1.5.0,1.6.0)", + org.eclipse.bpel.common.model;bundle-version="[0.4.0,2.0.0)" +Bundle-ActivationPolicy: lazy +Export-Package: org.eclipse.bpel.model, + org.eclipse.bpel.model.adapters, + org.eclipse.bpel.model.extensions, + org.eclipse.bpel.model.impl, + org.eclipse.bpel.model.messageproperties, + org.eclipse.bpel.model.messageproperties.util, + org.eclipse.bpel.model.partnerlinktype, + org.eclipse.bpel.model.partnerlinktype.util, + org.eclipse.bpel.model.proxy, + org.eclipse.bpel.model.reordering, + org.eclipse.bpel.model.reordering.extensions, + org.eclipse.bpel.model.resource, + org.eclipse.bpel.model.terms, + org.eclipse.bpel.model.util +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,69 +1,69 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.bpel.ui; singleton:=true -Bundle-Version: 0.5.0.qualifier -Bundle-Activator: org.eclipse.bpel.ui.BPELUIPlugin -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", - org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)", - org.eclipse.ui.views.properties.tabbed;bundle-version="[3.4.0,4.0.0)", - org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)", - org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)", - org.eclipse.jface.text, - org.eclipse.gef;bundle-version="[3.4.0,4.0.0)", - org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)", - org.eclipse.bpel.common.ui;bundle-version="[0.5.0,1.0.0)", - org.eclipse.wst.wsdl, - org.eclipse.bpel.common.ui;bundle-version="[0.4.0,2.0.0)", - org.eclipse.bpel.common.model;bundle-version="[0.4.0,2.0.0)", - org.eclipse.bpel.model;bundle-version="[0.4.0,2.0.0)", - org.eclipse.wst.xml.core, - org.eclipse.bpel.wsil.model;bundle-version="[0.4.0,2.0.0)", - org.eclipse.wst.sse.ui, - org.eclipse.wst.sse.core, - javax.wsdl;bundle-version="[1.5.0,1.6.0)", - org.eclipse.wst.xsd.ui, - org.eclipse.wst.wsdl.ui, - org.eclipse.wst.xml.ui -Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.bpel.ui, - org.eclipse.bpel.ui.actions, - org.eclipse.bpel.ui.actions.editpart, - org.eclipse.bpel.ui.adapters, - org.eclipse.bpel.ui.adapters.delegates, - org.eclipse.bpel.ui.bpelactions, - org.eclipse.bpel.ui.commands, - org.eclipse.bpel.ui.commands.util, - org.eclipse.bpel.ui.contentassist, - org.eclipse.bpel.ui.details.providers, - org.eclipse.bpel.ui.details.tree, - org.eclipse.bpel.ui.dialogs, - org.eclipse.bpel.ui.editors, - org.eclipse.bpel.ui.editors.xpath, - org.eclipse.bpel.ui.editors.xpath.rules, - org.eclipse.bpel.ui.editors.xpath.templates, - org.eclipse.bpel.ui.editparts, - org.eclipse.bpel.ui.editparts.borders, - org.eclipse.bpel.ui.editparts.figures, - org.eclipse.bpel.ui.editparts.policies, - org.eclipse.bpel.ui.editparts.util, - org.eclipse.bpel.ui.expressions, - org.eclipse.bpel.ui.extensions, - org.eclipse.bpel.ui.factories, - org.eclipse.bpel.ui.figures, - org.eclipse.bpel.ui.palette, - org.eclipse.bpel.ui.preferences, - org.eclipse.bpel.ui.properties, - org.eclipse.bpel.ui.proposal.providers, - org.eclipse.bpel.ui.uiextensionmodel, - org.eclipse.bpel.ui.uiextensionmodel.impl, - org.eclipse.bpel.ui.uiextensionmodel.util, - org.eclipse.bpel.ui.util, - org.eclipse.bpel.ui.util.filedialog, - org.eclipse.bpel.ui.util.marker, - org.eclipse.bpel.ui.wizards -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.bpel.validator +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.bpel.ui; singleton:=true +Bundle-Version: 0.5.0.qualifier +Bundle-Activator: org.eclipse.bpel.ui.BPELUIPlugin +Bundle-Vendor: %providerName +Bundle-Localization: plugin +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)", + org.eclipse.ui.views.properties.tabbed;bundle-version="[3.4.0,4.0.0)", + org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)", + org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)", + org.eclipse.jface.text, + org.eclipse.gef;bundle-version="[3.4.0,4.0.0)", + org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)", + org.eclipse.bpel.common.ui;bundle-version="[0.5.0,1.0.0)", + org.eclipse.wst.wsdl, + org.eclipse.bpel.common.ui;bundle-version="[0.4.0,2.0.0)", + org.eclipse.bpel.common.model;bundle-version="[0.4.0,2.0.0)", + org.eclipse.bpel.model;bundle-version="[0.4.0,2.0.0)", + org.eclipse.wst.xml.core, + org.eclipse.bpel.wsil.model;bundle-version="[0.4.0,2.0.0)", + org.eclipse.wst.sse.ui, + org.eclipse.wst.sse.core, + javax.wsdl;bundle-version="[1.5.0,1.6.0)", + org.eclipse.wst.xsd.ui, + org.eclipse.wst.wsdl.ui, + org.eclipse.wst.xml.ui +Bundle-ActivationPolicy: lazy +Export-Package: org.eclipse.bpel.ui, + org.eclipse.bpel.ui.actions, + org.eclipse.bpel.ui.actions.editpart, + org.eclipse.bpel.ui.adapters, + org.eclipse.bpel.ui.adapters.delegates, + org.eclipse.bpel.ui.bpelactions, + org.eclipse.bpel.ui.commands, + org.eclipse.bpel.ui.commands.util, + org.eclipse.bpel.ui.contentassist, + org.eclipse.bpel.ui.details.providers, + org.eclipse.bpel.ui.details.tree, + org.eclipse.bpel.ui.dialogs, + org.eclipse.bpel.ui.editors, + org.eclipse.bpel.ui.editors.xpath, + org.eclipse.bpel.ui.editors.xpath.rules, + org.eclipse.bpel.ui.editors.xpath.templates, + org.eclipse.bpel.ui.editparts, + org.eclipse.bpel.ui.editparts.borders, + org.eclipse.bpel.ui.editparts.figures, + org.eclipse.bpel.ui.editparts.policies, + org.eclipse.bpel.ui.editparts.util, + org.eclipse.bpel.ui.expressions, + org.eclipse.bpel.ui.extensions, + org.eclipse.bpel.ui.factories, + org.eclipse.bpel.ui.figures, + org.eclipse.bpel.ui.palette, + org.eclipse.bpel.ui.preferences, + org.eclipse.bpel.ui.properties, + org.eclipse.bpel.ui.proposal.providers, + org.eclipse.bpel.ui.uiextensionmodel, + org.eclipse.bpel.ui.uiextensionmodel.impl, + org.eclipse.bpel.ui.uiextensionmodel.util, + org.eclipse.bpel.ui.util, + org.eclipse.bpel.ui.util.filedialog, + org.eclipse.bpel.ui.util.marker, + org.eclipse.bpel.ui.wizards +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: org.eclipse.bpel.validator Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,36 +1,36 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.bpel.validator;singleton:=true -Bundle-Version: 0.5.0.qualifier -Bundle-Activator: org.eclipse.bpel.validator.Activator -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)", - org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)", - org.eclipse.wst.wsdl, - org.eclipse.bpel.model;bundle-version="[0.4.0,2.0.0)", - org.eclipse.bpel.common.model;bundle-version="[0.4.0,2.0.0)", - org.eclipse.wst.validation, - org.eclipse.wst.wsdl.validation, - org.eclipse.wst.xml.core, - org.eclipse.bpel.xpath10;bundle-version="[0.4.0,1.0.0)", - javax.wsdl;bundle-version="[1.5.0,1.6.0)" -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ClassPath: . -Export-Package: org.eclipse.bpel.validator, - org.eclipse.bpel.validator.adapters, - org.eclipse.bpel.validator.factory, - org.eclipse.bpel.validator.helpers, - org.eclipse.bpel.validator.model, - org.eclipse.bpel.validator.plt, - org.eclipse.bpel.validator.rules, - org.eclipse.bpel.validator.tools, - org.eclipse.bpel.validator.unsupported, - org.eclipse.bpel.validator.vprop, - org.eclipse.bpel.validator.wsdl, - org.eclipse.bpel.validator.xpath, - org.eclipse.bpel.validator.xpath0 +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.bpel.validator;singleton:=true +Bundle-Version: 0.5.0.qualifier +Bundle-Activator: org.eclipse.bpel.validator.Activator +Bundle-Vendor: %providerName +Bundle-Localization: plugin +Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)", + org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", + org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)", + org.eclipse.wst.wsdl, + org.eclipse.bpel.model;bundle-version="[0.4.0,2.0.0)", + org.eclipse.bpel.common.model;bundle-version="[0.4.0,2.0.0)", + org.eclipse.wst.validation, + org.eclipse.wst.wsdl.validation, + org.eclipse.wst.xml.core, + org.eclipse.bpel.xpath10;bundle-version="[0.4.0,1.0.0)", + javax.wsdl;bundle-version="[1.5.0,1.6.0)" +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-ClassPath: . +Export-Package: org.eclipse.bpel.validator, + org.eclipse.bpel.validator.adapters, + org.eclipse.bpel.validator.factory, + org.eclipse.bpel.validator.helpers, + org.eclipse.bpel.validator.model, + org.eclipse.bpel.validator.plt, + org.eclipse.bpel.validator.rules, + org.eclipse.bpel.validator.tools, + org.eclipse.bpel.validator.unsupported, + org.eclipse.bpel.validator.vprop, + org.eclipse.bpel.validator.wsdl, + org.eclipse.bpel.validator.xpath, + org.eclipse.bpel.validator.xpath0 Modified: trunk/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,30 +1,30 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.bpel.wsil.model; singleton:=true -Bundle-Version: 0.5.0.qualifier -Bundle-ClassPath: wsli-model.jar -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Export-Package: org.eclipse.bpel.wsil.model.inspection;uses:="org.eclipse.emf.ecore.util,org.eclipse.emf.ecore,org.eclipse.emf.common.util", - org.eclipse.bpel.wsil.model.inspection.impl; - uses:="org.eclipse.emf.ecore.util, - org.eclipse.emf.ecore, - org.eclipse.emf.common.util, - org.eclipse.emf.ecore.impl, - org.eclipse.emf.common.notify, - org.eclipse.bpel.wsil.model.inspection", - org.eclipse.bpel.wsil.model.inspection.util; - uses:="org.eclipse.emf.ecore.resource, - org.eclipse.emf.ecore.xmi.impl, - org.eclipse.emf.ecore, - org.eclipse.emf.common.notify.impl, - org.eclipse.emf.common.util, - org.eclipse.emf.common.notify, - org.eclipse.emf.ecore.xmi.util, - org.eclipse.emf.ecore.resource.impl, - org.eclipse.bpel.wsil.model.inspection" -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)";visibility:=reexport -Eclipse-LazyStart: true -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.bpel.wsil.model; singleton:=true +Bundle-Version: 0.5.0.qualifier +Bundle-ClassPath: wsli-model.jar +Bundle-Vendor: %providerName +Bundle-Localization: plugin +Export-Package: org.eclipse.bpel.wsil.model.inspection;uses:="org.eclipse.emf.ecore.util,org.eclipse.emf.ecore,org.eclipse.emf.common.util", + org.eclipse.bpel.wsil.model.inspection.impl; + uses:="org.eclipse.emf.ecore.util, + org.eclipse.emf.ecore, + org.eclipse.emf.common.util, + org.eclipse.emf.ecore.impl, + org.eclipse.emf.common.notify, + org.eclipse.bpel.wsil.model.inspection", + org.eclipse.bpel.wsil.model.inspection.util; + uses:="org.eclipse.emf.ecore.resource, + org.eclipse.emf.ecore.xmi.impl, + org.eclipse.emf.ecore, + org.eclipse.emf.common.notify.impl, + org.eclipse.emf.common.util, + org.eclipse.emf.common.notify, + org.eclipse.emf.ecore.xmi.util, + org.eclipse.emf.ecore.resource.impl, + org.eclipse.bpel.wsil.model.inspection" +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)";visibility:=reexport +Eclipse-LazyStart: true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,16 +1,16 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.bpel.xpath10 -Bundle-Version: 0.5.0.qualifier -Bundle-Localization: plugin -Bundle-ClassPath: ., - lib/antlr-runtime-3.0.1.jar -Export-Package: org.antlr.runtime;uses:="org.antlr.runtime.tree", - org.antlr.runtime.debug;uses:="org.antlr.runtime.tree,org.antlr.runtime", - org.antlr.runtime.misc, - org.antlr.runtime.tree;uses:="org.antlr.runtime,org.antlr.stringtemplate", - org.eclipse.bpel.xpath10, - org.eclipse.bpel.xpath10.parser;uses:="org.antlr.runtime.tree,org.antlr.runtime,org.eclipse.bpel.xpath10" -Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.bpel.xpath10 +Bundle-Version: 0.5.0.qualifier +Bundle-Localization: plugin +Bundle-ClassPath: ., + lib/antlr-runtime-3.0.1.jar +Export-Package: org.antlr.runtime;uses:="org.antlr.runtime.tree", + org.antlr.runtime.debug;uses:="org.antlr.runtime.tree,org.antlr.runtime", + org.antlr.runtime.misc, + org.antlr.runtime.tree;uses:="org.antlr.runtime,org.antlr.stringtemplate", + org.eclipse.bpel.xpath10, + org.eclipse.bpel.xpath10.parser;uses:="org.antlr.runtime.tree,org.antlr.runtime,org.eclipse.bpel.xpath10" +Bundle-Vendor: %providerName +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,40 +1,40 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.jboss.tools.bpel.runtimes;singleton:=true -Bundle-Version: 0.4.0.qualifier -Bundle-Activator: org.jboss.tools.bpel.runtimes.RuntimesPlugin -Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.wst.server.core, - org.eclipse.wst.web.ui, - org.eclipse.wst.common.project.facet.ui, - org.eclipse.wst.common.modulecore, - org.eclipse.wst.common.frameworks, - org.eclipse.wst.common.project.facet.core, - org.eclipse.wst.common.frameworks.ui, - org.eclipse.jst.server.generic.core, - org.eclipse.jem.util, - org.eclipse.debug.ui, - org.eclipse.bpel.model, - org.eclipse.emf.ecore, - org.eclipse.wst.wsdl, - javax.wsdl, - org.eclipse.jst.common.frameworks, - org.jboss.ide.eclipse.as.wtp.core, - org.eclipse.wst.web, - org.jboss.ide.eclipse.as.core;resolution:=optional, - org.jboss.ide.eclipse.archives.webtools;resolution:=optional, - org.jboss.tools.jmx.core;resolution:=optional, - org.eclipse.wst.server.ui;resolution:=optional, - org.eclipse.ui.navigator -Eclipse-LazyStart: true -Export-Package: org.jboss.tools.bpel.runtimes, - org.jboss.tools.bpel.runtimes.facets, - org.jboss.tools.bpel.runtimes.module, - org.jboss.tools.bpel.runtimes.ui.wizards -Bundle-ClassPath: . -Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.jboss.tools.bpel.runtimes;singleton:=true +Bundle-Version: 0.4.0.qualifier +Bundle-Activator: org.jboss.tools.bpel.runtimes.RuntimesPlugin +Bundle-Localization: plugin +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.core.resources, + org.eclipse.wst.server.core, + org.eclipse.wst.web.ui, + org.eclipse.wst.common.project.facet.ui, + org.eclipse.wst.common.modulecore, + org.eclipse.wst.common.frameworks, + org.eclipse.wst.common.project.facet.core, + org.eclipse.wst.common.frameworks.ui, + org.eclipse.jst.server.generic.core, + org.eclipse.jem.util, + org.eclipse.debug.ui, + org.eclipse.bpel.model, + org.eclipse.emf.ecore, + org.eclipse.wst.wsdl, + javax.wsdl, + org.eclipse.jst.common.frameworks, + org.jboss.ide.eclipse.as.wtp.core, + org.eclipse.wst.web, + org.jboss.ide.eclipse.as.core;resolution:=optional, + org.jboss.ide.eclipse.archives.webtools;resolution:=optional, + org.jboss.tools.jmx.core;resolution:=optional, + org.eclipse.wst.server.ui;resolution:=optional, + org.eclipse.ui.navigator +Eclipse-LazyStart: true +Export-Package: org.jboss.tools.bpel.runtimes, + org.jboss.tools.bpel.runtimes.facets, + org.jboss.tools.bpel.runtimes.module, + org.jboss.tools.bpel.runtimes.ui.wizards +Bundle-ClassPath: . +Bundle-Vendor: %providerName +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,29 +1,29 @@ -Manifest-Version: 1.0 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-Activator: org.jboss.tools.cdi.xml.CDIXMLPlugin -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.cdi.xml;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.cdi.xml, - org.jboss.tools.cdi.xml.beans.model -Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport, - org.eclipse.ui.ide, - org.eclipse.ui.views, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.ui.editors, - org.eclipse.jdt.core, - org.eclipse.jdt.ui, - org.eclipse.ui, - org.eclipse.jface, - org.eclipse.wst.sse.core, - org.eclipse.ltk.core.refactoring, - org.eclipse.ltk.ui.refactoring, - org.eclipse.wst.xml.core, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.wst.web -Bundle-Version: 1.0.0.qualifier +Manifest-Version: 1.0 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Activator: org.jboss.tools.cdi.xml.CDIXMLPlugin +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.cdi.xml;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.cdi.xml, + org.jboss.tools.cdi.xml.beans.model +Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport, + org.eclipse.ui.ide, + org.eclipse.ui.views, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.ui.editors, + org.eclipse.jdt.core, + org.eclipse.jdt.ui, + org.eclipse.ui, + org.eclipse.jface, + org.eclipse.wst.sse.core, + org.eclipse.ltk.core.refactoring, + org.eclipse.ltk.ui.refactoring, + org.eclipse.wst.xml.core, + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.wst.web +Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,35 +1,35 @@ -Manifest-Version: 1.0 -Eclipse-LazyStart: true -Bundle-Name: %pluginName -Bundle-Activator: org.jboss.tools.cdi.xml.ui.CDIXMLUiPlugin -Bundle-Vendor: %providerName -Provide-Package: org.jboss.tools.cdi.xml.ui, - org.jboss.tools.cdi.xml.ui.editor.form -Bundle-SymbolicName: org.jboss.tools.cdi.xml.ui; singleton:=true -Bundle-Localization: plugin -Require-Bundle: org.eclipse.jface.text, - org.eclipse.jdt.ui, - org.eclipse.wst.sse.ui, - org.eclipse.wst.xml.core, - org.eclipse.wst.xml.ui, - org.eclipse.wst.common.frameworks.ui, - org.eclipse.wst.common.ui, - org.eclipse.compare, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.jface, - org.eclipse.ui, - org.eclipse.draw2d, - org.eclipse.gef, - org.eclipse.ui.ide, - org.eclipse.ui.workbench.texteditor, - org.eclipse.core.expressions, - org.eclipse.ui.views, - org.jboss.tools.common.model, - org.jboss.tools.common.model.ui, - org.jboss.tools.common.text.xml, - org.jboss.tools.jst.web, - org.jboss.tools.jst.web.ui, - org.jboss.tools.cdi.xml -Bundle-Version: 1.0.0.qualifier +Manifest-Version: 1.0 +Eclipse-LazyStart: true +Bundle-Name: %pluginName +Bundle-Activator: org.jboss.tools.cdi.xml.ui.CDIXMLUiPlugin +Bundle-Vendor: %providerName +Provide-Package: org.jboss.tools.cdi.xml.ui, + org.jboss.tools.cdi.xml.ui.editor.form +Bundle-SymbolicName: org.jboss.tools.cdi.xml.ui; singleton:=true +Bundle-Localization: plugin +Require-Bundle: org.eclipse.jface.text, + org.eclipse.jdt.ui, + org.eclipse.wst.sse.ui, + org.eclipse.wst.xml.core, + org.eclipse.wst.xml.ui, + org.eclipse.wst.common.frameworks.ui, + org.eclipse.wst.common.ui, + org.eclipse.compare, + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.jface, + org.eclipse.ui, + org.eclipse.draw2d, + org.eclipse.gef, + org.eclipse.ui.ide, + org.eclipse.ui.workbench.texteditor, + org.eclipse.core.expressions, + org.eclipse.ui.views, + org.jboss.tools.common.model, + org.jboss.tools.common.model.ui, + org.jboss.tools.common.text.xml, + org.jboss.tools.jst.web, + org.jboss.tools.jst.web.ui, + org.jboss.tools.cdi.xml +Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,33 +1,33 @@ -Manifest-Version: 1.0 -Bundle-Name: %Bundle-Name.0 -Bundle-ClassPath: . -Bundle-Activator: org.jboss.tools.common.CommonPlugin -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.common;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.common, - org.jboss.tools.common.java, - org.jboss.tools.common.log, - org.jboss.tools.common.preferences, - org.jboss.tools.common.reporting, - org.jboss.tools.common.text, - org.jboss.tools.common.util, - org.jboss.tools.common.xml, - org.jboss.tools.common.zip -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.wst.xml.core;visibility:=reexport, - org.eclipse.jface, - org.eclipse.core.resources, - org.eclipse.ui, - org.eclipse.ui.ide, - org.eclipse.wst.common.uriresolver;visibility:=reexport, - org.eclipse.core.net, - org.eclipse.jdt.core, - org.eclipse.jdt.ui, - org.eclipse.ui.workbench.texteditor, - org.eclipse.jface.text, - org.apache.commons.httpclient;bundle-version="3.1.0" -Bundle-Version: 3.1.0.qualifier -Bundle-ActivationPolicy: lazy -Bundle-ManifestVersion: 2 +Manifest-Version: 1.0 +Bundle-Name: %Bundle-Name.0 +Bundle-ClassPath: . +Bundle-Activator: org.jboss.tools.common.CommonPlugin +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.common;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.common, + org.jboss.tools.common.java, + org.jboss.tools.common.log, + org.jboss.tools.common.preferences, + org.jboss.tools.common.reporting, + org.jboss.tools.common.text, + org.jboss.tools.common.util, + org.jboss.tools.common.xml, + org.jboss.tools.common.zip +Require-Bundle: org.eclipse.core.runtime, + org.eclipse.wst.xml.core;visibility:=reexport, + org.eclipse.jface, + org.eclipse.core.resources, + org.eclipse.ui, + org.eclipse.ui.ide, + org.eclipse.wst.common.uriresolver;visibility:=reexport, + org.eclipse.core.net, + org.eclipse.jdt.core, + org.eclipse.jdt.ui, + org.eclipse.ui.workbench.texteditor, + org.eclipse.jface.text, + org.apache.commons.httpclient;bundle-version="3.1.0" +Bundle-Version: 3.1.0.qualifier +Bundle-ActivationPolicy: lazy +Bundle-ManifestVersion: 2 Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/common/plugins/org.jboss.tools.common.gef/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.gef/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/common/plugins/org.jboss.tools.common.gef/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,31 +1,31 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.common.gef -Bundle-Localization: plugin -Export-Package: org.jboss.tools.common.gef, - org.jboss.tools.common.gef.action, - org.jboss.tools.common.gef.alignment.xpl, - org.jboss.tools.common.gef.edit, - org.jboss.tools.common.gef.edit.xpl, - org.jboss.tools.common.gef.editor.xpl, - org.jboss.tools.common.gef.figures, - org.jboss.tools.common.gef.figures.xpl, - org.jboss.tools.common.gef.outline.xpl, - org.jboss.tools.common.gef.xpl -Require-Bundle: org.jboss.tools.common, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.ui.editors, - org.eclipse.ui.ide, - org.eclipse.swt, - org.eclipse.ui, - org.eclipse.ui.views, - org.eclipse.draw2d, - org.eclipse.gef, - org.eclipse.core.runtime, - org.eclipse.core.resources -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.common.gef +Bundle-Localization: plugin +Export-Package: org.jboss.tools.common.gef, + org.jboss.tools.common.gef.action, + org.jboss.tools.common.gef.alignment.xpl, + org.jboss.tools.common.gef.edit, + org.jboss.tools.common.gef.edit.xpl, + org.jboss.tools.common.gef.editor.xpl, + org.jboss.tools.common.gef.figures, + org.jboss.tools.common.gef.figures.xpl, + org.jboss.tools.common.gef.outline.xpl, + org.jboss.tools.common.gef.xpl +Require-Bundle: org.jboss.tools.common, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.ui.editors, + org.eclipse.ui.ide, + org.eclipse.swt, + org.eclipse.ui, + org.eclipse.ui.views, + org.eclipse.draw2d, + org.eclipse.gef, + org.eclipse.core.runtime, + org.eclipse.core.resources +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,33 +1,33 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.jboss.tools.common.meta.ui;singleton:=true -Bundle-Version: 3.1.0.qualifier -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Require-Bundle: org.jboss.tools.common.model, - org.eclipse.jdt.core, - org.eclipse.ui, - org.eclipse.ui.ide;resolution:=optional, - org.eclipse.ui.views;resolution:=optional, - org.eclipse.ui.editors;resolution:=optional, - org.eclipse.jface.text;resolution:=optional, - org.eclipse.ui.workbench.texteditor;resolution:=optional, - org.eclipse.ui.ide, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.jdt.ui, - org.eclipse.help, - org.eclipse.help.base;resolution:=optional, - org.eclipse.search, - org.eclipse.debug.core, - org.jboss.tools.common.model.ui, - org.eclipse.wst.web -Bundle-ActivationPolicy: lazy -Export-Package: org.jboss.tools.common.meta.ui.editor, - org.jboss.tools.common.meta.ui, - org.jboss.tools.common.meta.ui.form, - org.jboss.tools.common.meta.ui.attribute.editor, - org.jboss.tools.common.meta.ui.search -Bundle-Activator: org.jboss.tools.common.meta.ui.MetaUIPlugin +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-SymbolicName: org.jboss.tools.common.meta.ui;singleton:=true +Bundle-Version: 3.1.0.qualifier +Bundle-Vendor: %providerName +Bundle-Localization: plugin +Require-Bundle: org.jboss.tools.common.model, + org.eclipse.jdt.core, + org.eclipse.ui, + org.eclipse.ui.ide;resolution:=optional, + org.eclipse.ui.views;resolution:=optional, + org.eclipse.ui.editors;resolution:=optional, + org.eclipse.jface.text;resolution:=optional, + org.eclipse.ui.workbench.texteditor;resolution:=optional, + org.eclipse.ui.ide, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.jdt.ui, + org.eclipse.help, + org.eclipse.help.base;resolution:=optional, + org.eclipse.search, + org.eclipse.debug.core, + org.jboss.tools.common.model.ui, + org.eclipse.wst.web +Bundle-ActivationPolicy: lazy +Export-Package: org.jboss.tools.common.meta.ui.editor, + org.jboss.tools.common.meta.ui, + org.jboss.tools.common.meta.ui.form, + org.jboss.tools.common.meta.ui.attribute.editor, + org.jboss.tools.common.meta.ui.search +Bundle-Activator: org.jboss.tools.common.meta.ui.MetaUIPlugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,96 +1,96 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-ClassPath: . -Bundle-Activator: org.jboss.tools.common.model.ui.ModelUIPlugin -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.common.model.ui;singleton:=true -Bundle-Localization: plugin -Export-Package: dtds, - org.jboss.tools.common.core.jdt, - org.jboss.tools.common.core.resources, - org.jboss.tools.common.editor, - org.jboss.tools.common.editor.form, - org.jboss.tools.common.model.ui, - org.jboss.tools.common.model.ui.action, - org.jboss.tools.common.model.ui.action.file, - org.jboss.tools.common.model.ui.action.filter, - org.jboss.tools.common.model.ui.action.global, - org.jboss.tools.common.model.ui.action.sample, - org.jboss.tools.common.model.ui.actions, - org.jboss.tools.common.model.ui.attribute, - org.jboss.tools.common.model.ui.attribute.adapter, - org.jboss.tools.common.model.ui.attribute.adapter.custom, - org.jboss.tools.common.model.ui.attribute.editor, - org.jboss.tools.common.model.ui.dialog, - org.jboss.tools.common.model.ui.dialogs, - org.jboss.tools.common.model.ui.dnd, - org.jboss.tools.common.model.ui.editor, - org.jboss.tools.common.model.ui.editors.dnd, - org.jboss.tools.common.model.ui.editors.dnd.composite, - org.jboss.tools.common.model.ui.editors.dnd.context, - org.jboss.tools.common.model.ui.editors.multipage, - org.jboss.tools.common.model.ui.forms, - org.jboss.tools.common.model.ui.image, - org.jboss.tools.common.model.ui.messages, - org.jboss.tools.common.model.ui.navigator, - org.jboss.tools.common.model.ui.navigator.decorator, - org.jboss.tools.common.model.ui.objecteditor, - org.jboss.tools.common.model.ui.outline, - org.jboss.tools.common.model.ui.preferences, - org.jboss.tools.common.model.ui.problem, - org.jboss.tools.common.model.ui.reporting, - org.jboss.tools.common.model.ui.resources, - org.jboss.tools.common.model.ui.select, - org.jboss.tools.common.model.ui.swt.util, - org.jboss.tools.common.model.ui.templates, - org.jboss.tools.common.model.ui.templates.assistent, - org.jboss.tools.common.model.ui.templates.configuration, - org.jboss.tools.common.model.ui.templates.model, - org.jboss.tools.common.model.ui.templates.preferences, - org.jboss.tools.common.model.ui.texteditors, - org.jboss.tools.common.model.ui.texteditors.dnd, - org.jboss.tools.common.model.ui.texteditors.preferences, - org.jboss.tools.common.model.ui.texteditors.propertyeditor, - org.jboss.tools.common.model.ui.texteditors.xmleditor, - org.jboss.tools.common.model.ui.util, - org.jboss.tools.common.model.ui.viewers.xpl, - org.jboss.tools.common.model.ui.views.navigator, - org.jboss.tools.common.model.ui.views.palette, - org.jboss.tools.common.model.ui.views.palette.attribute, - org.jboss.tools.common.model.ui.views.palette.editor, - org.jboss.tools.common.model.ui.views.palette.model, - org.jboss.tools.common.model.ui.widgets, - org.jboss.tools.common.model.ui.widgets.border, - org.jboss.tools.common.model.ui.widgets.xpl, - org.jboss.tools.common.model.ui.wizard.newfile, - org.jboss.tools.common.model.ui.wizards, - org.jboss.tools.common.model.ui.wizards.one, - org.jboss.tools.common.model.ui.wizards.query, - org.jboss.tools.common.model.ui.wizards.query.list, - org.jboss.tools.common.model.ui.wizards.special, - org.jboss.tools.common.model.ui.wizards.standard, - org.jboss.tools.common.model.util, - org.jboss.tools.common.propertieseditor, - org.jboss.tools.common.propertieseditor.bundlemodel, - org.jboss.tools.common.propertieseditor.text -Require-Bundle: org.jboss.tools.common.model;visibility:=reexport, - org.jboss.tools.common.text.ext;visibility:=reexport, - org.jboss.tools.common.text.xml;visibility:=reexport, - org.eclipse.ui, - org.eclipse.ui.ide, - org.eclipse.ui.views, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.ui.forms, - org.eclipse.jdt.ui, - org.eclipse.compare, - org.eclipse.wst.xml.ui, - org.eclipse.jdt.launching, - org.eclipse.wst.html.core, - org.eclipse.pde.ui, - org.eclipse.core.expressions;bundle-version="[3.4.100,4.0.0)", - org.jboss.tools.common.ui -Bundle-Version: 3.1.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-ClassPath: . +Bundle-Activator: org.jboss.tools.common.model.ui.ModelUIPlugin +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.common.model.ui;singleton:=true +Bundle-Localization: plugin +Export-Package: dtds, + org.jboss.tools.common.core.jdt, + org.jboss.tools.common.core.resources, + org.jboss.tools.common.editor, + org.jboss.tools.common.editor.form, + org.jboss.tools.common.model.ui, + org.jboss.tools.common.model.ui.action, + org.jboss.tools.common.model.ui.action.file, + org.jboss.tools.common.model.ui.action.filter, + org.jboss.tools.common.model.ui.action.global, + org.jboss.tools.common.model.ui.action.sample, + org.jboss.tools.common.model.ui.actions, + org.jboss.tools.common.model.ui.attribute, + org.jboss.tools.common.model.ui.attribute.adapter, + org.jboss.tools.common.model.ui.attribute.adapter.custom, + org.jboss.tools.common.model.ui.attribute.editor, + org.jboss.tools.common.model.ui.dialog, + org.jboss.tools.common.model.ui.dialogs, + org.jboss.tools.common.model.ui.dnd, + org.jboss.tools.common.model.ui.editor, + org.jboss.tools.common.model.ui.editors.dnd, + org.jboss.tools.common.model.ui.editors.dnd.composite, + org.jboss.tools.common.model.ui.editors.dnd.context, + org.jboss.tools.common.model.ui.editors.multipage, + org.jboss.tools.common.model.ui.forms, + org.jboss.tools.common.model.ui.image, + org.jboss.tools.common.model.ui.messages, + org.jboss.tools.common.model.ui.navigator, + org.jboss.tools.common.model.ui.navigator.decorator, + org.jboss.tools.common.model.ui.objecteditor, + org.jboss.tools.common.model.ui.outline, + org.jboss.tools.common.model.ui.preferences, + org.jboss.tools.common.model.ui.problem, + org.jboss.tools.common.model.ui.reporting, + org.jboss.tools.common.model.ui.resources, + org.jboss.tools.common.model.ui.select, + org.jboss.tools.common.model.ui.swt.util, + org.jboss.tools.common.model.ui.templates, + org.jboss.tools.common.model.ui.templates.assistent, + org.jboss.tools.common.model.ui.templates.configuration, + org.jboss.tools.common.model.ui.templates.model, + org.jboss.tools.common.model.ui.templates.preferences, + org.jboss.tools.common.model.ui.texteditors, + org.jboss.tools.common.model.ui.texteditors.dnd, + org.jboss.tools.common.model.ui.texteditors.preferences, + org.jboss.tools.common.model.ui.texteditors.propertyeditor, + org.jboss.tools.common.model.ui.texteditors.xmleditor, + org.jboss.tools.common.model.ui.util, + org.jboss.tools.common.model.ui.viewers.xpl, + org.jboss.tools.common.model.ui.views.navigator, + org.jboss.tools.common.model.ui.views.palette, + org.jboss.tools.common.model.ui.views.palette.attribute, + org.jboss.tools.common.model.ui.views.palette.editor, + org.jboss.tools.common.model.ui.views.palette.model, + org.jboss.tools.common.model.ui.widgets, + org.jboss.tools.common.model.ui.widgets.border, + org.jboss.tools.common.model.ui.widgets.xpl, + org.jboss.tools.common.model.ui.wizard.newfile, + org.jboss.tools.common.model.ui.wizards, + org.jboss.tools.common.model.ui.wizards.one, + org.jboss.tools.common.model.ui.wizards.query, + org.jboss.tools.common.model.ui.wizards.query.list, + org.jboss.tools.common.model.ui.wizards.special, + org.jboss.tools.common.model.ui.wizards.standard, + org.jboss.tools.common.model.util, + org.jboss.tools.common.propertieseditor, + org.jboss.tools.common.propertieseditor.bundlemodel, + org.jboss.tools.common.propertieseditor.text +Require-Bundle: org.jboss.tools.common.model;visibility:=reexport, + org.jboss.tools.common.text.ext;visibility:=reexport, + org.jboss.tools.common.text.xml;visibility:=reexport, + org.eclipse.ui, + org.eclipse.ui.ide, + org.eclipse.ui.views, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.ui.forms, + org.eclipse.jdt.ui, + org.eclipse.compare, + org.eclipse.wst.xml.ui, + org.eclipse.jdt.launching, + org.eclipse.wst.html.core, + org.eclipse.pde.ui, + org.eclipse.core.expressions;bundle-version="[3.4.100,4.0.0)", + org.jboss.tools.common.ui +Bundle-Version: 3.1.0.qualifier +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,14 +1,14 @@ -Manifest-Version: 1.0 -Bundle-Name: %pluginName -Bundle-Activator: org.jboss.tools.common.projecttemplates.ProjectTemplatesPlugin -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Export-Package: org.jboss.tools.common.projecttemplates -Bundle-Localization: plugin -Bundle-SymbolicName: org.jboss.tools.common.projecttemplates;singleton:=true -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.ui, - org.jboss.tools.common -Bundle-Version: 3.1.0.qualifier -Bundle-ActivationPolicy: lazy +Manifest-Version: 1.0 +Bundle-Name: %pluginName +Bundle-Activator: org.jboss.tools.common.projecttemplates.ProjectTemplatesPlugin +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Export-Package: org.jboss.tools.common.projecttemplates +Bundle-Localization: plugin +Bundle-SymbolicName: org.jboss.tools.common.projecttemplates;singleton:=true +Require-Bundle: org.eclipse.core.runtime, + org.eclipse.ui, + org.jboss.tools.common +Bundle-Version: 3.1.0.qualifier +Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,33 +1,33 @@ -Manifest-Version: 1.0 -Bundle-ActivationPolicy: lazy -Bundle-Activator: org.jboss.tools.common.text.ext.ExtensionsPlugin -Export-Package: org.jboss.tools.common.text.ext, - org.jboss.tools.common.text.ext.hyperlink, - org.jboss.tools.common.text.ext.hyperlink.xml, - org.jboss.tools.common.text.ext.hyperlink.xpl, - org.jboss.tools.common.text.ext.util, - org.jboss.tools.common.text.ext.util.xpl -Bundle-Version: 3.1.0.qualifier -Bundle-Name: %Bundle-Name.0 -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Plugin-Class: org.jboss.tools.common.text.ext.ExtensionsPlugin -Bundle-SymbolicName: org.jboss.tools.common.text.ext;singleton:=true -Bundle-Localization: plugin -Require-Bundle: org.jboss.tools.common.model, - org.eclipse.ui.ide, - org.eclipse.ui, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.jdt.ui, - org.eclipse.wst.sse.core;visibility:=reexport, - org.eclipse.wst.sse.ui;visibility:=reexport, - org.eclipse.jst.jsp.core;visibility:=reexport, - org.eclipse.wst.common.modulecore;visibility:=reexport, - org.eclipse.pde.ui, - org.jboss.tools.common.el.core, - org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)", - org.eclipse.wst.css.core, - org.eclipse.wst.html.core, - org.jboss.tools.common.ui +Manifest-Version: 1.0 +Bundle-ActivationPolicy: lazy +Bundle-Activator: org.jboss.tools.common.text.ext.ExtensionsPlugin +Export-Package: org.jboss.tools.common.text.ext, + org.jboss.tools.common.text.ext.hyperlink, + org.jboss.tools.common.text.ext.hyperlink.xml, + org.jboss.tools.common.text.ext.hyperlink.xpl, + org.jboss.tools.common.text.ext.util, + org.jboss.tools.common.text.ext.util.xpl +Bundle-Version: 3.1.0.qualifier +Bundle-Name: %Bundle-Name.0 +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Plugin-Class: org.jboss.tools.common.text.ext.ExtensionsPlugin +Bundle-SymbolicName: org.jboss.tools.common.text.ext;singleton:=true +Bundle-Localization: plugin +Require-Bundle: org.jboss.tools.common.model, + org.eclipse.ui.ide, + org.eclipse.ui, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.jdt.ui, + org.eclipse.wst.sse.core;visibility:=reexport, + org.eclipse.wst.sse.ui;visibility:=reexport, + org.eclipse.jst.jsp.core;visibility:=reexport, + org.eclipse.wst.common.modulecore;visibility:=reexport, + org.eclipse.pde.ui, + org.jboss.tools.common.el.core, + org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)", + org.eclipse.wst.css.core, + org.eclipse.wst.html.core, + org.jboss.tools.common.ui Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,29 +1,29 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-ActivationPolicy: lazy -Bundle-Name: %Bundle-Name.0 -Bundle-Activator: org.jboss.tools.common.text.xml.XmlEditorPlugin -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.common.text.xml;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.common.text.xml, - org.jboss.tools.common.text.xml.contentassist, - org.jboss.tools.common.text.xml.internal.ui.preferencies, - org.jboss.tools.common.text.xml.ui, - org.jboss.tools.common.text.xml.ui.xpl, - org.jboss.tools.common.text.xml.xpl, - org.jboss.tools.jst.jsp.preferences.xpl, - org.jboss.tools.jst.jsp.text.xpl -Require-Bundle: org.jboss.tools.common, - org.eclipse.core.runtime, - org.eclipse.ui, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.jdt.ui, - org.eclipse.jdt.core, - org.eclipse.wst.xml.ui, - org.eclipse.wst.sse.ui, - org.eclipse.wst.sse.core, - org.eclipse.core.resources -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-ActivationPolicy: lazy +Bundle-Name: %Bundle-Name.0 +Bundle-Activator: org.jboss.tools.common.text.xml.XmlEditorPlugin +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.common.text.xml;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.common.text.xml, + org.jboss.tools.common.text.xml.contentassist, + org.jboss.tools.common.text.xml.internal.ui.preferencies, + org.jboss.tools.common.text.xml.ui, + org.jboss.tools.common.text.xml.ui.xpl, + org.jboss.tools.common.text.xml.xpl, + org.jboss.tools.jst.jsp.preferences.xpl, + org.jboss.tools.jst.jsp.text.xpl +Require-Bundle: org.jboss.tools.common, + org.eclipse.core.runtime, + org.eclipse.ui, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.jdt.ui, + org.eclipse.jdt.core, + org.eclipse.wst.xml.ui, + org.eclipse.wst.sse.ui, + org.eclipse.wst.sse.core, + org.eclipse.core.resources +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/common/plugins/org.jboss.tools.common.verification/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/common/plugins/org.jboss.tools.common.verification/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,26 +1,26 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-ActivationPolicy: lazy -Bundle-Name: %Bundle-Name.0 -Bundle-Activator: org.jboss.tools.common.verification.vrules.plugin.VerificationPlugin -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.common.verification;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.common.verification.vrules, - org.jboss.tools.common.verification.vrules.impl, - org.jboss.tools.common.verification.vrules.layer, - org.jboss.tools.common.verification.vrules.core.resources -Require-Bundle: org.jboss.tools.common, - org.eclipse.ui.ide, - org.eclipse.ui.views, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.ui.editors, - org.eclipse.jdt.core, - org.eclipse.ui, - org.jboss.tools.common.model, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.wst.validation -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-ActivationPolicy: lazy +Bundle-Name: %Bundle-Name.0 +Bundle-Activator: org.jboss.tools.common.verification.vrules.plugin.VerificationPlugin +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.common.verification;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.common.verification.vrules, + org.jboss.tools.common.verification.vrules.impl, + org.jboss.tools.common.verification.vrules.layer, + org.jboss.tools.common.verification.vrules.core.resources +Require-Bundle: org.jboss.tools.common, + org.eclipse.ui.ide, + org.eclipse.ui.views, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.ui.editors, + org.eclipse.jdt.core, + org.eclipse.ui, + org.jboss.tools.common.model, + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.wst.validation +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,34 +1,34 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-Activator: org.jboss.tools.common.verification.ui.XStudioVerif - icationPlugin -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.common.verification.ui;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.common.verification.ui.vrules.action, - org.jboss.tools.common.verification.ui.vrules.preferences, - org.jboss.tools.common.verification.ui.vrules.wizard, - org.jboss.tools.common.verification.ui.vrules.wizard.config, - org.jboss.tools.common.verification.ui.vrules.wizard.runtime, - org.jboss.tools.common.verification.ui.vrules.wizard.runtime2, - org.jboss.tools.common.verification.ui -Require-Bundle: org.eclipse.ui.ide, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.swt, - org.eclipse.ui, - org.eclipse.jface, - org.eclipse.jface.text, - org.eclipse.ui.workbench, - org.eclipse.jdt.ui, - org.jboss.tools.common.verification, - org.jboss.tools.common.model.ui, - org.eclipse.core.expressions, - org.eclipse.core.commands, - org.eclipse.jface, - org.eclipse.wst.common.project.facet.core, - org.eclipse.wst.validation -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Activator: org.jboss.tools.common.verification.ui.XStudioVerif + icationPlugin +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.common.verification.ui;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.common.verification.ui.vrules.action, + org.jboss.tools.common.verification.ui.vrules.preferences, + org.jboss.tools.common.verification.ui.vrules.wizard, + org.jboss.tools.common.verification.ui.vrules.wizard.config, + org.jboss.tools.common.verification.ui.vrules.wizard.runtime, + org.jboss.tools.common.verification.ui.vrules.wizard.runtime2, + org.jboss.tools.common.verification.ui +Require-Bundle: org.eclipse.ui.ide, + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.swt, + org.eclipse.ui, + org.eclipse.jface, + org.eclipse.jface.text, + org.eclipse.ui.workbench, + org.eclipse.jdt.ui, + org.jboss.tools.common.verification, + org.jboss.tools.common.model.ui, + org.eclipse.core.expressions, + org.eclipse.core.commands, + org.eclipse.jface, + org.eclipse.wst.common.project.facet.core, + org.eclipse.wst.validation +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/common/tests/org.jboss.tools.common.el.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/common/tests/org.jboss.tools.common.el.core.test/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/common/tests/org.jboss.tools.common.el.core.test/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,23 +1,23 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.jboss.tools.common.el.core.test;singleton:=true -Bundle-Version: 3.1.0.qualifier -Bundle-ClassPath: . -Bundle-Vendor: %Bundle-Vendor.0 -Export-Package: org.jboss.tools.common.el.core.test -Require-Bundle: - org.junit, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.jface.text, - org.jboss.tools.common.el.core, - org.jboss.tools.common.test, - org.jboss.tools.tests, - org.eclipse.jst.j2ee;bundle-version="[1.1.300,2.0.0)", - org.jboss.tools.common.el.ui, - org.eclipse.jdt.core;bundle-version="[3.5.0,4.0.0)", - org.eclipse.ltk.core.refactoring;bundle-version="[3.5.0,4.0.0)", - org.jboss.tools.common -Bundle-Localization: plugin +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-SymbolicName: org.jboss.tools.common.el.core.test;singleton:=true +Bundle-Version: 3.1.0.qualifier +Bundle-ClassPath: . +Bundle-Vendor: %Bundle-Vendor.0 +Export-Package: org.jboss.tools.common.el.core.test +Require-Bundle: + org.junit, + org.eclipse.core.runtime, + org.eclipse.core.resources, + org.eclipse.jface.text, + org.jboss.tools.common.el.core, + org.jboss.tools.common.test, + org.jboss.tools.tests, + org.eclipse.jst.j2ee;bundle-version="[1.1.300,2.0.0)", + org.jboss.tools.common.el.ui, + org.eclipse.jdt.core;bundle-version="[3.5.0,4.0.0)", + org.eclipse.ltk.core.refactoring;bundle-version="[3.5.0,4.0.0)", + org.jboss.tools.common +Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF =================================================================== --- trunk/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,18 +1,18 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.jboss.tools.common.model.test;singleton:=true -Bundle-Version: 3.1.0.qualifier -Bundle-Vendor: %Bundle-Vendor.0 -Export-Package: org.jboss.tools.common.model.test -Require-Bundle: - org.junit, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.jboss.tools.common.model, - org.jboss.tools.common.test, - org.jboss.tools.tests, - org.jboss.tools.common.model.ui -Bundle-Localization: plugin +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-SymbolicName: org.jboss.tools.common.model.test;singleton:=true +Bundle-Version: 3.1.0.qualifier +Bundle-Vendor: %Bundle-Vendor.0 +Export-Package: org.jboss.tools.common.model.test +Require-Bundle: + org.junit, + org.eclipse.core.runtime, + org.eclipse.core.resources, + org.jboss.tools.common.model, + org.jboss.tools.common.test, + org.jboss.tools.tests, + org.jboss.tools.common.model.ui +Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ClassPath: . +Bundle-ClassPath: . Modified: trunk/common/tests/org.jboss.tools.common.verification.test/META-INF/MANIFEST.MF =================================================================== --- trunk/common/tests/org.jboss.tools.common.verification.test/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/common/tests/org.jboss.tools.common.verification.test/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,17 +1,17 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.jboss.tools.common.verification.test;singleton:=true -Bundle-Version: 3.1.0.qualifier -Bundle-ClassPath: . -Bundle-Vendor: %Bundle-Vendor.0 -Export-Package: org.jboss.tools.common.verification.test -Require-Bundle: - org.junit, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.jboss.tools.common.model, - org.jboss.tools.common.verification, - org.jboss.tools.common.test -Bundle-Localization: plugin +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-SymbolicName: org.jboss.tools.common.verification.test;singleton:=true +Bundle-Version: 3.1.0.qualifier +Bundle-ClassPath: . +Bundle-Vendor: %Bundle-Vendor.0 +Export-Package: org.jboss.tools.common.verification.test +Require-Bundle: + org.junit, + org.eclipse.core.runtime, + org.eclipse.core.resources, + org.jboss.tools.common.model, + org.jboss.tools.common.verification, + org.jboss.tools.common.test +Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,18 +1,18 @@ -Manifest-Version: 1.0 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-Activator: org.jboss.tools.esb.core.ESBCorePlugin -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.esb.core;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.esb.core, - org.jboss.tools.esb.core.model, - org.jboss.tools.esb.core.model.converters, - org.jboss.tools.esb.core.model.handlers, - org.jboss.tools.esb.core.model.impl -Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport, - org.eclipse.ui, - org.jboss.tools.esb.project.core -Bundle-Version: 1.3.0.qualifier +Manifest-Version: 1.0 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Activator: org.jboss.tools.esb.core.ESBCorePlugin +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.esb.core;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.esb.core, + org.jboss.tools.esb.core.model, + org.jboss.tools.esb.core.model.converters, + org.jboss.tools.esb.core.model.handlers, + org.jboss.tools.esb.core.model.impl +Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport, + org.eclipse.ui, + org.jboss.tools.esb.project.core +Bundle-Version: 1.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,40 +1,40 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-ClassPath: esb-ui.jar -Bundle-Activator: org.jboss.tools.esb.ui.ESBUiPlugin -Bundle-Vendor: %providerName -Export-Package: org.jboss.tools.esb.ui, - org.jboss.tools.esb.ui.editor.form, - org.jboss.tools.esb.ui.editor.attribute, - org.jboss.tools.esb.ui.wizard, - org.jboss.tools.esb.ui.wizard.newfile -Bundle-SymbolicName: org.jboss.tools.esb.ui; singleton:=true -Bundle-Localization: plugin -Require-Bundle: org.eclipse.jface.text, - org.eclipse.jdt.ui, - org.eclipse.wst.sse.ui, - org.eclipse.wst.xml.core, - org.eclipse.wst.xml.ui, - org.eclipse.wst.common.frameworks.ui, - org.eclipse.wst.common.ui, - org.eclipse.compare, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.jface, - org.eclipse.ui, - org.eclipse.draw2d, - org.eclipse.gef, - org.eclipse.ui.ide, - org.eclipse.ui.workbench.texteditor, - org.eclipse.core.expressions, - org.eclipse.ui.views, - org.jboss.tools.common.model, - org.jboss.tools.common.model.ui, - org.jboss.tools.common.text.xml, - org.jboss.tools.jst.web, - org.jboss.tools.jst.web.ui, - org.jboss.tools.esb.core -Bundle-Version: 1.3.0.qualifier +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-ClassPath: esb-ui.jar +Bundle-Activator: org.jboss.tools.esb.ui.ESBUiPlugin +Bundle-Vendor: %providerName +Export-Package: org.jboss.tools.esb.ui, + org.jboss.tools.esb.ui.editor.form, + org.jboss.tools.esb.ui.editor.attribute, + org.jboss.tools.esb.ui.wizard, + org.jboss.tools.esb.ui.wizard.newfile +Bundle-SymbolicName: org.jboss.tools.esb.ui; singleton:=true +Bundle-Localization: plugin +Require-Bundle: org.eclipse.jface.text, + org.eclipse.jdt.ui, + org.eclipse.wst.sse.ui, + org.eclipse.wst.xml.core, + org.eclipse.wst.xml.ui, + org.eclipse.wst.common.frameworks.ui, + org.eclipse.wst.common.ui, + org.eclipse.compare, + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.jface, + org.eclipse.ui, + org.eclipse.draw2d, + org.eclipse.gef, + org.eclipse.ui.ide, + org.eclipse.ui.workbench.texteditor, + org.eclipse.core.expressions, + org.eclipse.ui.views, + org.jboss.tools.common.model, + org.jboss.tools.common.model.ui, + org.jboss.tools.common.text.xml, + org.jboss.tools.jst.web, + org.jboss.tools.jst.web.ui, + org.jboss.tools.esb.core +Bundle-Version: 1.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,20 +1,20 @@ -Manifest-Version: 1.0 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-Activator: org.jboss.tools.esb.validator.ESBValidatorPlugin -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.esb.validator;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.esb.validator, - org.jboss.tools.esb.validator.ui -Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport, - org.jboss.tools.common.ui, - org.jboss.tools.jst.web.kb, - org.jboss.tools.esb.core, - org.eclipse.ui, - org.jboss.tools.esb.project.core, - org.eclipse.wst.validation, - org.eclipse.jdt.ui -Bundle-Version: 2.0.0 +Manifest-Version: 1.0 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Activator: org.jboss.tools.esb.validator.ESBValidatorPlugin +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.esb.validator;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.esb.validator, + org.jboss.tools.esb.validator.ui +Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport, + org.jboss.tools.common.ui, + org.jboss.tools.jst.web.kb, + org.jboss.tools.esb.core, + org.eclipse.ui, + org.jboss.tools.esb.project.core, + org.eclipse.wst.validation, + org.eclipse.jdt.ui +Bundle-Version: 2.0.0 Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.core.test/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,14 +1,14 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.jboss.tools.esb.core.test;singleton:=true -Bundle-Version: 1.3.0.qualifier -Bundle-Vendor: %Bundle-Vendor.0 -Export-Package: org.jboss.tools.esb.core.test -Require-Bundle: - org.junit, - org.jboss.tools.esb.core, - org.jboss.tools.tests, - org.jboss.tools.common.test -Bundle-Localization: plugin +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-SymbolicName: org.jboss.tools.esb.core.test;singleton:=true +Bundle-Version: 1.3.0.qualifier +Bundle-Vendor: %Bundle-Vendor.0 +Export-Package: org.jboss.tools.esb.core.test +Require-Bundle: + org.junit, + org.jboss.tools.esb.core, + org.jboss.tools.tests, + org.jboss.tools.common.test +Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/flow/plugins/org.jboss.tools.flow.common/META-INF/MANIFEST.MF =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/flow/plugins/org.jboss.tools.flow.common/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,32 +1,32 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.jboss.tools.flow.common;singleton:=true -Bundle-Version: 4.0.0.qualifier -Bundle-Activator: org.jboss.tools.flow.common.Activator -Bundle-Vendor: %Bundle-Vendor.0 -Require-Bundle: - org.eclipse.ui.views, - org.eclipse.draw2d, - org.eclipse.gef, - org.eclipse.jface, - org.eclipse.core.runtime, - org.eclipse.ui, - org.eclipse.core.resources, - org.eclipse.ui.ide -Bundle-ActivationPolicy: lazy -Export-Package: org.jboss.tools.flow.common;uses:="org.eclipse.core.runtime,org.eclipse.ui.plugin,org.osgi.framework", - org.jboss.tools.flow.common.action, - org.jboss.tools.flow.common.command, - org.jboss.tools.flow.common.editor, - org.jboss.tools.flow.common.editpart, - org.jboss.tools.flow.common.figure, - org.jboss.tools.flow.common.model, - org.jboss.tools.flow.common.policy, - org.jboss.tools.flow.common.properties, - org.jboss.tools.flow.common.registry, - org.jboss.tools.flow.common.strategy, - org.jboss.tools.flow.common.wrapper -Bundle-ClassPath: . -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-Localization: plugin +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-SymbolicName: org.jboss.tools.flow.common;singleton:=true +Bundle-Version: 4.0.0.qualifier +Bundle-Activator: org.jboss.tools.flow.common.Activator +Bundle-Vendor: %Bundle-Vendor.0 +Require-Bundle: + org.eclipse.ui.views, + org.eclipse.draw2d, + org.eclipse.gef, + org.eclipse.jface, + org.eclipse.core.runtime, + org.eclipse.ui, + org.eclipse.core.resources, + org.eclipse.ui.ide +Bundle-ActivationPolicy: lazy +Export-Package: org.jboss.tools.flow.common;uses:="org.eclipse.core.runtime,org.eclipse.ui.plugin,org.osgi.framework", + org.jboss.tools.flow.common.action, + org.jboss.tools.flow.common.command, + org.jboss.tools.flow.common.editor, + org.jboss.tools.flow.common.editpart, + org.jboss.tools.flow.common.figure, + org.jboss.tools.flow.common.model, + org.jboss.tools.flow.common.policy, + org.jboss.tools.flow.common.properties, + org.jboss.tools.flow.common.registry, + org.jboss.tools.flow.common.strategy, + org.jboss.tools.flow.common.wrapper +Bundle-ClassPath: . +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Localization: plugin Modified: trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<feature id="org.hibernate.eclipse.test.feature" label="Hibernate Tests" version="3.3.0.qualifier" provider-name="JBoss by Red Hat"> +<feature + id="org.hibernate.eclipse.test.feature" + label="Hibernate Tests" + version="3.3.0.qualifier" + provider-name="JBoss by Red Hat"> <description url="http://www.example.com/description"> hibernate test Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,31 +1,31 @@ -Manifest-Version: 1.0 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-ClassPath: org.jboss.tools.hibernate.ui.jar -Bundle-Activator: org.jboss.tools.hibernate.ui.diagram.UiPlugin -Bundle-Vendor: %providerName -Bundle-ManifestVersion: 2 -Bundle-Localization: plugin -Bundle-SymbolicName: org.jboss.tools.hibernate.ui;singleton:=true -Require-Bundle: org.eclipse.ui, - org.eclipse.ui.ide, - org.eclipse.ui.views, - org.eclipse.core.runtime, - org.eclipse.gef, - org.eclipse.core.resources, - org.hibernate.eclipse, - org.eclipse.jdt.core, - org.eclipse.jdt.ui, - org.hibernate.eclipse.console -Bundle-Version: 3.3.0.qualifier -Export-Package: org.jboss.tools.hibernate.ui.diagram, - org.jboss.tools.hibernate.ui.diagram.editors, - org.jboss.tools.hibernate.ui.diagram.editors.actions, - org.jboss.tools.hibernate.ui.diagram.editors.command, - org.jboss.tools.hibernate.ui.diagram.editors.figures, - org.jboss.tools.hibernate.ui.diagram.editors.model, - org.jboss.tools.hibernate.ui.diagram.editors.parts, - org.jboss.tools.hibernate.ui.view -Import-Package: org.eclipse.ui.actions -Bundle-RequiredExecutionEnvironment: J2SE-1.5 - +Manifest-Version: 1.0 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-ClassPath: org.jboss.tools.hibernate.ui.jar +Bundle-Activator: org.jboss.tools.hibernate.ui.diagram.UiPlugin +Bundle-Vendor: %providerName +Bundle-ManifestVersion: 2 +Bundle-Localization: plugin +Bundle-SymbolicName: org.jboss.tools.hibernate.ui;singleton:=true +Require-Bundle: org.eclipse.ui, + org.eclipse.ui.ide, + org.eclipse.ui.views, + org.eclipse.core.runtime, + org.eclipse.gef, + org.eclipse.core.resources, + org.hibernate.eclipse, + org.eclipse.jdt.core, + org.eclipse.jdt.ui, + org.hibernate.eclipse.console +Bundle-Version: 3.3.0.qualifier +Export-Package: org.jboss.tools.hibernate.ui.diagram, + org.jboss.tools.hibernate.ui.diagram.editors, + org.jboss.tools.hibernate.ui.diagram.editors.actions, + org.jboss.tools.hibernate.ui.diagram.editors.command, + org.jboss.tools.hibernate.ui.diagram.editors.figures, + org.jboss.tools.hibernate.ui.diagram.editors.model, + org.jboss.tools.hibernate.ui.diagram.editors.parts, + org.jboss.tools.hibernate.ui.view +Import-Package: org.eclipse.ui.actions +Bundle-RequiredExecutionEnvironment: J2SE-1.5 + Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,29 +1,29 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-Activator: org.jboss.tools.hibernate.xml.HibernateXMLPlugin -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.hibernate.xml;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.hibernate.xml, - org.jboss.tools.hibernate.xml.model, - org.jboss.tools.hibernate.xml.model.constraint, - org.jboss.tools.hibernate.xml.model.handlers, - org.jboss.tools.hibernate.xml.model.impl -Require-Bundle: org.eclipse.ui.ide, - org.eclipse.ui.views, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.ui.editors, - org.eclipse.jdt.core, - org.eclipse.jdt.ui, - org.eclipse.ui, - org.eclipse.jface, - org.eclipse.wst.sse.core, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.jboss.tools.common, - org.jboss.tools.common.model -Bundle-Version: 3.3.0.qualifier +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Activator: org.jboss.tools.hibernate.xml.HibernateXMLPlugin +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.hibernate.xml;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.hibernate.xml, + org.jboss.tools.hibernate.xml.model, + org.jboss.tools.hibernate.xml.model.constraint, + org.jboss.tools.hibernate.xml.model.handlers, + org.jboss.tools.hibernate.xml.model.impl +Require-Bundle: org.eclipse.ui.ide, + org.eclipse.ui.views, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.ui.editors, + org.eclipse.jdt.core, + org.eclipse.jdt.ui, + org.eclipse.ui, + org.eclipse.jface, + org.eclipse.wst.sse.core, + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.jboss.tools.common, + org.jboss.tools.common.model +Bundle-Version: 3.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,29 +1,29 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-Activator: org.jboss.tools.hibernate.ui.xml.HibernateUIXMLPlugin -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.hibernate.xml.ui;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.hibernate.ui.xml, - org.jboss.tools.hibernate.ui.xml.editor, - org.jboss.tools.hibernate.ui.xml.form -Require-Bundle: org.eclipse.ui.ide, - org.eclipse.ui.views, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.ui.editors, - org.eclipse.jdt.core, - org.eclipse.jdt.ui, - org.eclipse.ui, - org.eclipse.jface, - org.eclipse.wst.sse.core, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.jboss.tools.common.model, - org.jboss.tools.common.model.ui, - org.jboss.tools.hibernate.xml, - org.eclipse.wst.xml.ui -Bundle-Version: 3.3.0.qualifier +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Activator: org.jboss.tools.hibernate.ui.xml.HibernateUIXMLPlugin +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.hibernate.xml.ui;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.hibernate.ui.xml, + org.jboss.tools.hibernate.ui.xml.editor, + org.jboss.tools.hibernate.ui.xml.form +Require-Bundle: org.eclipse.ui.ide, + org.eclipse.ui.views, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.ui.editors, + org.eclipse.jdt.core, + org.eclipse.jdt.ui, + org.eclipse.ui, + org.eclipse.jface, + org.eclipse.wst.sse.core, + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.jboss.tools.common.model, + org.jboss.tools.common.model.ui, + org.jboss.tools.hibernate.xml, + org.eclipse.wst.xml.ui +Bundle-Version: 3.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml =================================================================== --- trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,32 +1,32 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.jbpm.convert.feature" - label="%featureName" - version="1.0.0.qualifier" - provider-name="%providerName" - plugin="org.jboss.tools.jbpm.convert"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - -  - - <plugin - id="org.jboss.tools.jbpm.convert" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.jbpm.convert.feature" + label="%featureName" + version="1.0.0.qualifier" + provider-name="%providerName" + plugin="org.jboss.tools.jbpm.convert"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + +  + + <plugin + id="org.jboss.tools.jbpm.convert" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/jmx/features/org.jboss.tools.jmx.feature/feature.xml =================================================================== --- trunk/jmx/features/org.jboss.tools.jmx.feature/feature.xml 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/jmx/features/org.jboss.tools.jmx.feature/feature.xml 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,56 +1,56 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.jmx.feature" - label="%featureName" - version="1.1.0.qualifier" - provider-name="%featureProvider" - plugin="org.jboss.tools.jmx.ui"> - - <description> - %description - </description> - - <copyright> - JBoss, Home of Professional Open Source -Copyright 2006-2010, JBoss by Red Hat, and individual contributors as indicated -by the @authors tag. See the copyright.txt in the distribution -for a full listing of individual contributors. - </copyright> - - - <license url="%licenseURL"> - %license - </license> - -  -  - <requires> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.ui"/> - <import plugin="org.eclipse.ui.views"/> - <import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/> - <import plugin="org.eclipse.ui.navigator" version="3.3.100" match="greaterOrEqual"/> - <import plugin="org.jboss.tools.jmx.core" version="1.0.0" match="greaterOrEqual"/> - </requires> - - <plugin - id="org.jboss.tools.jmx.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jmx.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.jmx.feature" + label="%featureName" + version="1.1.0.qualifier" + provider-name="%featureProvider" + plugin="org.jboss.tools.jmx.ui"> + + <description> + %description + </description> + + <copyright> + JBoss, Home of Professional Open Source +Copyright 2006-2010, JBoss by Red Hat, and individual contributors as indicated +by the @authors tag. See the copyright.txt in the distribution +for a full listing of individual contributors. + </copyright> + + + <license url="%licenseURL"> + %license + </license> + +  +  + <requires> + <import plugin="org.eclipse.core.runtime"/> + <import plugin="org.eclipse.ui"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/> + <import plugin="org.eclipse.ui.navigator" version="3.3.100" match="greaterOrEqual"/> + <import plugin="org.jboss.tools.jmx.core" version="1.0.0" match="greaterOrEqual"/> + </requires> + + <plugin + id="org.jboss.tools.jmx.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jmx.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,56 +1,56 @@ -Manifest-Version: 1.0 -Bundle-Name: %pluginName -Bundle-Activator: org.jboss.tools.jsf.JSFModelPlugin -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.jsf;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.jsf, - org.jboss.tools.jsf.el.refactoring, - org.jboss.tools.jsf.facelet.model, - org.jboss.tools.jsf.jsf2.model, - org.jboss.tools.jsf.messages, - org.jboss.tools.jsf.model, - org.jboss.tools.jsf.model.handlers, - org.jboss.tools.jsf.model.handlers.bean, - org.jboss.tools.jsf.model.handlers.refactoring, - org.jboss.tools.jsf.model.handlers.run, - org.jboss.tools.jsf.model.handlers.tile, - org.jboss.tools.jsf.model.helpers, - org.jboss.tools.jsf.model.helpers.autolayout, - org.jboss.tools.jsf.model.helpers.bean, - org.jboss.tools.jsf.model.helpers.converter, - org.jboss.tools.jsf.model.helpers.pages, - org.jboss.tools.jsf.model.impl, - org.jboss.tools.jsf.model.pv, - org.jboss.tools.jsf.model.pv.handler, - org.jboss.tools.jsf.preferences, - org.jboss.tools.jsf.project, - org.jboss.tools.jsf.project.capabilities, - org.jboss.tools.jsf.web, - org.jboss.tools.jsf.web.helpers.context, - org.jboss.tools.jsf.web.pattern, - org.jboss.tools.jsf.web.validation -Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport, - org.jboss.tools.jst.web.kb;visibility:=reexport, - org.jboss.tools.common.el.core, - org.eclipse.jface.text, - org.eclipse.jdt.ui, - org.eclipse.ui, - org.eclipse.wst.sse.core, - org.eclipse.ltk.core.refactoring, - org.eclipse.wst.common.project.facet.core, - org.eclipse.wst.common.frameworks, - org.eclipse.wst.common.modulecore, - org.eclipse.wst.validation, - org.eclipse.jdt.core.manipulation, - org.eclipse.jst.j2ee, - org.eclipse.ui.ide, - org.eclipse.wst.html.core;bundle-version="1.1.300", - org.eclipse.wst.sse.ui;bundle-version="1.1.102", - org.eclipse.ltk.ui.refactoring, - org.eclipse.core.expressions;bundle-version="3.4.100", - org.jboss.tools.common.text.ext;bundle-version="3.1.0" -Bundle-Version: 3.1.0.qualifier -Bundle-ActivationPolicy: lazy +Manifest-Version: 1.0 +Bundle-Name: %pluginName +Bundle-Activator: org.jboss.tools.jsf.JSFModelPlugin +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.jsf;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.jsf, + org.jboss.tools.jsf.el.refactoring, + org.jboss.tools.jsf.facelet.model, + org.jboss.tools.jsf.jsf2.model, + org.jboss.tools.jsf.messages, + org.jboss.tools.jsf.model, + org.jboss.tools.jsf.model.handlers, + org.jboss.tools.jsf.model.handlers.bean, + org.jboss.tools.jsf.model.handlers.refactoring, + org.jboss.tools.jsf.model.handlers.run, + org.jboss.tools.jsf.model.handlers.tile, + org.jboss.tools.jsf.model.helpers, + org.jboss.tools.jsf.model.helpers.autolayout, + org.jboss.tools.jsf.model.helpers.bean, + org.jboss.tools.jsf.model.helpers.converter, + org.jboss.tools.jsf.model.helpers.pages, + org.jboss.tools.jsf.model.impl, + org.jboss.tools.jsf.model.pv, + org.jboss.tools.jsf.model.pv.handler, + org.jboss.tools.jsf.preferences, + org.jboss.tools.jsf.project, + org.jboss.tools.jsf.project.capabilities, + org.jboss.tools.jsf.web, + org.jboss.tools.jsf.web.helpers.context, + org.jboss.tools.jsf.web.pattern, + org.jboss.tools.jsf.web.validation +Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport, + org.jboss.tools.jst.web.kb;visibility:=reexport, + org.jboss.tools.common.el.core, + org.eclipse.jface.text, + org.eclipse.jdt.ui, + org.eclipse.ui, + org.eclipse.wst.sse.core, + org.eclipse.ltk.core.refactoring, + org.eclipse.wst.common.project.facet.core, + org.eclipse.wst.common.frameworks, + org.eclipse.wst.common.modulecore, + org.eclipse.wst.validation, + org.eclipse.jdt.core.manipulation, + org.eclipse.jst.j2ee, + org.eclipse.ui.ide, + org.eclipse.wst.html.core;bundle-version="1.1.300", + org.eclipse.wst.sse.ui;bundle-version="1.1.102", + org.eclipse.ltk.ui.refactoring, + org.eclipse.core.expressions;bundle-version="3.4.100", + org.jboss.tools.common.text.ext;bundle-version="3.1.0" +Bundle-Version: 3.1.0.qualifier +Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,20 +1,20 @@ -Manifest-Version: 1.0 -Bundle-ActivationPolicy: lazy -Bundle-Name: %Bundle-Name.0 -Bundle-Activator: org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.jsf.text.ext; singleton:=true -Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui.ide, - org.eclipse.ui, - org.eclipse.jface.text, - org.jboss.tools.common.text.ext, - org.jboss.tools.jst.text.ext, - org.jboss.tools.jsf, - org.jboss.tools.common.el.core, - org.eclipse.jdt.ui;bundle-version="3.5.0" -Export-Package: org.jboss.tools.jsf.text.ext, - org.jboss.tools.jsf.text.ext.hyperlink -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ActivationPolicy: lazy +Bundle-Name: %Bundle-Name.0 +Bundle-Activator: org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.jsf.text.ext; singleton:=true +Bundle-Localization: plugin +Require-Bundle: org.eclipse.ui.ide, + org.eclipse.ui, + org.eclipse.jface.text, + org.jboss.tools.common.text.ext, + org.jboss.tools.jst.text.ext, + org.jboss.tools.jsf, + org.jboss.tools.common.el.core, + org.eclipse.jdt.ui;bundle-version="3.5.0" +Export-Package: org.jboss.tools.jsf.text.ext, + org.jboss.tools.jsf.text.ext.hyperlink +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,18 +1,18 @@ -Manifest-Version: 1.0 -Bundle-ActivationPolicy: lazy -Bundle-Name: %Bundle-Name.0 -Bundle-Activator: org.jboss.tools.jsf.text.ext.facelets.FaceletsExtensionsPlugin -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.jsf.text.ext.facelets; singleton:=true -Bundle-Localization: plugin -Require-Bundle: - org.eclipse.ui,org.eclipse.core.runtime, - org.eclipse.core.resources,org.eclipse.jface.text, - org.jboss.tools.common.text.ext, - org.jboss.tools.jst.text.ext, - org.jboss.tools.jsf.text.ext -Export-Package: org.jboss.tools.jsf.text.ext.facelets, - org.jboss.tools.jsf.text.ext.facelets.hyperlink -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ActivationPolicy: lazy +Bundle-Name: %Bundle-Name.0 +Bundle-Activator: org.jboss.tools.jsf.text.ext.facelets.FaceletsExtensionsPlugin +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.jsf.text.ext.facelets; singleton:=true +Bundle-Localization: plugin +Require-Bundle: + org.eclipse.ui,org.eclipse.core.runtime, + org.eclipse.core.resources,org.eclipse.jface.text, + org.jboss.tools.common.text.ext, + org.jboss.tools.jst.text.ext, + org.jboss.tools.jsf.text.ext +Export-Package: org.jboss.tools.jsf.text.ext.facelets, + org.jboss.tools.jsf.text.ext.facelets.hyperlink +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.verification/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.verification/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/jsf/plugins/org.jboss.tools.jsf.verification/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,13 +1,13 @@ -Manifest-Version: 1.0 -Bundle-Name: %Bundle-Name.0 -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.jsf.verification;singleton:=true -Bundle-Localization: plugin -Require-Bundle: org.jboss.tools.common.verification, - org.jboss.tools.jsf -Bundle-Version: 3.1.0.qualifier -Export-Package: org.jboss.tools.jsf.verification.vrules, - org.jboss.tools.jsf.verification.vrules.toview +Manifest-Version: 1.0 +Bundle-Name: %Bundle-Name.0 +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.jsf.verification;singleton:=true +Bundle-Localization: plugin +Require-Bundle: org.jboss.tools.common.verification, + org.jboss.tools.jsf +Bundle-Version: 3.1.0.qualifier +Export-Package: org.jboss.tools.jsf.verification.vrules, + org.jboss.tools.jsf.verification.vrules.toview Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ActivationPolicy: lazy +Bundle-ActivationPolicy: lazy Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.jsf.vpe.ajax4jsf;singleton:=true -Bundle-Activator: org.jboss.tools.jsf.vpe.ajax4jsf.Activator +Bundle-Activator: org.jboss.tools.jsf.vpe.ajax4jsf.Activator Bundle-Version: 3.1.0.qualifier Bundle-Localization: plugin Require-Bundle: org.jboss.tools.vpe, Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,21 +1,21 @@ -Manifest-Version: 1.0 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-ClassPath: vpefacelets.jar -Bundle-Activator: org.jboss.tools.jsf.vpe.facelets.FaceletsPlugin -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.jsf.vpe.facelets; singleton:=true -Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.jboss.tools.common, - org.jboss.tools.vpe, - org.eclipse.core.resources, - org.jboss.tools.jst.jsp, - org.mozilla.xpcom;bundle-version="1.9.1", - org.eclipse.jface.text;bundle-version="3.5.0" -Export-Package: org.jboss.tools.jsf.vpe.facelets, - org.jboss.tools.jsf.vpe.facelets.template -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-ClassPath: vpefacelets.jar +Bundle-Activator: org.jboss.tools.jsf.vpe.facelets.FaceletsPlugin +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.jsf.vpe.facelets; singleton:=true +Bundle-Localization: plugin +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.jboss.tools.common, + org.jboss.tools.vpe, + org.eclipse.core.resources, + org.jboss.tools.jst.jsp, + org.mozilla.xpcom;bundle-version="1.9.1", + org.eclipse.jface.text;bundle-version="3.5.0" +Export-Package: org.jboss.tools.jsf.vpe.facelets, + org.jboss.tools.jsf.vpe.facelets.template +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.jsf.vpe.richfaces;singleton:=true -Bundle-Activator: org.jboss.tools.jsf.vpe.richfaces.RichFacesTemplatesActivator +Bundle-Activator: org.jboss.tools.jsf.vpe.richfaces.RichFacesTemplatesActivator Bundle-Version: 3.1.0.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,54 +1,54 @@ -Manifest-Version: 1.0 -Bundle-ActivationPolicy: lazy -Bundle-Name: %Bundle-Name.0 -Bundle-Activator: org.jboss.tools.jst.jsp.JspEditorPlugin -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.jst.jsp;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.jst.jsp, - org.jboss.tools.jst.jsp.contentassist, - org.jboss.tools.jst.jsp.contentassist.xpl, - org.jboss.tools.jst.jsp.drop.treeviewer.model, - org.jboss.tools.jst.jsp.drop.treeviewer.ui, - org.jboss.tools.jst.jsp.editor, - org.jboss.tools.jst.jsp.format, - org.jboss.tools.jst.jsp.jspeditor, - org.jboss.tools.jst.jsp.jspeditor.dnd, - org.jboss.tools.jst.jsp.messages, - org.jboss.tools.jst.jsp.outline, - org.jboss.tools.jst.jsp.outline.cssdialog, - org.jboss.tools.jst.jsp.outline.cssdialog.common, - org.jboss.tools.jst.jsp.outline.cssdialog.parsers, - org.jboss.tools.jst.jsp.outline.cssdialog.tabs, - org.jboss.tools.jst.jsp.outline.cssdialog.widgets, - org.jboss.tools.jst.jsp.preferences, - org.jboss.tools.jst.jsp.support.kb, - org.jboss.tools.jst.jsp.text, - org.jboss.tools.jst.jsp.ui.action, - org.jboss.tools.jst.jsp.util -Require-Bundle: org.jboss.tools.common.el.core, - org.jboss.tools.common.model.ui, - org.jboss.tools.jst.web, - org.eclipse.gef, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.ui.ide, - org.eclipse.jdt.ui, - org.eclipse.wst.common.ui, - org.eclipse.wst.html.core, - org.eclipse.wst.html.ui, - org.eclipse.wst.xml.ui, - org.eclipse.jst.jsp.ui, - org.eclipse.wst.css.core, - org.eclipse.wst.css.ui, - org.eclipse.help.ui, - org.eclipse.jem, - org.eclipse.ui.views, - org.eclipse.core.databinding, - org.eclipse.jface.databinding, - org.jboss.tools.jst.web.kb, - org.eclipse.core.databinding.property;bundle-version="1.2.0", - org.eclipse.emf.ecore;bundle-version="2.5.0" -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ActivationPolicy: lazy +Bundle-Name: %Bundle-Name.0 +Bundle-Activator: org.jboss.tools.jst.jsp.JspEditorPlugin +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.jst.jsp;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.jst.jsp, + org.jboss.tools.jst.jsp.contentassist, + org.jboss.tools.jst.jsp.contentassist.xpl, + org.jboss.tools.jst.jsp.drop.treeviewer.model, + org.jboss.tools.jst.jsp.drop.treeviewer.ui, + org.jboss.tools.jst.jsp.editor, + org.jboss.tools.jst.jsp.format, + org.jboss.tools.jst.jsp.jspeditor, + org.jboss.tools.jst.jsp.jspeditor.dnd, + org.jboss.tools.jst.jsp.messages, + org.jboss.tools.jst.jsp.outline, + org.jboss.tools.jst.jsp.outline.cssdialog, + org.jboss.tools.jst.jsp.outline.cssdialog.common, + org.jboss.tools.jst.jsp.outline.cssdialog.parsers, + org.jboss.tools.jst.jsp.outline.cssdialog.tabs, + org.jboss.tools.jst.jsp.outline.cssdialog.widgets, + org.jboss.tools.jst.jsp.preferences, + org.jboss.tools.jst.jsp.support.kb, + org.jboss.tools.jst.jsp.text, + org.jboss.tools.jst.jsp.ui.action, + org.jboss.tools.jst.jsp.util +Require-Bundle: org.jboss.tools.common.el.core, + org.jboss.tools.common.model.ui, + org.jboss.tools.jst.web, + org.eclipse.gef, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.ui.ide, + org.eclipse.jdt.ui, + org.eclipse.wst.common.ui, + org.eclipse.wst.html.core, + org.eclipse.wst.html.ui, + org.eclipse.wst.xml.ui, + org.eclipse.jst.jsp.ui, + org.eclipse.wst.css.core, + org.eclipse.wst.css.ui, + org.eclipse.help.ui, + org.eclipse.jem, + org.eclipse.ui.views, + org.eclipse.core.databinding, + org.eclipse.jface.databinding, + org.jboss.tools.jst.web.kb, + org.eclipse.core.databinding.property;bundle-version="1.2.0", + org.eclipse.emf.ecore;bundle-version="2.5.0" +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,33 +1,33 @@ -Manifest-Version: 1.0 -Eclipse-LazyStart: true -Bundle-Activator: org.jboss.tools.jst.text.ext.JSTExtensionsPlugin -Export-Package: org.jboss.tools.jst.text.ext, - org.jboss.tools.jst.text.ext.hyperlink, - org.jboss.tools.jst.text.ext.hyperlink.jsp, - org.jboss.tools.jst.text.ext.util -Bundle-Version: 3.1.0.qualifier -Bundle-Name: %Bundle-Name.0 -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Plugin-Class: org.jboss.tools.jst.text.ext.JSTExtensionsPlugin -Bundle-SymbolicName: org.jboss.tools.jst.text.ext;singleton:=true -Bundle-Localization: plugin -Require-Bundle: org.jboss.tools.common.model, - org.jboss.tools.common.text.ext, - org.jboss.tools.jst.web, - org.eclipse.ui.ide, - org.eclipse.ui, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.jdt.ui, - org.eclipse.wst.sse.core;visibility:=reexport, - org.eclipse.wst.sse.ui;visibility:=reexport, - org.eclipse.jst.jsp.core;visibility:=reexport, - org.eclipse.wst.common.modulecore;visibility:=reexport, - org.eclipse.pde.ui, - org.jboss.tools.common.el.core;bundle-version="2.0.0", - org.eclipse.emf.ecore;bundle-version="2.5.0", - org.eclipse.wst.css.core, - org.eclipse.wst.html.core, - org.jboss.tools.jst.web.kb +Manifest-Version: 1.0 +Eclipse-LazyStart: true +Bundle-Activator: org.jboss.tools.jst.text.ext.JSTExtensionsPlugin +Export-Package: org.jboss.tools.jst.text.ext, + org.jboss.tools.jst.text.ext.hyperlink, + org.jboss.tools.jst.text.ext.hyperlink.jsp, + org.jboss.tools.jst.text.ext.util +Bundle-Version: 3.1.0.qualifier +Bundle-Name: %Bundle-Name.0 +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Plugin-Class: org.jboss.tools.jst.text.ext.JSTExtensionsPlugin +Bundle-SymbolicName: org.jboss.tools.jst.text.ext;singleton:=true +Bundle-Localization: plugin +Require-Bundle: org.jboss.tools.common.model, + org.jboss.tools.common.text.ext, + org.jboss.tools.jst.web, + org.eclipse.ui.ide, + org.eclipse.ui, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.jdt.ui, + org.eclipse.wst.sse.core;visibility:=reexport, + org.eclipse.wst.sse.ui;visibility:=reexport, + org.eclipse.jst.jsp.core;visibility:=reexport, + org.eclipse.wst.common.modulecore;visibility:=reexport, + org.eclipse.pde.ui, + org.jboss.tools.common.el.core;bundle-version="2.0.0", + org.eclipse.emf.ecore;bundle-version="2.5.0", + org.eclipse.wst.css.core, + org.eclipse.wst.html.core, + org.jboss.tools.jst.web.kb Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,28 +1,28 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-ActivationPolicy: lazy -Bundle-Name: %Bundle-Name.0 -Bundle-ClassPath: . -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.jst.web.tiles;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.jst.web.tiles, - org.jboss.tools.jst.web.tiles.model, - org.jboss.tools.jst.web.tiles.model.handlers, - org.jboss.tools.jst.web.tiles.model.helpers -Require-Bundle: org.jboss.tools.common, - org.eclipse.jdt.core, - org.eclipse.ui, - org.eclipse.debug.core, - org.eclipse.jdt.launching, - org.eclipse.jdt.ui, - org.eclipse.debug.ui, - org.jboss.tools.common.model, - org.jboss.tools.jst.web, - org.eclipse.jdt.debug, - org.eclipse.ltk.core.refactoring, - org.eclipse.ltk.ui.refactoring, - org.eclipse.core.resources, - org.eclipse.core.runtime -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-ActivationPolicy: lazy +Bundle-Name: %Bundle-Name.0 +Bundle-ClassPath: . +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.jst.web.tiles;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.jst.web.tiles, + org.jboss.tools.jst.web.tiles.model, + org.jboss.tools.jst.web.tiles.model.handlers, + org.jboss.tools.jst.web.tiles.model.helpers +Require-Bundle: org.jboss.tools.common, + org.eclipse.jdt.core, + org.eclipse.ui, + org.eclipse.debug.core, + org.eclipse.jdt.launching, + org.eclipse.jdt.ui, + org.eclipse.debug.ui, + org.jboss.tools.common.model, + org.jboss.tools.jst.web, + org.eclipse.jdt.debug, + org.eclipse.ltk.core.refactoring, + org.eclipse.ltk.ui.refactoring, + org.eclipse.core.resources, + org.eclipse.core.runtime +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,51 +1,51 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-ClassPath: . -Bundle-Activator: org.jboss.tools.jst.web.tiles.ui.TilesUIPlugin -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.jst.web.tiles.ui;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.jst.web.tiles.ui, - org.jboss.tools.jst.web.tiles.ui, - org.jboss.tools.jst.web.tiles.ui.attribute.adapter, - org.jboss.tools.jst.web.tiles.ui.editor, - org.jboss.tools.jst.web.tiles.ui.editor.action, - org.jboss.tools.jst.web.tiles.ui.editor.dnd, - org.jboss.tools.jst.web.tiles.ui.editor.edit, - org.jboss.tools.jst.web.tiles.ui.editor.figures, - org.jboss.tools.jst.web.tiles.ui.editor.form, - org.jboss.tools.jst.web.tiles.ui.editor.model, - org.jboss.tools.jst.web.tiles.ui.editor.model.commands, - org.jboss.tools.jst.web.tiles.ui.editor.model.impl, - org.jboss.tools.jst.web.tiles.ui.editor.palette, - org.jboss.tools.jst.web.tiles.ui.editor.print, - org.jboss.tools.jst.web.tiles.ui.preferences, - org.jboss.tools.jst.web.tiles.ui.wizard.newfile -Require-Bundle: org.jboss.tools.common, - org.jboss.tools.common.gef, - org.eclipse.ui.ide, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.ui.editors, - org.eclipse.ui.views, - org.jboss.tools.common.model, - org.jboss.tools.common.model.ui, - org.jboss.tools.jst.web, - org.jboss.tools.jst.web.ui, - org.jboss.tools.jst.web.tiles, - org.eclipse.jface, - org.eclipse.ui, - org.eclipse.jdt.core, - org.eclipse.jdt.ui, - org.jboss.tools.common.text.xml, - org.eclipse.debug.core, - org.eclipse.wst.xml.ui, - org.eclipse.wst.sse.ui, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.gef, - org.eclipse.core.expressions -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-ClassPath: . +Bundle-Activator: org.jboss.tools.jst.web.tiles.ui.TilesUIPlugin +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.jst.web.tiles.ui;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.jst.web.tiles.ui, + org.jboss.tools.jst.web.tiles.ui, + org.jboss.tools.jst.web.tiles.ui.attribute.adapter, + org.jboss.tools.jst.web.tiles.ui.editor, + org.jboss.tools.jst.web.tiles.ui.editor.action, + org.jboss.tools.jst.web.tiles.ui.editor.dnd, + org.jboss.tools.jst.web.tiles.ui.editor.edit, + org.jboss.tools.jst.web.tiles.ui.editor.figures, + org.jboss.tools.jst.web.tiles.ui.editor.form, + org.jboss.tools.jst.web.tiles.ui.editor.model, + org.jboss.tools.jst.web.tiles.ui.editor.model.commands, + org.jboss.tools.jst.web.tiles.ui.editor.model.impl, + org.jboss.tools.jst.web.tiles.ui.editor.palette, + org.jboss.tools.jst.web.tiles.ui.editor.print, + org.jboss.tools.jst.web.tiles.ui.preferences, + org.jboss.tools.jst.web.tiles.ui.wizard.newfile +Require-Bundle: org.jboss.tools.common, + org.jboss.tools.common.gef, + org.eclipse.ui.ide, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.ui.editors, + org.eclipse.ui.views, + org.jboss.tools.common.model, + org.jboss.tools.common.model.ui, + org.jboss.tools.jst.web, + org.jboss.tools.jst.web.ui, + org.jboss.tools.jst.web.tiles, + org.eclipse.jface, + org.eclipse.ui, + org.eclipse.jdt.core, + org.eclipse.jdt.ui, + org.jboss.tools.common.text.xml, + org.eclipse.debug.core, + org.eclipse.wst.xml.ui, + org.eclipse.wst.sse.ui, + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.gef, + org.eclipse.core.expressions +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,48 +1,48 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-ActivationPolicy: lazy -Bundle-Name: %Bundle-Name.0 -Bundle-Activator: org.jboss.tools.jst.web.ui.WebUiPlugin -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.jst.web.ui;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.jst.web.ui, - org.jboss.tools.jst.web.ui.action, - org.jboss.tools.jst.web.ui.action.adf, - org.jboss.tools.jst.web.ui.attribute.adapter, - org.jboss.tools.jst.web.ui.editors, - org.jboss.tools.jst.web.ui.editors.forms, - org.jboss.tools.jst.web.ui.editors.webapp.form, - org.jboss.tools.jst.web.ui.internal.preferences, - org.jboss.tools.jst.web.ui.navigator, - org.jboss.tools.jst.web.ui.navigator.decorator, - org.jboss.tools.jst.web.ui.operation, - org.jboss.tools.jst.web.ui.wizards.appregister, - org.jboss.tools.jst.web.ui.wizards.links, - org.jboss.tools.jst.web.ui.wizards.newfile, - org.jboss.tools.jst.web.ui.wizards.palette, - org.jboss.tools.jst.web.ui.wizards.process, - org.jboss.tools.jst.web.ui.wizards.project -Require-Bundle: org.eclipse.ui.ide, - org.jboss.tools.common.model.ui, - org.jboss.tools.jst.web, - org.eclipse.ui.navigator, - org.eclipse.jdt.ui, - org.eclipse.wst.common.frameworks, - org.eclipse.wst.server.core, - org.eclipse.wst.server.ui, - org.eclipse.jst.j2ee.web, - org.eclipse.jst.j2ee, - org.eclipse.jem.util, - org.eclipse.wst.common.frameworks, - org.eclipse.wst.common.project.facet.ui, - org.eclipse.debug.ui, - org.jboss.tools.jst.jsp;bundle-version="2.0.0", - org.eclipse.jface.text;bundle-version="3.5.0", - org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.1.300", - org.apache.velocity;bundle-version="1.5.0", - org.eclipse.ui.workbench.texteditor;bundle-version="3.5.1", - org.eclipse.wst.html.ui;bundle-version="1.0.401" -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-ActivationPolicy: lazy +Bundle-Name: %Bundle-Name.0 +Bundle-Activator: org.jboss.tools.jst.web.ui.WebUiPlugin +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.jst.web.ui;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.jst.web.ui, + org.jboss.tools.jst.web.ui.action, + org.jboss.tools.jst.web.ui.action.adf, + org.jboss.tools.jst.web.ui.attribute.adapter, + org.jboss.tools.jst.web.ui.editors, + org.jboss.tools.jst.web.ui.editors.forms, + org.jboss.tools.jst.web.ui.editors.webapp.form, + org.jboss.tools.jst.web.ui.internal.preferences, + org.jboss.tools.jst.web.ui.navigator, + org.jboss.tools.jst.web.ui.navigator.decorator, + org.jboss.tools.jst.web.ui.operation, + org.jboss.tools.jst.web.ui.wizards.appregister, + org.jboss.tools.jst.web.ui.wizards.links, + org.jboss.tools.jst.web.ui.wizards.newfile, + org.jboss.tools.jst.web.ui.wizards.palette, + org.jboss.tools.jst.web.ui.wizards.process, + org.jboss.tools.jst.web.ui.wizards.project +Require-Bundle: org.eclipse.ui.ide, + org.jboss.tools.common.model.ui, + org.jboss.tools.jst.web, + org.eclipse.ui.navigator, + org.eclipse.jdt.ui, + org.eclipse.wst.common.frameworks, + org.eclipse.wst.server.core, + org.eclipse.wst.server.ui, + org.eclipse.jst.j2ee.web, + org.eclipse.jst.j2ee, + org.eclipse.jem.util, + org.eclipse.wst.common.frameworks, + org.eclipse.wst.common.project.facet.ui, + org.eclipse.debug.ui, + org.jboss.tools.jst.jsp;bundle-version="2.0.0", + org.eclipse.jface.text;bundle-version="3.5.0", + org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.1.300", + org.apache.velocity;bundle-version="1.5.0", + org.eclipse.ui.workbench.texteditor;bundle-version="3.5.1", + org.eclipse.wst.html.ui;bundle-version="1.0.401" +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ClassPath: . +Bundle-ClassPath: . Modified: trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,18 +1,18 @@ -Manifest-Version: 1.0 -Bundle-Name: %Bundle-Name.0 -Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActiva - tor -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Export-Package: org.jboss.tools.jst.web.verification.vrules -Bundle-Localization: plugin -Bundle-SymbolicName: org.jboss.tools.jst.web.verification;singleton:=true -Require-Bundle: org.eclipse.core.runtime.compatibility, - org.eclipse.core.resources, - org.eclipse.jdt.core, - org.jboss.tools.common.model, - org.jboss.tools.common.verification, - org.jboss.tools.jst.web -Bundle-Version: 3.1.0.qualifier -Bundle-ActivationPolicy: lazy +Manifest-Version: 1.0 +Bundle-Name: %Bundle-Name.0 +Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActiva + tor +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Export-Package: org.jboss.tools.jst.web.verification.vrules +Bundle-Localization: plugin +Bundle-SymbolicName: org.jboss.tools.jst.web.verification;singleton:=true +Require-Bundle: org.eclipse.core.runtime.compatibility, + org.eclipse.core.resources, + org.eclipse.jdt.core, + org.jboss.tools.common.model, + org.jboss.tools.common.verification, + org.jboss.tools.jst.web +Bundle-Version: 3.1.0.qualifier +Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/maven/features/org.jboss.tools.maven.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.feature/feature.xml 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/maven/features/org.jboss.tools.maven.feature/feature.xml 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,40 +1,40 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.maven.feature" - label="%featureName" - version="1.0.0.qualifier" - provider-name="%providerName" - plugin="org.jboss.tools.maven.ui"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <requires> - <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> - <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> - </requires> - - <plugin - id="org.jboss.tools.maven.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.maven.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.maven.feature" + label="%featureName" + version="1.0.0.qualifier" + provider-name="%providerName" + plugin="org.jboss.tools.maven.ui"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <requires> + <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> + <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> + </requires> + + <plugin + id="org.jboss.tools.maven.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.maven.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,33 +1,33 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.maven.seam.feature" - label="%featureName" - version="1.0.0.qualifier" - provider-name="%providerName" - plugin="org.jboss.tools.maven.seam"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <requires> - <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> - <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> - </requires> - - <plugin - id="org.jboss.tools.maven.seam" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.maven.seam.feature" + label="%featureName" + version="1.0.0.qualifier" + provider-name="%providerName" + plugin="org.jboss.tools.maven.seam"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <requires> + <import feature="org.maven.ide.eclipse.feature" version="0.10.0" match="greaterOrEqual"/> + <import feature="org.maven.ide.eclipse.wtp.feature" version="0.10.0" match="greaterOrEqual"/> + </requires> + + <plugin + id="org.jboss.tools.maven.seam" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml =================================================================== --- trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,39 +1,39 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.portlet.feature" - label="%featureName" - version="1.1.0.qualifier" - provider-name="%providerName" - plugin="org.jboss.tools.portlet.ui"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - -  - - <plugin - id="org.jboss.tools.portlet.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.portlet.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.portlet.feature" + label="%featureName" + version="1.1.0.qualifier" + provider-name="%providerName" + plugin="org.jboss.tools.portlet.ui"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + +  + + <plugin + id="org.jboss.tools.portlet.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.portlet.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,21 +1,21 @@ -Manifest-Version: 1.0 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-Activator: org.jboss.tools.seam.pages.xml.SeamPagesXMLPlugin -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.seam.pages.xml;singleton:=true -Bundle-Localization: plugin -Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport, - org.eclipse.ui, - org.eclipse.wst.common.modulecore, - org.eclipse.ltk.core.refactoring -Bundle-Version: 3.1.0.qualifier -Export-Package: org.jboss.tools.seam.pages.xml, - org.jboss.tools.seam.pages.xml.model, - org.jboss.tools.seam.pages.xml.model.handlers, - org.jboss.tools.seam.pages.xml.model.helpers, - org.jboss.tools.seam.pages.xml.model.helpers.autolayout, - org.jboss.tools.seam.pages.xml.model.refactoring, - org.jboss.tools.seam.pages.xml.model.impl +Manifest-Version: 1.0 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Activator: org.jboss.tools.seam.pages.xml.SeamPagesXMLPlugin +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.seam.pages.xml;singleton:=true +Bundle-Localization: plugin +Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport, + org.eclipse.ui, + org.eclipse.wst.common.modulecore, + org.eclipse.ltk.core.refactoring +Bundle-Version: 3.1.0.qualifier +Export-Package: org.jboss.tools.seam.pages.xml, + org.jboss.tools.seam.pages.xml.model, + org.jboss.tools.seam.pages.xml.model.handlers, + org.jboss.tools.seam.pages.xml.model.helpers, + org.jboss.tools.seam.pages.xml.model.helpers.autolayout, + org.jboss.tools.seam.pages.xml.model.refactoring, + org.jboss.tools.seam.pages.xml.model.impl Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,34 +1,34 @@ -Manifest-Version: 1.0 -Bundle-ActivationPolicy: lazy -Bundle-Name: %Bundle-Name.0 -Bundle-Activator: org.jboss.tools.seam.text.ext.SeamExtPlugin -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.seam.text.ext;singleton:=true -Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui.ide, - org.eclipse.core.runtime, - org.eclipse.ui, - org.eclipse.text, - org.eclipse.jface.text, - org.eclipse.ui.workbench, - org.eclipse.jdt.core, - org.eclipse.wst.sse.core, - org.eclipse.wst.xml.core, - org.eclipse.jst.jsp.core, - org.eclipse.jst.j2ee.web, - org.eclipse.core.resources, - org.jboss.tools.common, - org.jboss.tools.common.model, - org.jboss.tools.common.el.core, - org.jboss.tools.common.text.ext, - org.jboss.tools.jst.text.ext, - org.jboss.tools.jst.web, - org.jboss.tools.jsf, - org.jboss.tools.seam.core, - org.eclipse.jdt.ui, - org.jboss.tools.jsf.text.ext -Export-Package: org.jboss.tools.seam.text.ext, - org.jboss.tools.seam.text.ext.hyperlink -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ActivationPolicy: lazy +Bundle-Name: %Bundle-Name.0 +Bundle-Activator: org.jboss.tools.seam.text.ext.SeamExtPlugin +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.seam.text.ext;singleton:=true +Bundle-Localization: plugin +Require-Bundle: org.eclipse.ui.ide, + org.eclipse.core.runtime, + org.eclipse.ui, + org.eclipse.text, + org.eclipse.jface.text, + org.eclipse.ui.workbench, + org.eclipse.jdt.core, + org.eclipse.wst.sse.core, + org.eclipse.wst.xml.core, + org.eclipse.jst.jsp.core, + org.eclipse.jst.j2ee.web, + org.eclipse.core.resources, + org.jboss.tools.common, + org.jboss.tools.common.model, + org.jboss.tools.common.el.core, + org.jboss.tools.common.text.ext, + org.jboss.tools.jst.text.ext, + org.jboss.tools.jst.web, + org.jboss.tools.jsf, + org.jboss.tools.seam.core, + org.eclipse.jdt.ui, + org.jboss.tools.jsf.text.ext +Export-Package: org.jboss.tools.seam.text.ext, + org.jboss.tools.seam.text.ext.hyperlink +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,38 +1,38 @@ -Manifest-Version: 1.0 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-Activator: org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Export-Package: org.jboss.tools.seam.ui.pages, - org.jboss.tools.seam.ui.pages.editor, - org.jboss.tools.seam.ui.pages.editor.commands, - org.jboss.tools.seam.ui.pages.editor.dnd, - org.jboss.tools.seam.ui.pages.editor.ecore.pages, - org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl, - org.jboss.tools.seam.ui.pages.editor.ecore.pages.util, - org.jboss.tools.seam.ui.pages.editor.edit, - org.jboss.tools.seam.ui.pages.editor.edit.xpl, - org.jboss.tools.seam.ui.pages.editor.figures, - org.jboss.tools.seam.ui.pages.editor.figures.xpl, - org.jboss.tools.seam.ui.pages.editor.palette, - org.jboss.tools.seam.ui.pages.editor.print, - org.jboss.tools.seam.ui.pages.editor.wizard -Bundle-SymbolicName: org.jboss.tools.seam.ui.pages;singleton=true -Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, - org.eclipse.gef, - org.eclipse.ui.ide, - org.eclipse.ui.workbench.texteditor, - org.eclipse.ui.views, - org.jboss.tools.common.model.ui, - org.jboss.tools.common.gef, - org.jboss.tools.jst.web.ui, - org.jboss.tools.seam.pages.xml, - org.eclipse.emf.ecore, - org.eclipse.pde.ui, - org.jboss.tools.common.gef, - org.eclipse.jface.text, - org.eclipse.core.expressions -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Activator: org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Export-Package: org.jboss.tools.seam.ui.pages, + org.jboss.tools.seam.ui.pages.editor, + org.jboss.tools.seam.ui.pages.editor.commands, + org.jboss.tools.seam.ui.pages.editor.dnd, + org.jboss.tools.seam.ui.pages.editor.ecore.pages, + org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl, + org.jboss.tools.seam.ui.pages.editor.ecore.pages.util, + org.jboss.tools.seam.ui.pages.editor.edit, + org.jboss.tools.seam.ui.pages.editor.edit.xpl, + org.jboss.tools.seam.ui.pages.editor.figures, + org.jboss.tools.seam.ui.pages.editor.figures.xpl, + org.jboss.tools.seam.ui.pages.editor.palette, + org.jboss.tools.seam.ui.pages.editor.print, + org.jboss.tools.seam.ui.pages.editor.wizard +Bundle-SymbolicName: org.jboss.tools.seam.ui.pages;singleton=true +Bundle-Localization: plugin +Require-Bundle: org.eclipse.ui, + org.eclipse.gef, + org.eclipse.ui.ide, + org.eclipse.ui.workbench.texteditor, + org.eclipse.ui.views, + org.jboss.tools.common.model.ui, + org.jboss.tools.common.gef, + org.jboss.tools.jst.web.ui, + org.jboss.tools.seam.pages.xml, + org.eclipse.emf.ecore, + org.eclipse.pde.ui, + org.jboss.tools.common.gef, + org.eclipse.jface.text, + org.eclipse.core.expressions +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,32 +1,32 @@ -Manifest-Version: 1.0 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-Activator: org.jboss.tools.seam.xml.SeamXMLPlugin -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.seam.xml;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.seam.xml, - org.jboss.tools.seam.xml.components.model, - org.jboss.tools.seam.xml.components.model.handlers, - org.jboss.tools.seam.xml.components.model.constraint, - org.jboss.tools.seam.xml.ds.model -Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport, - org.eclipse.ui.ide, - org.eclipse.ui.views, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.ui.editors, - org.eclipse.jdt.core, - org.eclipse.jdt.ui, - org.eclipse.ui, - org.eclipse.jface, - org.eclipse.wst.sse.core, - org.eclipse.ltk.core.refactoring, - org.eclipse.ltk.ui.refactoring, - org.eclipse.wst.xml.core, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.wst.web -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Activator: org.jboss.tools.seam.xml.SeamXMLPlugin +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.seam.xml;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.seam.xml, + org.jboss.tools.seam.xml.components.model, + org.jboss.tools.seam.xml.components.model.handlers, + org.jboss.tools.seam.xml.components.model.constraint, + org.jboss.tools.seam.xml.ds.model +Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport, + org.eclipse.ui.ide, + org.eclipse.ui.views, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.ui.editors, + org.eclipse.jdt.core, + org.eclipse.jdt.ui, + org.eclipse.ui, + org.eclipse.jface, + org.eclipse.wst.sse.core, + org.eclipse.ltk.core.refactoring, + org.eclipse.ltk.ui.refactoring, + org.eclipse.wst.xml.core, + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.wst.web +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,38 +1,38 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-Activator: org.jboss.tools.seam.xml.ui.SeamXMLUiPlugin -Bundle-Vendor: %providerName -Export-Package: org.jboss.tools.seam.xml.ui, - org.jboss.tools.seam.xml.ui.editor.form, - org.jboss.tools.seam.xml.ui.editor.form.core, - org.jboss.tools.seam.xml.ui.wizard.newfile -Bundle-SymbolicName: org.jboss.tools.seam.xml.ui;singleton:=true -Bundle-Localization: plugin -Require-Bundle: org.eclipse.jface.text, - org.eclipse.jdt.ui, - org.eclipse.wst.sse.ui, - org.eclipse.wst.xml.core, - org.eclipse.wst.xml.ui, - org.eclipse.wst.common.frameworks.ui, - org.eclipse.wst.common.ui, - org.eclipse.compare, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.jface, - org.eclipse.ui, - org.eclipse.draw2d, - org.eclipse.gef, - org.eclipse.ui.ide, - org.eclipse.ui.workbench.texteditor, - org.eclipse.core.expressions, - org.eclipse.ui.views, - org.jboss.tools.common.model, - org.jboss.tools.common.model.ui, - org.jboss.tools.common.text.xml, - org.jboss.tools.jst.web, - org.jboss.tools.jst.web.ui, - org.jboss.tools.seam.xml -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Activator: org.jboss.tools.seam.xml.ui.SeamXMLUiPlugin +Bundle-Vendor: %providerName +Export-Package: org.jboss.tools.seam.xml.ui, + org.jboss.tools.seam.xml.ui.editor.form, + org.jboss.tools.seam.xml.ui.editor.form.core, + org.jboss.tools.seam.xml.ui.wizard.newfile +Bundle-SymbolicName: org.jboss.tools.seam.xml.ui;singleton:=true +Bundle-Localization: plugin +Require-Bundle: org.eclipse.jface.text, + org.eclipse.jdt.ui, + org.eclipse.wst.sse.ui, + org.eclipse.wst.xml.core, + org.eclipse.wst.xml.ui, + org.eclipse.wst.common.frameworks.ui, + org.eclipse.wst.common.ui, + org.eclipse.compare, + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.jface, + org.eclipse.ui, + org.eclipse.draw2d, + org.eclipse.gef, + org.eclipse.ui.ide, + org.eclipse.ui.workbench.texteditor, + org.eclipse.core.expressions, + org.eclipse.ui.views, + org.jboss.tools.common.model, + org.jboss.tools.common.model.ui, + org.jboss.tools.common.text.xml, + org.jboss.tools.jst.web, + org.jboss.tools.jst.web.ui, + org.jboss.tools.seam.xml +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,34 +1,34 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.jboss.tools.seam.pages.xml.test;singleton:=true -Bundle-Version: 3.1.0.qualifier -Bundle-Vendor: %Bundle-Vendor.0 -Export-Package: org.jboss.tools.seam.pages.xml.test -Require-Bundle: - org.junit, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.jboss.tools.common.model, - org.jboss.tools.seam.pages.xml, - org.jboss.tools.common.test, - org.jboss.tools.jsf, - org.eclipse.wst.common.project.facet.core, - org.jboss.tools.tests, - org.eclipse.ui.workbench, - org.eclipse.wst.common.modulecore, - org.eclipse.wst.common.frameworks, - org.eclipse.jface, - org.jboss.tools.jst.firstrun, - org.eclipse.wst.server.core, - org.eclipse.datatools.connectivity, - org.eclipse.ltk.core.refactoring, - org.eclipse.ltk.ui.refactoring, - org.eclipse.jdt.core, - org.eclipse.jdt.ui, - org.eclipse.ui.ide, - org.eclipse.jface, - org.eclipse.jdt.core.manipulation, - org.eclipse.jst.jsf.core -Bundle-Localization: plugin +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-SymbolicName: org.jboss.tools.seam.pages.xml.test;singleton:=true +Bundle-Version: 3.1.0.qualifier +Bundle-Vendor: %Bundle-Vendor.0 +Export-Package: org.jboss.tools.seam.pages.xml.test +Require-Bundle: + org.junit, + org.eclipse.core.runtime, + org.eclipse.core.resources, + org.jboss.tools.common.model, + org.jboss.tools.seam.pages.xml, + org.jboss.tools.common.test, + org.jboss.tools.jsf, + org.eclipse.wst.common.project.facet.core, + org.jboss.tools.tests, + org.eclipse.ui.workbench, + org.eclipse.wst.common.modulecore, + org.eclipse.wst.common.frameworks, + org.eclipse.jface, + org.jboss.tools.jst.firstrun, + org.eclipse.wst.server.core, + org.eclipse.datatools.connectivity, + org.eclipse.ltk.core.refactoring, + org.eclipse.ltk.ui.refactoring, + org.eclipse.jdt.core, + org.eclipse.jdt.ui, + org.eclipse.ui.ide, + org.eclipse.jface, + org.eclipse.jdt.core.manipulation, + org.eclipse.jst.jsf.core +Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/struts/plugins/org.jboss.tools.struts/META-INF/MANIFEST.MF =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/struts/plugins/org.jboss.tools.struts/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,59 +1,59 @@ -Manifest-Version: 1.0 -Bundle-Name: %Bundle-Name.0 -Bundle-ClassPath: struts.jar -Bundle-ActivationPolicy: lazy -Bundle-Activator: org.jboss.tools.struts.StrutsModelPlugin -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.struts;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.common.meta.constraint.impl, - org.jboss.tools.common.meta.impl.adapters, - org.jboss.tools.struts, - org.jboss.tools.struts.gen.java, - org.jboss.tools.struts.model, - org.jboss.tools.struts.model.handlers, - org.jboss.tools.struts.model.handlers.page, - org.jboss.tools.struts.model.handlers.page.create, - org.jboss.tools.struts.model.helpers, - org.jboss.tools.struts.model.helpers.autolayout, - org.jboss.tools.struts.model.helpers.page, - org.jboss.tools.struts.model.helpers.page.link, - org.jboss.tools.struts.model.helpers.path, - org.jboss.tools.struts.model.icons, - org.jboss.tools.struts.model.pv, - org.jboss.tools.struts.model.pv.handler, - org.jboss.tools.struts.plugins.model, - org.jboss.tools.struts.plugins.model.handlers, - org.jboss.tools.struts.tictacktoe, - org.jboss.tools.struts.tiles.model.handlers, - org.jboss.tools.struts.validators.model, - org.jboss.tools.struts.validators.model.handlers, - org.jboss.tools.struts.validators.model.helpers, - org.jboss.tools.struts.webprj.model, - org.jboss.tools.struts.webprj.model.handlers, - org.jboss.tools.struts.webprj.model.helpers, - org.jboss.tools.struts.webprj.model.helpers.adopt, - org.jboss.tools.struts.webprj.model.helpers.context, - org.jboss.tools.struts.webprj.model.helpers.sync, - org.jboss.tools.struts.webprj.pattern, - org.jboss.tools.struts.webprj.resource, - org.jboss.tools.struts.model.handlers.refactoring, - org.jboss.tools.struts.messages -Require-Bundle: org.jboss.tools.common, - org.eclipse.jdt.core, - org.jboss.tools.common.model, - org.jboss.tools.jst.web, - org.jboss.tools.jst.web.tiles, - org.eclipse.ui, - org.eclipse.debug.core, - org.eclipse.wst.sse.core, - org.eclipse.wst.xml.core, - org.jboss.tools.common.projecttemplates, - org.eclipse.ltk.core.refactoring, - org.eclipse.ltk.ui.refactoring, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.apache.velocity;bundle-version="1.5.0" -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-Name: %Bundle-Name.0 +Bundle-ClassPath: struts.jar +Bundle-ActivationPolicy: lazy +Bundle-Activator: org.jboss.tools.struts.StrutsModelPlugin +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.struts;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.common.meta.constraint.impl, + org.jboss.tools.common.meta.impl.adapters, + org.jboss.tools.struts, + org.jboss.tools.struts.gen.java, + org.jboss.tools.struts.model, + org.jboss.tools.struts.model.handlers, + org.jboss.tools.struts.model.handlers.page, + org.jboss.tools.struts.model.handlers.page.create, + org.jboss.tools.struts.model.helpers, + org.jboss.tools.struts.model.helpers.autolayout, + org.jboss.tools.struts.model.helpers.page, + org.jboss.tools.struts.model.helpers.page.link, + org.jboss.tools.struts.model.helpers.path, + org.jboss.tools.struts.model.icons, + org.jboss.tools.struts.model.pv, + org.jboss.tools.struts.model.pv.handler, + org.jboss.tools.struts.plugins.model, + org.jboss.tools.struts.plugins.model.handlers, + org.jboss.tools.struts.tictacktoe, + org.jboss.tools.struts.tiles.model.handlers, + org.jboss.tools.struts.validators.model, + org.jboss.tools.struts.validators.model.handlers, + org.jboss.tools.struts.validators.model.helpers, + org.jboss.tools.struts.webprj.model, + org.jboss.tools.struts.webprj.model.handlers, + org.jboss.tools.struts.webprj.model.helpers, + org.jboss.tools.struts.webprj.model.helpers.adopt, + org.jboss.tools.struts.webprj.model.helpers.context, + org.jboss.tools.struts.webprj.model.helpers.sync, + org.jboss.tools.struts.webprj.pattern, + org.jboss.tools.struts.webprj.resource, + org.jboss.tools.struts.model.handlers.refactoring, + org.jboss.tools.struts.messages +Require-Bundle: org.jboss.tools.common, + org.eclipse.jdt.core, + org.jboss.tools.common.model, + org.jboss.tools.jst.web, + org.jboss.tools.jst.web.tiles, + org.eclipse.ui, + org.eclipse.debug.core, + org.eclipse.wst.sse.core, + org.eclipse.wst.xml.core, + org.jboss.tools.common.projecttemplates, + org.eclipse.ltk.core.refactoring, + org.eclipse.ltk.ui.refactoring, + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.apache.velocity;bundle-version="1.5.0" +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ManifestVersion: 2 +Bundle-ManifestVersion: 2 Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/META-INF/MANIFEST.MF =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,29 +1,29 @@ -Manifest-Version: 1.0 -Bundle-Name: %Bundle-Name.0 -Bundle-Activator: org.jboss.tools.struts.text.ext.StrutsExten - sionsPlugin -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.struts.text.ext;singleton:=true -Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui.ide, - org.eclipse.core.runtime, - org.eclipse.ui, - org.eclipse.text, - org.eclipse.jface.text, - org.eclipse.ui.workbench, - org.eclipse.jdt.core, - org.eclipse.core.resources, - org.jboss.tools.struts, - org.jboss.tools.common.text.ext, - org.jboss.tools.jst.text.ext, - org.jboss.tools.jst.web, - org.eclipse.wst.sse.core, - org.jboss.tools.common.model, - org.eclipse.wst.xml.core, - org.eclipse.jst.jsp.core, - org.jboss.tools.common -Export-Package: org.jboss.tools.struts.text.ext.hyperlink -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-Name: %Bundle-Name.0 +Bundle-Activator: org.jboss.tools.struts.text.ext.StrutsExten + sionsPlugin +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.struts.text.ext;singleton:=true +Bundle-Localization: plugin +Require-Bundle: org.eclipse.ui.ide, + org.eclipse.core.runtime, + org.eclipse.ui, + org.eclipse.text, + org.eclipse.jface.text, + org.eclipse.ui.workbench, + org.eclipse.jdt.core, + org.eclipse.core.resources, + org.jboss.tools.struts, + org.jboss.tools.common.text.ext, + org.jboss.tools.jst.text.ext, + org.jboss.tools.jst.web, + org.eclipse.wst.sse.core, + org.jboss.tools.common.model, + org.eclipse.wst.xml.core, + org.eclipse.jst.jsp.core, + org.jboss.tools.common +Export-Package: org.jboss.tools.struts.text.ext.hyperlink +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ActivationPolicy: lazy +Bundle-ActivationPolicy: lazy Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,66 +1,66 @@ -Manifest-Version: 1.0 -Bundle-Name: %pluginName -Bundle-Activator: org.jboss.tools.struts.ui.StrutsUIPlugin -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.struts.ui;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.struts.ui.internal.action, - org.jboss.tools.struts.ui, - org.jboss.tools.struts.ui.preferences, - org.jboss.tools.struts.ui, - org.jboss.tools.struts.ui.action, - org.jboss.tools.struts.ui.attribute.adapter, - org.jboss.tools.struts.ui.editor, - org.jboss.tools.struts.ui.editor.actions, - org.jboss.tools.struts.ui.editor.dnd, - org.jboss.tools.struts.ui.editor.edit, - org.jboss.tools.struts.ui.editor.figures, - org.jboss.tools.struts.ui.editor.model, - org.jboss.tools.struts.ui.editor.model.commands, - org.jboss.tools.struts.ui.editor.model.impl, - org.jboss.tools.struts.ui.editor.palette, - org.jboss.tools.struts.ui.editor.print, - org.jboss.tools.struts.ui.navigator, - org.jboss.tools.struts.ui.operation, - org.jboss.tools.struts.ui.wizard.addstruts, - org.jboss.tools.struts.ui.wizard.newfile, - org.jboss.tools.struts.ui.wizard.project, - org.jboss.tools.struts.ui.model.handlers.project, - org.jboss.tools.struts.ui.adapter, - org.jboss.tools.struts.ui.wizard.adopt, - org.jboss.tools.struts.ui.wizard.editproperties, - org.jboss.tools.struts.ui.wizard.selectitem, - org.jboss.tools.struts.ui.wizard.selectpage, - org.jboss.tools.struts.ui.wizard.selectpath, - org.jboss.tools.struts.ui.wizard.sync, - org.jboss.tools.struts.ui.editor -Require-Bundle: org.jboss.tools.common, - org.jboss.tools.common.gef, - org.eclipse.ui.ide, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.ui.editors, - org.eclipse.ui.views, - org.jboss.tools.common.model, - org.jboss.tools.common.model.ui, - org.jboss.tools.jst.web, - org.jboss.tools.jst.web.ui, - org.jboss.tools.jst.web.tiles, - org.jboss.tools.struts, - org.eclipse.jface, - org.eclipse.ui, - org.eclipse.jdt.core, - org.eclipse.jdt.ui, - org.jboss.tools.common.model.ui, - org.jboss.tools.common.text.xml, - org.eclipse.debug.core, - org.eclipse.wst.sse.ui, - org.eclipse.wst.xml.ui, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.gef, - org.eclipse.core.expressions -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-Name: %pluginName +Bundle-Activator: org.jboss.tools.struts.ui.StrutsUIPlugin +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.struts.ui;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.struts.ui.internal.action, + org.jboss.tools.struts.ui, + org.jboss.tools.struts.ui.preferences, + org.jboss.tools.struts.ui, + org.jboss.tools.struts.ui.action, + org.jboss.tools.struts.ui.attribute.adapter, + org.jboss.tools.struts.ui.editor, + org.jboss.tools.struts.ui.editor.actions, + org.jboss.tools.struts.ui.editor.dnd, + org.jboss.tools.struts.ui.editor.edit, + org.jboss.tools.struts.ui.editor.figures, + org.jboss.tools.struts.ui.editor.model, + org.jboss.tools.struts.ui.editor.model.commands, + org.jboss.tools.struts.ui.editor.model.impl, + org.jboss.tools.struts.ui.editor.palette, + org.jboss.tools.struts.ui.editor.print, + org.jboss.tools.struts.ui.navigator, + org.jboss.tools.struts.ui.operation, + org.jboss.tools.struts.ui.wizard.addstruts, + org.jboss.tools.struts.ui.wizard.newfile, + org.jboss.tools.struts.ui.wizard.project, + org.jboss.tools.struts.ui.model.handlers.project, + org.jboss.tools.struts.ui.adapter, + org.jboss.tools.struts.ui.wizard.adopt, + org.jboss.tools.struts.ui.wizard.editproperties, + org.jboss.tools.struts.ui.wizard.selectitem, + org.jboss.tools.struts.ui.wizard.selectpage, + org.jboss.tools.struts.ui.wizard.selectpath, + org.jboss.tools.struts.ui.wizard.sync, + org.jboss.tools.struts.ui.editor +Require-Bundle: org.jboss.tools.common, + org.jboss.tools.common.gef, + org.eclipse.ui.ide, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.ui.editors, + org.eclipse.ui.views, + org.jboss.tools.common.model, + org.jboss.tools.common.model.ui, + org.jboss.tools.jst.web, + org.jboss.tools.jst.web.ui, + org.jboss.tools.jst.web.tiles, + org.jboss.tools.struts, + org.eclipse.jface, + org.eclipse.ui, + org.eclipse.jdt.core, + org.eclipse.jdt.ui, + org.jboss.tools.common.model.ui, + org.jboss.tools.common.text.xml, + org.eclipse.debug.core, + org.eclipse.wst.sse.ui, + org.eclipse.wst.xml.ui, + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.gef, + org.eclipse.core.expressions +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ActivationPolicy: lazy +Bundle-ActivationPolicy: lazy Modified: trunk/struts/plugins/org.jboss.tools.struts.validator.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.validator.ui/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/struts/plugins/org.jboss.tools.struts.validator.ui/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,31 +1,31 @@ -Manifest-Version: 1.0 -Bundle-Name: %pluginName -Bundle-ManifestVersion: 2 -Bundle-Activator: org.jboss.tools.struts.validator.ui.XStudioValidato - rPlugin -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.struts.validator.ui;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.struts.validator.ui,org.jboss.tools.struts.validator.ui.adapter,org.jboss.tools.struts.validator.ui.constants,org.jboss.tools.struts.validator.ui.formset,org.jboss.tools.struts.validator.ui.formset.model,org.jboss.tools.struts.validator.ui.global,org.jboss.tools.struts.validator.ui.internal,org.jboss.tools.struts.validator.ui.wizard.depends,org.jboss.tools.struts.validator.ui.wizard.key,org.jboss.tools.struts.validator.ui -Require-Bundle: org.jboss.tools.common, - org.eclipse.ui.views, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.ui, - org.jboss.tools.common.model, - org.jboss.tools.common.model.ui, - org.jboss.tools.jst.web, - org.jboss.tools.struts, - org.jboss.tools.common.model.ui, - org.jboss.tools.common.text.xml, - org.jboss.tools.common.model.ui, - org.jboss.tools.struts.ui, - org.eclipse.ui.ide, - org.eclipse.ui.editors, - org.eclipse.wst.sse.ui, - org.eclipse.wst.xml.ui, - org.eclipse.core.resources, - org.eclipse.core.runtime -Bundle-Version: 3.1.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ActivationPolicy: lazy +Manifest-Version: 1.0 +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-Activator: org.jboss.tools.struts.validator.ui.XStudioValidato + rPlugin +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.struts.validator.ui;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.struts.validator.ui,org.jboss.tools.struts.validator.ui.adapter,org.jboss.tools.struts.validator.ui.constants,org.jboss.tools.struts.validator.ui.formset,org.jboss.tools.struts.validator.ui.formset.model,org.jboss.tools.struts.validator.ui.global,org.jboss.tools.struts.validator.ui.internal,org.jboss.tools.struts.validator.ui.wizard.depends,org.jboss.tools.struts.validator.ui.wizard.key,org.jboss.tools.struts.validator.ui +Require-Bundle: org.jboss.tools.common, + org.eclipse.ui.views, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.ui, + org.jboss.tools.common.model, + org.jboss.tools.common.model.ui, + org.jboss.tools.jst.web, + org.jboss.tools.struts, + org.jboss.tools.common.model.ui, + org.jboss.tools.common.text.xml, + org.jboss.tools.common.model.ui, + org.jboss.tools.struts.ui, + org.eclipse.ui.ide, + org.eclipse.ui.editors, + org.eclipse.wst.sse.ui, + org.eclipse.wst.xml.ui, + org.eclipse.core.resources, + org.eclipse.core.runtime +Bundle-Version: 3.1.0.qualifier +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-ActivationPolicy: lazy Modified: trunk/struts/plugins/org.jboss.tools.struts.verification/META-INF/MANIFEST.MF =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.verification/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/struts/plugins/org.jboss.tools.struts.verification/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,21 +1,21 @@ -Manifest-Version: 1.0 -Bundle-Name: %Bundle-Name.0 -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.struts.verification;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.struts.verification -Require-Bundle: org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.jdt.core, - org.jboss.tools.common.model, - org.jboss.tools.jst.web, - org.jboss.tools.common.verification, - org.jboss.tools.struts, - org.eclipse.ui, - org.jboss.tools.jst.web.verification -Bundle-Version: 3.1.0.qualifier -Bundle-Activator: org.jboss.tools.struts.verification.StrutsVerificationPlugin +Manifest-Version: 1.0 +Bundle-Name: %Bundle-Name.0 +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.struts.verification;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.struts.verification +Require-Bundle: org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.jdt.core, + org.jboss.tools.common.model, + org.jboss.tools.jst.web, + org.jboss.tools.common.verification, + org.jboss.tools.struts, + org.eclipse.ui, + org.jboss.tools.jst.web.verification +Bundle-Version: 3.1.0.qualifier +Bundle-Activator: org.jboss.tools.struts.verification.StrutsVerificationPlugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ActivationPolicy: lazy -Bundle-ClassPath: . +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . Modified: trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,65 +1,65 @@ -Manifest-Version: 1.0 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-ClassPath: vpe.jar -Bundle-Activator: org.jboss.tools.vpe.VpePlugin -Bundle-ManifestVersion: 2 -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.vpe;singleton:=true -Bundle-Localization: plugin -Export-Package: - org.jboss.tools.vpe, - org.jboss.tools.vpe.dnd, - org.jboss.tools.vpe.editor, - org.jboss.tools.vpe.editor.bundle, - org.jboss.tools.vpe.editor.context, - org.jboss.tools.vpe.editor.dnd.context, - org.jboss.tools.vpe.editor.dnd.context.xpl, - org.jboss.tools.vpe.editor.i18n, - org.jboss.tools.vpe.editor.mapping, - org.jboss.tools.vpe.editor.menu, - org.jboss.tools.vpe.editor.menu.action, - org.jboss.tools.vpe.editor.menu.xpl, - org.jboss.tools.vpe.editor.mozilla, - org.jboss.tools.vpe.editor.preferences, - org.jboss.tools.vpe.editor.proxy, - org.jboss.tools.vpe.editor.selection, - org.jboss.tools.vpe.editor.template, - org.jboss.tools.vpe.editor.template.custom, - org.jboss.tools.vpe.editor.template.expression, - org.jboss.tools.vpe.editor.template.resize, - org.jboss.tools.vpe.editor.template.textformating, - org.jboss.tools.vpe.editor.toolbar, - org.jboss.tools.vpe.editor.toolbar.format, - org.jboss.tools.vpe.editor.toolbar.format.css, - org.jboss.tools.vpe.editor.toolbar.format.handler, - org.jboss.tools.vpe.editor.util, - org.jboss.tools.vpe.editor.wizards, - org.jboss.tools.vpe.editor.xpl, - org.jboss.tools.vpe.messages, - org.jboss.tools.vpe.selbar -Require-Bundle: org.eclipse.jface.text, - org.jboss.tools.jst.jsp, - org.jboss.tools.jst.web, - org.eclipse.wst.xml.ui, - org.eclipse.compare, - org.eclipse.wst.common.ui, - org.eclipse.ui, - org.eclipse.ui.workbench.texteditor, - org.eclipse.ui.views, - org.eclipse.ui.ide, - org.jboss.tools.vpe.xulrunner, - org.mozilla.xpcom;bundle-version="1.9.1", - org.eclipse.draw2d, - org.jboss.tools.jst.web;visibility:=reexport, - org.jboss.tools.vpe.resref, - org.jboss.tools.common.el.core, - org.jboss.tools.common.el.ui, - org.jboss.tools.jst.web.kb, - org.eclipse.jdt.ui, - org.eclipse.wst.sse.ui;bundle-version="1.1.100", - org.eclipse.wst.sse.core;bundle-version="1.1.400", - org.eclipse.core.expressions;bundle-version="3.4.100", - org.jboss.tools.common.model.ui;bundle-version="2.0.0" -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-ClassPath: vpe.jar +Bundle-Activator: org.jboss.tools.vpe.VpePlugin +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.vpe;singleton:=true +Bundle-Localization: plugin +Export-Package: + org.jboss.tools.vpe, + org.jboss.tools.vpe.dnd, + org.jboss.tools.vpe.editor, + org.jboss.tools.vpe.editor.bundle, + org.jboss.tools.vpe.editor.context, + org.jboss.tools.vpe.editor.dnd.context, + org.jboss.tools.vpe.editor.dnd.context.xpl, + org.jboss.tools.vpe.editor.i18n, + org.jboss.tools.vpe.editor.mapping, + org.jboss.tools.vpe.editor.menu, + org.jboss.tools.vpe.editor.menu.action, + org.jboss.tools.vpe.editor.menu.xpl, + org.jboss.tools.vpe.editor.mozilla, + org.jboss.tools.vpe.editor.preferences, + org.jboss.tools.vpe.editor.proxy, + org.jboss.tools.vpe.editor.selection, + org.jboss.tools.vpe.editor.template, + org.jboss.tools.vpe.editor.template.custom, + org.jboss.tools.vpe.editor.template.expression, + org.jboss.tools.vpe.editor.template.resize, + org.jboss.tools.vpe.editor.template.textformating, + org.jboss.tools.vpe.editor.toolbar, + org.jboss.tools.vpe.editor.toolbar.format, + org.jboss.tools.vpe.editor.toolbar.format.css, + org.jboss.tools.vpe.editor.toolbar.format.handler, + org.jboss.tools.vpe.editor.util, + org.jboss.tools.vpe.editor.wizards, + org.jboss.tools.vpe.editor.xpl, + org.jboss.tools.vpe.messages, + org.jboss.tools.vpe.selbar +Require-Bundle: org.eclipse.jface.text, + org.jboss.tools.jst.jsp, + org.jboss.tools.jst.web, + org.eclipse.wst.xml.ui, + org.eclipse.compare, + org.eclipse.wst.common.ui, + org.eclipse.ui, + org.eclipse.ui.workbench.texteditor, + org.eclipse.ui.views, + org.eclipse.ui.ide, + org.jboss.tools.vpe.xulrunner, + org.mozilla.xpcom;bundle-version="1.9.1", + org.eclipse.draw2d, + org.jboss.tools.jst.web;visibility:=reexport, + org.jboss.tools.vpe.resref, + org.jboss.tools.common.el.core, + org.jboss.tools.common.el.ui, + org.jboss.tools.jst.web.kb, + org.eclipse.jdt.ui, + org.eclipse.wst.sse.ui;bundle-version="1.1.100", + org.eclipse.wst.sse.core;bundle-version="1.1.400", + org.eclipse.core.expressions;bundle-version="3.4.100", + org.jboss.tools.common.model.ui;bundle-version="2.0.0" +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,17 +1,17 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-ActivationPolicy: lazy -Bundle-Name: %pluginName -Bundle-Activator: org.jboss.tools.vpe.ui.palette.PalettePlugin -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.vpe.ui.palette -Bundle-Localization: plugin -Export-Package: org.jboss.tools.vpe.ui.palette,org.jboss.tools.vpe.ui.palette.model -Require-Bundle: org.eclipse.ui.ide, - org.eclipse.jface.text, - org.eclipse.ui, - org.eclipse.gef, - org.jboss.tools.common.model.ui, - org.jboss.tools.jst.jsp -Bundle-Version: 3.1.0.qualifier +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Activator: org.jboss.tools.vpe.ui.palette.PalettePlugin +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.vpe.ui.palette +Bundle-Localization: plugin +Export-Package: org.jboss.tools.vpe.ui.palette,org.jboss.tools.vpe.ui.palette.model +Require-Bundle: org.eclipse.ui.ide, + org.eclipse.jface.text, + org.eclipse.ui, + org.eclipse.gef, + org.jboss.tools.common.model.ui, + org.jboss.tools.jst.jsp +Bundle-Version: 3.1.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/workingset/features/org.jboss.tools.workingset.feature/feature.xml =================================================================== --- trunk/workingset/features/org.jboss.tools.workingset.feature/feature.xml 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/workingset/features/org.jboss.tools.workingset.feature/feature.xml 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,34 +1,34 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.workingset.feature" - label="JBoss Tools Working Set " - version="1.0.0.qualifier" - provider-name="JBoss by Red Hat"> - - <description url="http://www.example.com/description"> - [Enter Feature Description here.] - </description> - - <copyright url="http://www.example.com/copyright"> - [Enter Copyright Description here.] - </copyright> - - <license url="http://www.example.com/license"> - [Enter License Description here.] - </license> - - <plugin - id="org.jboss.tools.workingset.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.workingset.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.workingset.feature" + label="JBoss Tools Working Set " + version="1.0.0.qualifier" + provider-name="JBoss by Red Hat"> + + <description url="http://www.example.com/description"> + [Enter Feature Description here.] + </description> + + <copyright url="http://www.example.com/copyright"> + [Enter Copyright Description here.] + </copyright> + + <license url="http://www.example.com/license"> + [Enter License Description here.] + </license> + + <plugin + id="org.jboss.tools.workingset.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.workingset.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,13 +1,13 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Mozilla XPCOM Eclipse plugin -Bundle-SymbolicName: org.mozilla.xpcom;singleton:=true -Bundle-Version: 1.9.1.2a -Bundle-ClassPath: MozillaGlue.jar, - MozillaInterfaces.jar -Export-Package: org.mozilla.interfaces, - org.mozilla.xpcom -Bundle-Vendor: mozilla.org -Eclipse-BuddyPolicy: registered -Bundle-RequiredExecutionEnvironment: J2SE-1.5 - +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Mozilla XPCOM Eclipse plugin +Bundle-SymbolicName: org.mozilla.xpcom;singleton:=true +Bundle-Version: 1.9.1.2a +Bundle-ClassPath: MozillaGlue.jar, + MozillaInterfaces.jar +Export-Package: org.mozilla.interfaces, + org.mozilla.xpcom +Bundle-Vendor: mozilla.org +Eclipse-BuddyPolicy: registered +Bundle-RequiredExecutionEnvironment: J2SE-1.5 + Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx/META-INF/MANIFEST.MF =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,9 +1,9 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Mozilla Xulrunner -Bundle-SymbolicName: org.mozilla.xulrunner.carbon.macosx;singleton:=tr - ue -Bundle-Version: 1.9.1.2 -Bundle-Vendor: mozilla.org -Eclipse-PlatformFilter: (& (osgi.ws=carbon)(osgi.os=macosx)) - +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Mozilla Xulrunner +Bundle-SymbolicName: org.mozilla.xulrunner.carbon.macosx;singleton:=tr + ue +Bundle-Version: 1.9.1.2 +Bundle-Vendor: mozilla.org +Eclipse-PlatformFilter: (& (osgi.ws=carbon)(osgi.os=macosx)) + Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/META-INF/MANIFEST.MF =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,9 +1,9 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Mozilla Xulrunner -Bundle-SymbolicName: org.mozilla.xulrunner.cocoa.macosx;singleton:=tr - ue -Bundle-Version: 1.9.1.2 -Bundle-Vendor: mozilla.org -Eclipse-PlatformFilter: (& (osgi.ws=cocoa)(osgi.os=macosx)) - +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Mozilla Xulrunner +Bundle-SymbolicName: org.mozilla.xulrunner.cocoa.macosx;singleton:=tr + ue +Bundle-Version: 1.9.1.2 +Bundle-Vendor: mozilla.org +Eclipse-PlatformFilter: (& (osgi.ws=cocoa)(osgi.os=macosx)) + Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,9 +1,9 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Mozilla Xulrunner -Bundle-SymbolicName: org.mozilla.xulrunner.gtk.linux.x86;singleton:=tr - ue -Bundle-Version: 1.9.1.2 -Bundle-Vendor: mozilla.org -Eclipse-PlatformFilter: (& (osgi.ws=gtk)(osgi.os=linux)(osgi.arch=x86)) - +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Mozilla Xulrunner +Bundle-SymbolicName: org.mozilla.xulrunner.gtk.linux.x86;singleton:=tr + ue +Bundle-Version: 1.9.1.2 +Bundle-Vendor: mozilla.org +Eclipse-PlatformFilter: (& (osgi.ws=gtk)(osgi.os=linux)(osgi.arch=x86)) + Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,9 +1,9 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Mozilla Xulrunner Linux x86_64 -Bundle-SymbolicName: org.mozilla.xulrunner.gtk.linux.x86_64;singleton: - =true -Bundle-Version: 1.9.1.2a -Bundle-Vendor: mozilla.org -Eclipse-PlatformFilter: (& (osgi.ws=gtk)(osgi.os=linux)(osgi.arch=x86_64)) - +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Mozilla Xulrunner Linux x86_64 +Bundle-SymbolicName: org.mozilla.xulrunner.gtk.linux.x86_64;singleton: + =true +Bundle-Version: 1.9.1.2a +Bundle-Vendor: mozilla.org +Eclipse-PlatformFilter: (& (osgi.ws=gtk)(osgi.os=linux)(osgi.arch=x86_64)) + Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF 2010-06-23 17:18:37 UTC (rev 22965) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF 2010-06-23 18:39:59 UTC (rev 22966) @@ -1,9 +1,9 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Mozilla Xulrunner -Bundle-SymbolicName: org.mozilla.xulrunner.win32.win32.x86;singleton:= - true -Bundle-Version: 1.9.1.2 -Bundle-Vendor: mozilla.org -Eclipse-PlatformFilter: (& (osgi.ws=win32)(osgi.os=win32)(osgi.arch=x86)) - +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Mozilla Xulrunner +Bundle-SymbolicName: org.mozilla.xulrunner.win32.win32.x86;singleton:= + true +Bundle-Version: 1.9.1.2 +Bundle-Vendor: mozilla.org +Eclipse-PlatformFilter: (& (osgi.ws=win32)(osgi.os=win32)(osgi.arch=x86)) +

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22964 - in trunk: build/util and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-06-23 13:15:48 -0400 (Wed, 23 Jun 2010) New Revision: 22964 Added: trunk/build/util/component-dependencies-graph.png trunk/build/util/genpom.scala trunk/build/util/genpom.xml trunk/build/util/runstack.sh trunk/build/util/runtests.sh trunk/build/util/svnignore.sh Removed: trunk/component-dependencies-graph.png trunk/genpom.scala trunk/genpom.xml trunk/runstack.sh trunk/runtests.sh trunk/svnignore.sh Log: moved into build/util/ Copied: trunk/build/util/component-dependencies-graph.png (from rev 22821, trunk/component-dependencies-graph.png) =================================================================== (Binary files differ) Property changes on: trunk/build/util/component-dependencies-graph.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/build/util/genpom.scala (from rev 22821, trunk/genpom.scala) =================================================================== --- trunk/build/util/genpom.scala (rev 0) +++ trunk/build/util/genpom.scala 2010-06-23 17:15:48 UTC (rev 22964) @@ -0,0 +1,281 @@ +import java.io.File +import scala.io.Source +import scala.xml.XML + +object GenPom { + + case class GVA(groupId : String, artifactId : String, version : String) + + /********** Configuration Start **********/ + var projectName = "org.jboss.tools" + var pathToParentPom = "" + var parentPomVersion = "0.0.1-SNAPSHOT" + var sourcePomVersion = "0.0.1-SNAPSHOT" + /********** Configuration Ends **********/ + + var aggregatorcount = 0 + var modulecount = 0 + + def main(args: Array[String]) { + + generateAggregator(new File("."), + new File(pathToParentPom + "parent-pom.xml"), + GVA(projectName, projectName + ".parent.pom", parentPomVersion), + GVA(projectName, "trunk", sourcePomVersion) + ) + + println("Modules: " + modulecount + " Aggregator: " + aggregatorcount) + } + + def generateModule(dir : File, parentPom : File, parent : GVA, me : GVA) { + modulecount = modulecount + 1 + + + + var module = + <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> + <relativePath>{parentPom.getPath()}</relativePath> + <groupId>{parent.groupId}</groupId> + <artifactId>{parent.artifactId}</artifactId> + <version>{parent.version}</version> + </parent> + <groupId>{me.groupId}</groupId> + <artifactId>{me.artifactId}</artifactId> + <version>{getVersion(dir)}</version> + <packaging>{ if (dir.getParentFile().getAbsolutePath().endsWith("/tests") || dir.getParentFile().getAbsolutePath().endsWith("/tests/.")) + "eclipse-test-plugin" + else if (dir.getParentFile().getAbsolutePath().endsWith("/features") || dir.getParentFile().getAbsolutePath().endsWith("/features/.")) + "eclipse-feature" + else + "eclipse-plugin"}</packaging> + { getTarget(dir) } + </project>; + + val pp = new scala.xml.PrettyPrinter(80,2) + + writePom("Module ", pp.format(module), dir) + + } + + def getTarget(dir : File) : Object ={ + var env = <environment/>; + + if (dir.getAbsolutePath().endsWith("gtk.linux.x86")) { + env = <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86</arch> + </environment>; + } else if (dir.getAbsolutePath().endsWith("gtk.linux.x86_64")) { + env = <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86_64</arch> + </environment>; + } else if (dir.getAbsolutePath().endsWith("carbon.macosx")) { + env = <environment> + <os>macosx</os> + <ws>carbon</ws> + <arch>x86</arch> + </environment>; + } else if (dir.getAbsolutePath().endsWith("cocoa.macosx")) { + env = <environment> + <os>macosx</os> + <ws>cocoa</ws> + <arch>x86</arch> + </environment>; + } else if (dir.getAbsolutePath().endsWith("win32.win32.x86")) { + env = <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86</arch> + </environment>; + } + + var target = <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${{tychoVersion}}</version> + <configuration> + <resolver>p2</resolver> + <environments> + { env } + </environments> + </configuration> + </plugin> + </plugins> + </build>; + + if(dir.getAbsolutePath().endsWith("x86_64") + || dir.getAbsolutePath().endsWith("x86") + || dir.getAbsolutePath().endsWith("macosx")) { + return target + } + return "" + } + + def writePom(n : String, pp : String, dir : File) { + val pomxml = new File(dir, "pom.xml") + + val out = new java.io.FileWriter(pomxml) + out.write(pp) + out.close + + } + + def getVersion(dir : File) : String = { + + var mf = new File(new File(dir, "META-INF"), "MANIFEST.MF") + var featurexml = new File(dir, "feature.xml") + + if(mf.exists()) { + val lines = Source.fromFile(mf).getLines + for(l <- lines) + if(l.contains("Bundle-Version:")) { + return l.substring("Bundle-Version:".length()).trim().replaceAll("\\.qualifier","-SNAPSHOT") + } + } else if (featurexml.exists()) { + val data = XML.loadFile(featurexml) + return (data \ "@version").text.replaceAll("\\.qualifier","-SNAPSHOT") + } + return dir + " " + featurexml.exists() + " " + mf.exists() + } + + def getArtifactId(dir : File) : String = { + + var mf = new File(new File(dir, "META-INF"), "MANIFEST.MF") + var featurexml = new File(dir, "feature.xml") + + if(mf.exists()) { + val lines = Source.fromFile(mf).getLines + for(l <- lines) + if(l.contains("Bundle-SymbolicName:")) { + val x = l.substring("Bundle-SymbolicName:".length()).trim() + if(x.indexOf(";")>=0) { + return x.substring(0, x.indexOf(";")) + } else { + return x + } + } + } else if (featurexml.exists()) { + val data = XML.loadFile(featurexml) + return (data \ "@id").text + } + return dir + " " + featurexml.exists() + " " + mf.exists() + } + + def dump(dirs : Collection[File], parentPom : File, parent : GVA, me : GVA) { + for(f <- dirs) { + var aggregate = false + val manifest = new File(new File(f, "META-INF"), "MANIFEST.MF") + val plugins = new File(f, "plugins") + val tests = new File(f, "tests") + val features = new File(f, "features") + val featurexml = new File(f, "feature.xml") + + if(manifest.exists() || featurexml.exists()) { + generateModule(f, + new File("../" + parentPom.getPath()), + parent, + GVA(me.groupId, getArtifactId(f), me.version)) + } + + if(plugins.exists()) { + aggregate = true + generateAggregator(plugins, + new File("../../" + parentPom.getPath()), + parent, + GVA(me.groupId, f.getName() + ".plugins" , "0.0.1-SNAPSHOT") + ) + } + + if(tests.exists()) { + aggregate = true + generateAggregator(tests, + new File("../../" + parentPom.getPath()), + parent, + GVA(me.groupId, f.getName() + ".tests", "0.0.1-SNAPSHOT") + ) + } + + if(features.exists()) { + aggregate = true + generateAggregator(features, + new File("../../" + parentPom.getPath()), + parent, + GVA(me.groupId, f.getName()+".features" , "0.0.1-SNAPSHOT") + ) + } + + if(aggregate) { + println("Generate Agg for " + f) + generateAggregator(f, new File("../" + parentPom.getPath()), parent, GVA(me.groupId, f.getName()+".all", "0.0.1-SNAPSHOT")) + } + } + } + + def isModule(n : File) : Boolean = { + def v = (new File(n, "pom.xml").exists() && !n.getName().equals("docs")) || + (!n.getName().contains(".sdk.") && (new File(new File(n, "META-INF"), "MANIFEST.MF").exists()) || (new File(n, "feature.xml").exists())) || (hasDirectory(n, "features") || hasDirectory(n, "tests") || hasDirectory(n, "plugins")) + return v + } + + def hasDirectory(parent : File, name : String) : Boolean = { + + val dir = new File(parent, name) + return dir.isDirectory() && dir.exists() + } + + def generateAggregator(dir : File, + parentPom : File, + parent : GVA, + me : GVA + ) { + aggregatorcount = aggregatorcount + 1 + + val dirs = dir.listFiles().filter( + (n) => n.isDirectory() && !n.getName().startsWith(".") && !n.getName().contains(".sdk.") + ) + + val realModules = dirs.filter( + (n) => isModule(n)) + + var modules = + <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> + <relativePath>{parentPom.getPath()}</relativePath> + <groupId>{parent.groupId}</groupId> + <artifactId>{parent.artifactId}</artifactId> + <version>{parent.version}</version> + </parent> + <groupId>{me.groupId}</groupId> + <artifactId>{me.artifactId}</artifactId> + <version>{me.version}</version> + <packaging>pom</packaging> + <modules> + { + for(f <- realModules) yield { + <module>{ f.getName() }</module> + } + } + </modules> + </project>; + + val pp = new scala.xml.PrettyPrinter(80,2) + writePom("Aggregator ", pp.format(modules),dir) + //println(pp.format(modules)) + + dump(dirs, parentPom, parent, me) + + + } + +} + + +GenPom.main(args) Copied: trunk/build/util/genpom.xml (from rev 22821, trunk/genpom.xml) =================================================================== --- trunk/build/util/genpom.xml (rev 0) +++ trunk/build/util/genpom.xml 2010-06-23 17:15:48 UTC (rev 22964) @@ -0,0 +1,1142 @@ +<project default="run" basedir="." name="jbosstools genpom.xml"> +  + <property name="projectName" value="org.jboss.tools" /> + <property name="pathToParentPom" value="" /> + <property name="pomVersion" value="0.0.1-SNAPSHOT" /> + <property name="dirsToExclude" + value="**/*.sdk.*, **/doc*/**, **/releng/**, **/build/**, **/download.jboss.org, **/sampleprojects/**, **/util/**, **/test, **/builders/**, **/contrib, **/releng/**, ." + /> + <property name="testClassFilesToInclude" + value="**/AllTests.java, **/*AllTests*.java, **/*AllBotTests*.java, **/*TestSuite*.java" + /> + + <property name="overwrite.existing.pom.xml" value="false" /> +  + +  + <target name="help" description="Usage Instructions"> + <echo> +To run this script in Eclipse: + Run As > Ant Build + +To run this script via commandline: + cd /path/to/checked/out/source/tree; \ + ant -f genpom.xml -q + +or, to build a specific module IFF no poms already exist: + ant -f genpom.xml -q -DCOMPONENT=xulrunner + +or, to build a specific module and overwrite existing pom.xml files: + ant -f genpom.xml -q -DCOMPONENT=common -Doverwrite.existing.pom.xml=true +</echo> + </target> + + <target name="get.ant-contrib" unless="ant-contrib.jar.exists"> + <property name="ANTCONTRIB_MIRROR" value="http://downloads.sourceforge.net/ant-contrib/" /> + <get usetimestamp="true" + dest="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" + src="${ANTCONTRIB_MIRROR}/ant-contrib-1.0b2-bin.zip" + /> + <touch file="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" /> + <mkdir dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" /> + <unzip src="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" + dest="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" + overwrite="true" + /> + <copy file="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_/ant-contrib/lib/ant-contrib.jar" + tofile="${COMMON_TOOLS}/ant-contrib.jar" + failonerror="true" + /> + <delete dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" includeemptydirs="true" quiet="true" /> + </target> + +  + <condition property="isInHudson" value="true"> + <or> + <contains string="${user.dir}" substring="hudson" /> + <contains string="${user.name}" substring="hudson" /> + <contains string="${user.home}" substring="hudson" /> + </or> + </condition> + <target name="local" unless="isInHudson"> + <property name="WORKINGDIR" value="${basedir}" /> + <property name="COMMON_TOOLS" value="${java.io.tmpdir}" /> + </target> + + <target name="init" depends="local"> +  + <condition property="WORKINGDIR" value="/home/hudson/static_build_env/jbds/tools/sources" else="${basedir}"> + <available file="/home/hudson/static_build_env/jbds" type="dir" /> + </condition> + <mkdir dir="${WORKINGDIR}" /> + <echo level="info">WORKINGDIR = ${WORKINGDIR}</echo> + + <condition property="COMMON_TOOLS" + value="/home/hudson/static_build_env/jbds/tools" + else="${WORKINGDIR}/../tools" + > + <available file="/home/hudson/static_build_env/jbds" type="dir" /> + </condition> + <mkdir dir="${COMMON_TOOLS}" /> + <echo level="info">COMMON_TOOLS = ${COMMON_TOOLS}</echo> + + <available file="${COMMON_TOOLS}/ant-contrib.jar" type="file" property="ant-contrib.jar.exists" /> + <antcall target="get.ant-contrib" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" /> + </classpath> + </taskdef> + + <var name="pathToParentPomInput" value="${pathToParentPom}"/> + +  + <macrodef name="writeAggregatePom"> + <attribute name="dir" default="." /> + <attribute name="parentpom" /> + <attribute name="artifactId" default="" /> + <attribute name="artifactVersion" default="" /> + <sequential> + <if> + <equals arg1="@{artifactId}" arg2="" /> + <then> + <var name="artifactId" unset="true" /> + <antcallback target="getArtifactId" return="artifactId"> + <property name="dir" value="@{dir}" /> + </antcallback> + </then> + <else> + <var name="artifactId" value="@{artifactId}" /> + </else> + </if> + <if> + <equals arg1="@{artifactVersion}" arg2="" /> + <then> + <var name="artifactVersion" unset="true" /> + <antcallback target="getArtifactVersion" return="artifactVersion"> + <property name="dir" value="@{dir}" /> + </antcallback> + </then> + <else> + <var name="artifactVersion" value="@{artifactVersion}" /> + </else> + </if> + <var name="artifactType" value="pom" /> + <propertyregex property="activeDir" + input="@{dir}" + defaultvalue="@{dir}" + regexp="${WORKINGDIR}/" + replace="" + casesensitive="true" + override="true" + /> + <echo level="verbose"> Agg dir: ${activeDir}, artifactType: ${artifactType}, artifactId: ${artifactId}, artifactVersion: ${artifactVersion}, parentpom: @{parentpom}</echo> + <if> + <and> + <available file="@{dir}/pom.xml" type="file" /> + <not> + <istrue value="${overwrite.existing.pom.xml}" /> + </not> + </and> + <then> + <var name="show.pom.exists.warning" value="${show.pom.exists.warning}1" /> + </then> + </if> + <if> + <or> + <not> + <available file="@{dir}/pom.xml" type="file" /> + </not> + <istrue value="${overwrite.existing.pom.xml}" /> + </or> + <then> + <echo file="@{dir}/pom.xml"><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> + <relativePath>@{parentpom}</relativePath> + <groupId>${projectName}</groupId> + <artifactId>${projectName}.parent.pom</artifactId> + <version>${pomVersion}</version> + </parent> + <groupId>${projectName}</groupId> + <artifactId>${artifactId}</artifactId> + <version>${artifactVersion}</version> + <packaging>${artifactType}</packaging> + <modules> +</echo> + <var name="artifactId" unset="true" /> + <var name="artifactVersion" unset="true" /> + <for param="subdir" delimiter=", + "> + <path> + <dirset dir="@{dir}" excludes="${dirsToExclude}" includes="*" /> + </path> + <sequential> + <basename property="subdirSuffix" file="@{subdir}" /> + <echo file="@{dir}/pom.xml" append="true"> <module>${subdirSuffix}</module> +</echo> + <var name="subdirSuffix" unset="true" /> + </sequential> + </for> + <echo file="@{dir}/pom.xml" append="true"> </modules> +</project> + </echo> + </then> + </if> + </sequential> + </macrodef> + +  + <macrodef name="writeModulePom"> + <attribute name="dir" default="." /> + <attribute name="parentpom" /> + <sequential> + <var name="artifactType" unset="true" /> + <antcallback target="getArtifactType" return="artifactType"> + <property name="dir" value="@{dir}" /> + </antcallback> + <if> + <equals arg1="${artifactType}" arg2="eclipse-update-site" /> + <then> + <var name="artifactId" unset="true" /> + <basename property="artifactId" file="@{dir}" /> + <var name="artifactVersion" value="${pomVersion}" /> + </then> + <else> + <var name="artifactId" unset="true" /> + <antcallback target="getArtifactId" return="artifactId"> + <property name="dir" value="@{dir}" /> + </antcallback> + <var name="artifactVersion" unset="true" /> + <antcallback target="getArtifactVersion" return="artifactVersion"> + <property name="dir" value="@{dir}" /> + </antcallback> + <var name="artifactOs" unset="true" /> + <var name="artifactWs" unset="true" /> + <var name="artifactArch" unset="true" /> + <antcallback target="getArtifactOsWsArch" return="artifactOs, artifactWs, artifactArch"> + <property name="artifactId" value="${artifactId}" /> + </antcallback> + </else> + </if> + <propertyregex property="activeDir" + input="@{dir}" + defaultvalue="@{dir}" + regexp="${WORKINGDIR}/" + replace="" + casesensitive="true" + override="true" + /> + <echo level="verbose"> Mod dir: ${activeDir}, artifactType: ${artifactType}, artifactId: ${artifactId}, artifactVersion: ${artifactVersion}, parentpom: @{parentpom}</echo> + <if> + <and> + <available file="@{dir}/pom.xml" type="file" /> + <not> + <istrue value="${overwrite.existing.pom.xml}" /> + </not> + </and> + <then> + <var name="show.pom.exists.warning" value="${show.pom.exists.warning}1" /> + </then> + </if> + <if> + <or> + <not> + <available file="@{dir}/pom.xml" type="file" /> + </not> + <istrue value="${overwrite.existing.pom.xml}" /> + </or> + <then> + <echo file="@{dir}/pom.xml"><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> + <relativePath>@{parentpom}</relativePath> + <groupId>${projectName}</groupId> + <artifactId>${projectName}.parent.pom</artifactId> + <version>${pomVersion}</version> + </parent> + <groupId>${projectName}</groupId> + <artifactId>${artifactId}</artifactId> + <version>${artifactVersion}</version> + <packaging>${artifactType}</packaging> +</echo> + <if> + <or> + <and> + <isset property="artifactOs" /> + <not> + <equals arg1="" arg2="${artifactOs}" /> + </not> + </and> + <and> + <isset property="artifactWs" /> + <not> + <equals arg1="" arg2="${artifactWs}" /> + </not> + </and> + <and> + <isset property="artifactArch" /> + <not> + <equals arg1="" arg2="${artifactArch}" /> + </not> + </and> + </or> + <then> + <echo file="@{dir}/pom.xml" append="true"> <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tychoVersion}</version> + <configuration> + <resolver>p2</resolver> + <environments> + <environment> + <os>${artifactOs}</os> + <ws>${artifactWs}</ws> + <arch>${artifactArch}</arch> + </environment> + </environments> + </configuration> + </plugin> + </plugins> + </build> +</echo> + </then> + </if> + <echo file="@{dir}/pom.xml" append="true"></project> +</echo> + </then> + </if> + <var name="artifactId" unset="true" /> + <var name="artifactVersion" unset="true" /> + <var name="artifactType" unset="true" /> + <var name="artifactOs" unset="true" /> + <var name="artifactWs" unset="true" /> + <var name="artifactArch" unset="true" /> + <var name="modulecountstring" value="${modulecountstring}1" /> + </sequential> + </macrodef> + +  + <macrodef name="generateAggregator"> + <attribute name="dir" default="${WORKINGDIR}" /> + <attribute name="parentPom" default="${pathToParentPom}parent-pom.xml" /> + <attribute name="artifactId" default="" /> + <attribute name="artifactVersion" default="" /> + <sequential> + <writeAggregatePom dir="@{dir}" + parentpom="@{parentpom}" + artifactId="@{artifactId}" + artifactVersion="@{artifactVersion}" + /> + + <dump dir="@{dir}" + parentpom="@{parentpom}" + artifactId="@{artifactId}" + artifactVersion="@{artifactVersion}" + /> + <var name="aggregatorcountstring" value="${aggregatorcountstring}1" /> + + </sequential> + </macrodef> + + +  + <macrodef name="dump"> + <attribute name="dir" /> + <attribute name="parentpom" /> + <attribute name="artifactId" default="" /> + <attribute name="artifactVersion" default="" /> + <sequential> + <if> + <equals arg1="${COMPONENT}" arg2="trunk" /> + <then> + <path id="trunkDir"> + <dirset dir="@{dir}" excludes="${dirsToExclude}" includes="*" /> + </path> + </then> + <elseif> + <equals arg1="${COMPONENT}" arg2="site" /> + <then> + <dirname property="parent.dir" file="@{dir}" /> + <path id="trunkDir"> + <dirset dir="${parent.dir}" includes="site" /> + </path> + <var name="parent.dir" unset="true" /> + <var name="pathToParentPom" value="${pathToParentPom}site/" /> + </then> + </elseif> + <else> + <path id="trunkDir"> + <dirset dir="@{dir}/${pathToParentPom}" + excludes="${dirsToExclude}" + includes="${COMPONENT}/*/*, ${COMPONENT}/plugins, ${COMPONENT}/features, ${COMPONENT}/tests, ${COMPONENT}/site" + /> + </path> + </else> + </if> + <for param="subdir" delimiter=", + "> + <path refid="trunkDir" /> + <sequential> + <echo level="debug">@{subdir}</echo> + <var name="aggregate" value="false" /> + <if> + <or> +  + <available file="@{subdir}/META-INF/MANIFEST.MF" type="file" /> + <available file="@{subdir}/feature.xml" type="file" /> + </or> + <then> +  + <writeModulePom dir="@{subdir}" parentpom="../${pathToParentPom}@{parentpom}" /> + </then> + <elseif> + <available file="@{subdir}/site.xml" type="file" /> + <then> +  + <echo level="debug">writeModulePom dir="@{subdir}" parentpom="${pathToParentPom}@{parentpom}"</echo> + <writeModulePom dir="@{subdir}" parentpom="${pathToParentPom}@{parentpom}" /> + </then> + </elseif> + <else> + <for list="plugins tests features site" param="type" delimiter=" "> + <sequential> + <basename property="artifactIdAgg" file="@{subdir}" /> + <if> + <available file="@{subdir}/@{type}" type="dir" /> + <then> + <var name="aggregate" value="true" /> + <generateAggregator dir="@{subdir}/@{type}" + parentpom="../../${pathToParentPom}@{parentpom}" + artifactId="${artifactIdAgg}.@{type}" + artifactVersion="@{artifactVersion}" + /> + </then> + </if> + <var name="artifactIdAgg" unset="true" /> + </sequential> + </for> + + <if> + <istrue value="${aggregate}" /> + <else> + <basename property="artifactIdAgg" file="@{subdir}" /> + <if> + <equals arg1="${COMPONENT}" arg2="trunk" /> + <then> + <var name="artifactId" value="${artifactIdAgg}.all" /> + </then> + <else> + <var name="artifactId" value="${COMPONENT}.${artifactIdAgg}" /> + </else> + </if> + <writeAggregatePom dir="@{subdir}" + parentpom="../${pathToParentPom}parent-pom.xml" + artifactId="${artifactId}" + artifactVersion="@{artifactVersion}" + /> + + <echo level="debug">subdir = @{subdir}</echo> + <echo level="verbose">Aggregated: ${artifactIdAgg}</echo> + + <var name="artifactIdAgg" unset="true" /> + <var name="artifactId" unset="true" /> + </else> + </if> + </else> + </if> + </sequential> + </for> + </sequential> + </macrodef> + + </target> + + <target name="run" depends="init"> + <var name="show.pom.exists.warning" value="" /> + + <if> + <and> + <isset property="COMPONENT" /> + <not> + <equals arg1="${COMPONENT}" arg2="" /> + </not> + </and> + <then> + <var name="COMPONENTS" unset="true" /> + <var name="COMPONENTS" value="${COMPONENT}" /> + </then> + <elseif> + <not> + <isset property="COMPONENTS" /> + </not> + <then> + <var name="COMPONENTS" value="trunk" /> + </then> + </elseif> + </if> + <for param="COMPONENT" list="${COMPONENTS}" delimiter=",; + "> + <sequential> + <var name="COMPONENT" value="@{COMPONENT}" /> + <echo level="info">COMPONENT = '${COMPONENT}'</echo> + <if> + <not> + <available file="${WORKINGDIR}/${pathToParentPomInput}parent-pom.xml" type="file" /> + </not> + <then> + <fail>Error: no parent-pom.xml found in ${WORKINGDIR}/${pathToParentPomInput}</fail> + </then> + </if> + + <if> + <not> + <equals arg1="${COMPONENT}" arg2="trunk" /> + </not> + <then> + <var name="pathToParentPom" unset="true" /> + <var name="pathToParentPom" value="../" /> + </then> + </if> + <echo level="verbose">COMPONENT = '${COMPONENT}', pathToParentPom = ${pathToParentPom}</echo> + +  +  + + <if> + <and> + <isset property="tagsFile" /> + <available file="${tagsFile}" type="file" /> + </and> + <then> + <property file="${tagsFile}" prefix="tagsFile" /> + </then> + </if> + +  + <var name="aggregatorcountstring" value="" /> + <var name="modulecountstring" value="" /> + + <if> + <equals arg1="${COMPONENT}" arg2="trunk" /> + <then> +  + <generateAggregator dir="${WORKINGDIR}" + parentpom="${pathToParentPom}parent-pom.xml" + artifactId="${COMPONENT}" + artifactVersion="${pomVersion}" + /> + </then> + <else> +  + <generateAggregator dir="${WORKINGDIR}/${COMPONENT}" + parentpom="${pathToParentPom}parent-pom.xml" + artifactId="${COMPONENT}" + artifactVersion="${pomVersion}" + /> + </else> + </if> +  + <length string="${modulecountstring}" property="modulecount" /> + <length string="${aggregatorcountstring}" property="aggregatorcount" /> + <echo level="info">${WORKINGDIR}/${COMPONENT} :: Modules: ${modulecount}, Aggregations: ${aggregatorcount}</echo> + <if> + <not> + <equals arg1="${show.pom.exists.warning}" arg2="" /> + </not> + <then> + <length property="show.pom.exists.warning.count" string="${show.pom.exists.warning}" /> + <echo level="warning">${show.pom.exists.warning.count} '${COMPONENT}' pom.xml file(s) already exist. To overwrite, use -Doverwrite.existing.pom.xml=true</echo> + </then> + </if> + <var name="show.pom.exists.warning.count" unset="true" /> + <var name="show.pom.exists.warning" value="" /> + <var name="modulecount" unset="true" /> + <var name="aggregatorcount" unset="true" /> + </sequential> + </for> + </target> + + <target name="getArtifactType"> + <property name="dir" value="." /> + <if> + <matches string="${dir}" pattern=".+/features/.+" /> + <then> + <var name="artifactType" value="eclipse-feature" /> + </then> + <elseif> + <or> + <matches string="${dir}" pattern=".+/site" /> + <matches string="${dir}" pattern=".+site" /> + </or> + <then> + <var name="artifactType" value="eclipse-update-site" /> + </then> + </elseif> + <elseif> + <and> + <not> + <matches string="${dir}" pattern=".+/plugins/.+" /> + </not> + <matches string="${dir}" pattern=".+/tests/.+" /> + </and> + <then> + <var name="artifactType" value="eclipse-plugin" /> + <for param="testClassFile" delimiter=", "> + <path> + <fileset dir="${dir}" includes="${testClassFilesToInclude}" /> + </path> + <sequential> + <var name="artifactType" value="eclipse-test-plugin" /> + </sequential> + </for> + </then> + </elseif> + <else> + <var name="artifactType" value="eclipse-plugin" /> + </else> + </if> + </target> + + <target name="getArtifactVersion"> + <property name="dir" value="." /> +  + <if> + <available file="${dir}/META-INF/MANIFEST.MF" type="file" /> + <then> +  + <loadfile srcfile="${dir}/META-INF/MANIFEST.MF" property="artifactVersion"> + <filterchain> + <linecontains> + <contains value="Bundle-Version:" /> + </linecontains> + </filterchain> + </loadfile> + <propertyregex property="artifactVersion" + input="${artifactVersion}" + defaultvalue="${artifactVersion}" + regexp="Bundle-Version:( +)([^\n\r]+)[\n\r]+" + replace="\2" + casesensitive="true" + override="true" + /> + +  + <antcallback target="checkArtifactVersionAgainstTagFile" return="artifactVersion.from.tag" /> + <if> + <and> + <isset property="artifactVersion.from.tag" /> + <not> + <equals arg1="${artifactVersion.from.tag}" arg2="${artifactVersion}" /> + </not> + </and> + <then> + <loadfile property="manifest.file" srcfile="${dir}/META-INF/MANIFEST.MF"> + <filterchain> + <tokenfilter> + <replaceregex pattern="Bundle-Version:( +)${artifactVersion}" + replace="Bundle-Version: ${artifactVersion.from.tag}" + flags="" + /> + </tokenfilter> + </filterchain> + </loadfile> + <echo message="${manifest.file}" file="${dir}/META-INF/MANIFEST.MF" /> + <var name="manifest.file" unset="true" /> + </then> + <else> + <var name="artifactVersion.from.tag" value="${artifactVersion}" /> + </else> + </if> + +  + <propertyregex property="artifactVersion" + input="${artifactVersion.from.tag}" + defaultvalue="${artifactVersion.from.tag}" + regexp="(.+).qualifier" + replace="\1-SNAPSHOT" + casesensitive="true" + override="true" + /> + <var name="artifactVersion.from.tag" unset="true" /> + </then> + <elseif> + <available file="${dir}/feature.xml" type="file" /> + <then> +  + <xmlproperty file="${dir}/feature.xml" collapseAttributes="true" /> + <var name="artifactVersion" value="${feature.version}" /> + +  + <antcallback target="checkArtifactVersionAgainstTagFile" return="artifactVersion.from.tag" /> + <if> + <and> + <isset property="artifactVersion.from.tag" /> + <not> + <equals arg1="${artifactVersion.from.tag}" arg2="${artifactVersion}" /> + </not> + </and> + <then> + <loadfile property="manifest.file" srcfile="${dir}/feature.xml"> + <filterchain> + <tokenfilter> + <replaceregex pattern="version="${artifactVersion}"" + replace="version="${artifactVersion.from.tag}"" + flags="" + /> + </tokenfilter> + </filterchain> + </loadfile> + <echo message="${manifest.file}" file="${dir}/feature.xml" /> + <var name="manifest.file" unset="true" /> + </then> + <else> + <var name="artifactVersion.from.tag" value="${artifactVersion}" /> + </else> + </if> + <var name="feature.version" unset="true" /> + +  + <propertyregex property="artifactVersion" + input="${artifactVersion.from.tag}" + defaultvalue="${artifactVersion.from.tag}" + regexp="(.+).qualifier" + replace="\1-SNAPSHOT" + casesensitive="true" + override="true" + /> + <var name="artifactVersion.from.tag" unset="true" /> + </then> + </elseif> + <else> + <echo level="verbose">Warning! artifactVersion not found for ${dir}!</echo> + <var name="artifactVersion" value="0.0.0" /> + </else> + </if> + </target> + + <target name="checkArtifactVersionAgainstTagFile"> + <dirname property="this.dir" file="${dir}" /> + <dirname property="parent.dir.path" file="${this.dir}" /> + <basename property="parent.dir" file="${parent.dir.path}" /> + <var name="this.dir" unset="true" /> + <var name="parent.dir.path" unset="true" /> + <if> + <isset property="tagsFile.${parent.dir}" /> + <then> + <propertycopy from="tagsFile.${parent.dir}" property="artifactVersion.from.tag" /> + <propertyregex property="artifactVersion.from.tag" + input="${artifactVersion.from.tag}" + defaultvalue="${artifactVersion.from.tag}" + regexp="(.+).GA" + replace="\1.qualifier" + casesensitive="true" + override="true" + /> + </then> + </if> + <if> + <and> + <isset property="tagsFile.${parent.dir}" /> + <not> + <equals arg1="${artifactVersion}" arg2="${artifactVersion.from.tag}" /> + </not> + </and> + <then> + <basename file="${dir}" property="this.dir" /> + <echo level="info">For ${this.dir}, got ${artifactVersion}; should be ${artifactVersion.from.tag}</echo> + </then> + <else> + <var name="artifactVersion.from.tag" value="${artifactVersion}" /> + </else> + </if> + <var name="parent.dir" unset="true" /> + </target> + +  + <target name="getArtifactOsWsArch"> + <property name="artifactId" value="org.mozilla.xulrunner.cocoa.macosx" /> + <propertyregex property="artifactOs" + input="${artifactId}" + defaultvalue="" + regexp="(macosx|linux|win32)" + select="\1" + casesensitive="true" + override="true" + /> + <propertyregex property="artifactWs" + input="${artifactId}" + defaultvalue="" + regexp="(carbon|cocoa|win32|gtk)" + select="\1" + casesensitive="true" + override="true" + /> + <propertyregex property="artifactArch" + input="${artifactId}" + defaultvalue="" + regexp="\.(x86|x86_64)$" + select="\1" + casesensitive="true" + override="true" + /> + + </target> + + <target name="getArtifactId"> + <property name="dir" value="." /> +  + <if> + <available file="${dir}/META-INF/MANIFEST.MF" type="file" /> + <then> +  + <loadfile srcfile="${dir}/META-INF/MANIFEST.MF" property="artifactId"> + <filterchain> + <linecontains> + <contains value="Bundle-SymbolicName:" /> + </linecontains> + </filterchain> + </loadfile> + <propertyregex property="artifactId" + input="${artifactId}" + defaultvalue="${artifactId}" + regexp="Bundle-SymbolicName:([\t ]+)([^\n\r\t ]+);(.+)[\n\r\t ]+" + replace="\2" + casesensitive="true" + override="true" + /> + <propertyregex property="artifactId" + input="${artifactId}" + defaultvalue="${artifactId}" + regexp="Bundle-SymbolicName:([\t ]+)([^\n\r\t ]+)[\n\r\t ]+" + replace="\2" + casesensitive="true" + override="true" + /> + </then> + <elseif> + <available file="${dir}/feature.xml" type="file" /> + <then> +  + <xmlproperty file="${dir}/feature.xml" collapseAttributes="true" /> + <var name="artifactId" value="${feature.id}" /> + <var name="feature.id" unset="true" /> + </then> + </elseif> + <else> + <echo level="info">Warning! artifactId not found for ${dir}!</echo> + <basename property="artifactId" file="${dir}" /> + </else> + </if> + </target> + +  + + <target name="test.expected.values"> + <property name="ant.enable.asserts" value="true" /> + +  + <property name="artifactVersion.esb/features/org.jboss.tools.esb.feature" value="1.3.0-SNAPSHOT" /> + <property name="artifactVersion.as/tests/org.jboss.ide.eclipse.as.archives.integration.test" + value="2.1.0-SNAPSHOT" + /> + <property name="artifactVersion.esb/plugins/org.jboss.tools.esb.core" value="1.3.0-SNAPSHOT" /> + <property name="artifactVersion.bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui" value="0.5.0-SNAPSHOT" /> + <property name="artifactVersion.bpel/features/org.jboss.tools.bpel.sdk.feature" value="1.0.0-SNAPSHOT" /> + <property name="artifactVersion.bpel/plugins/org.eclipse.bpel.xpath10" value="0.5.0-SNAPSHOT" /> + <property name="artifactVersion.vpe/plugins/org.jboss.tools.vpe.ui.palette" value="3.1.0-SNAPSHOT" /> + <property name="artifactVersion.tests/features/org.jboss.tools.test.feature" value="3.1.0-SNAPSHOT" /> + <property name="artifactVersion.portlet/features/org.jboss.tools.portlet.test.feature" value="1.1.0-SNAPSHOT" /> + <property name="artifactVersion.jst/features/org.jboss.tools.jst.feature" value="3.1.0-SNAPSHOT" /> + <property name="artifactVersion.jst/features/org.jboss.tools.jst.web.tiles.feature" value="3.1.0-SNAPSHOT" /> + <property name="artifactVersion.drools/plugins/org.jboss.tools.flow.ruleflow" value="1.0.0" /> + +  + <property name="artifactId.esb/features/org.jboss.tools.esb.feature" value="org.jboss.tools.esb.feature" /> + <property name="artifactId.as/tests/org.jboss.ide.eclipse.as.archives.integration.test" + value="org.jboss.ide.eclipse.as.archives.integration.test" + /> + <property name="artifactId.esb/plugins/org.jboss.tools.esb.core" value="org.jboss.tools.esb.core" /> + <property name="artifactId.bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui" + value="org.eclipse.bpel.apache.ode.deploy.ui" + /> + <property name="artifactId.bpel/features/org.jboss.tools.bpel.sdk.feature" + value="org.jboss.tools.bpel.sdk.feature" + /> + <property name="artifactId.bpel/plugins/org.eclipse.bpel.xpath10" value="org.eclipse.bpel.xpath10" /> + <property name="artifactId.vpe/plugins/org.jboss.tools.vpe.ui.palette" value="org.jboss.tools.vpe.ui.palette" /> + <property name="artifactId.tests/features/org.jboss.tools.test.feature" value="org.jboss.tools.test.feature" /> + <property name="artifactId.portlet/features/org.jboss.tools.portlet.test.feature" + value="org.jboss.tools.portlet.test.feature" + /> + <property name="artifactId.jst/features/org.jboss.tools.jst.feature" value="org.jboss.tools.jst.feature" /> + <property name="artifactId.jst/features/org.jboss.tools.jst.web.tiles.feature" + value="org.jboss.tools.jst.web.tiles.feature" + /> + <property name="artifactId.drools/plugins/org.jboss.tools.flow.ruleflow" + value="org.jboss.tools.flow.ruleflow" + /> + +  + <property name="artifactType.esb/features/org.jboss.tools.esb.feature" value="eclipse-feature" /> + <property name="artifactType.as/tests/org.jboss.ide.eclipse.as.archives.integration.test" + value="eclipse-test-plugin" + /> + <property name="artifactType.flow/tests/org.jboss.tools.flow.common.test" value="eclipse-plugin" /> + <property name="artifactType.jbpm/tests/org.jboss.tools.flow.jpdl4.test" value="eclipse-plugin" /> + <property name="artifactType.esb/plugins/org.jboss.tools.esb.core" value="eclipse-plugin" /> + <property name="artifactType.bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui" value="eclipse-plugin" /> + <property name="artifactType.bpel/features/org.jboss.tools.bpel.sdk.feature" value="eclipse-feature" /> + <property name="artifactType.bpel/plugins/org.eclipse.bpel.xpath10" value="eclipse-plugin" /> + <property name="artifactType.vpe/plugins/org.jboss.tools.vpe.ui.palette" value="eclipse-plugin" /> + <property name="artifactType.tests/features/org.jboss.tools.test.feature" value="eclipse-feature" /> + <property name="artifactType.portlet/features/org.jboss.tools.portlet.test.feature" value="eclipse-feature" /> + <property name="artifactType.jst/features/org.jboss.tools.jst.feature" value="eclipse-feature" /> + <property name="artifactType.jst/features/org.jboss.tools.jst.web.tiles.feature" value="eclipse-feature" /> + <property name="artifactType.drools/plugins/org.jboss.tools.flow.ruleflow" value="eclipse-plugin" /> + +  + <property name="artifactOsWsArch.org.mozilla.xpcom.os" value="" /> + <property name="artifactOsWsArch.org.mozilla.xpcom.ws" value="" /> + <property name="artifactOsWsArch.org.mozilla.xpcom.arch" value="" /> + + <property name="artifactOsWsArch.org.mozilla.xulrunner.carbon.macosx.os" value="macosx" /> + <property name="artifactOsWsArch.org.mozilla.xulrunner.carbon.macosx.ws" value="carbon" /> + <property name="artifactOsWsArch.org.mozilla.xulrunner.carbon.macosx.arch" value="" /> + + <property name="artifactOsWsArch.org.mozilla.xulrunner.cocoa.macosx.os" value="macosx" /> + <property name="artifactOsWsArch.org.mozilla.xulrunner.cocoa.macosx.ws" value="cocoa" /> + <property name="artifactOsWsArch.org.mozilla.xulrunner.cocoa.macosx.arch" value="" /> + + <property name="artifactOsWsArch.org.mozilla.xulrunner.gtk.linux.x86.os" value="linux" /> + <property name="artifactOsWsArch.org.mozilla.xulrunner.gtk.linux.x86.ws" value="gtk" /> + <property name="artifactOsWsArch.org.mozilla.xulrunner.gtk.linux.x86.arch" value="x86" /> + + <property name="artifactOsWsArch.org.mozilla.xulrunner.gtk.linux.x86_64.os" value="linux" /> + <property name="artifactOsWsArch.org.mozilla.xulrunner.gtk.linux.x86_64.ws" value="gtk" /> + <property name="artifactOsWsArch.org.mozilla.xulrunner.gtk.linux.x86_64.arch" value="x86_64" /> + + <property name="artifactOsWsArch.org.mozilla.xulrunner.win32.win32.x86.os" value="win32" /> + <property name="artifactOsWsArch.org.mozilla.xulrunner.win32.win32.x86.ws" value="win32" /> + <property name="artifactOsWsArch.org.mozilla.xulrunner.win32.win32.x86.arch" value="x86" /> + </target> + + <target name="test.all" depends="init, test.expected.values"> + + <property name="dirs" + value=" + ${WORKINGDIR}/esb/features/org.jboss.tools.esb.feature + ${WORKINGDIR}/as/tests/org.jboss.ide.eclipse.as.archives.integration.test + ${WORKINGDIR}/esb/plugins/org.jboss.tools.esb.core + ${WORKINGDIR}/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui + ${WORKINGDIR}/bpel/features/org.jboss.tools.bpel.sdk.feature + ${WORKINGDIR}/bpel/plugins/org.eclipse.bpel.xpath10 + ${WORKINGDIR}/vpe/plugins/org.jboss.tools.vpe.ui.palette + ${WORKINGDIR}/tests/features/org.jboss.tools.test.feature + ${WORKINGDIR}/portlet/features/org.jboss.tools.portlet.test.feature + ${WORKINGDIR}/jst/features/org.jboss.tools.jst.feature + ${WORKINGDIR}/jst/features/org.jboss.tools.jst.web.tiles.feature + ${WORKINGDIR}/drools/plugins/org.jboss.tools.flow.ruleflow + " + /> + <antcall target="test.getArtifactVersion" /> + <antcall target="test.getArtifactId" /> + <antcall target="test.getArtifactType" /> + <antcall target="test.getArtifactOsWsArch" /> + </target> + + <target name="test.getArtifactVersion" depends="init, test.expected.values"> + <property name="dirs" + value=" + ${WORKINGDIR}/esb/features/org.jboss.tools.esb.feature + ${WORKINGDIR}/as/tests/org.jboss.ide.eclipse.as.archives.integration.test + ${WORKINGDIR}/esb/plugins/org.jboss.tools.esb.core + ${WORKINGDIR}/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui + ${WORKINGDIR}/tests/features/org.jboss.tools.test.feature + ${WORKINGDIR}/portlet/features/org.jboss.tools.portlet.test.feature + ${WORKINGDIR}/jst/features/org.jboss.tools.jst.feature + ${WORKINGDIR}/jst/features/org.jboss.tools.jst.web.tiles.feature + " + /> + <for param="dir" list="${dirs}" delimiter=", + "> + <sequential> + <antcallback target="getArtifactVersion" return="artifactVersion"> + <property name="dir" value="@{dir}" /> + </antcallback> + <propertyregex property="activeDir" + input="@{dir}" + defaultvalue="@{dir}" + regexp="${WORKINGDIR}/" + replace="" + casesensitive="true" + override="true" + /> + <propertycopy name="expected.value" from="artifactVersion.${activeDir}" /> + <assert failonerror="false" + message="For ${activeDir}, artifactVersion = ${artifactVersion}; expected ${expected.value}" + > + <bool> + <equals arg1="${expected.value}" arg2="${artifactVersion}" /> + </bool> + </assert> + <var name="expected.value" unset="true" /> + <var name="artifactVersion" unset="true" /> + </sequential> + </for> + </target> + + <target name="test.getArtifactId" depends="init, test.expected.values"> + <property name="dirs" + value=" + ${WORKINGDIR}/esb/features/org.jboss.tools.esb.feature + ${WORKINGDIR}/as/tests/org.jboss.ide.eclipse.as.archives.integration.test + ${WORKINGDIR}/esb/plugins/org.jboss.tools.esb.core + " + /> + <for param="dir" list="${dirs}" delimiter=", + "> + <sequential> + <antcallback target="getArtifactId" return="artifactId"> + <property name="dir" value="@{dir}" /> + </antcallback> + <propertyregex property="activeDir" + input="@{dir}" + defaultvalue="@{dir}" + regexp="${WORKINGDIR}/" + replace="" + casesensitive="true" + override="true" + /> + <propertycopy name="expected.value" from="artifactId.${activeDir}" /> + <assert failonerror="false" + message="For ${activeDir}, artifactId = ${artifactId}; expected ${expected.value}" + > + <bool> + <equals arg1="${expected.value}" arg2="${artifactId}" /> + </bool> + </assert> + <var name="expected.value" unset="true" /> + <var name="artifactId" unset="true" /> + </sequential> + </for> + </target> + + <target name="test.getArtifactOsWsArch" depends="init, test.expected.values"> + <property name="artifactIds" + value=" + org.mozilla.xpcom + org.mozilla.xulrunner.carbon.macosx + org.mozilla.xulrunner.cocoa.macosx + org.mozilla.xulrunner.gtk.linux.x86 + org.mozilla.xulrunner.gtk.linux.x86_64 + org.mozilla.xulrunner.win32.win32.x86 + " + /> + <for param="artifactId" list="${artifactIds}" delimiter=", + "> + <sequential> + <echo level="debug">artifactId = @{artifactId}</echo> + <antcallback target="getArtifactOsWsArch" return="artifactOs, artifactWs, artifactArch"> + <property name="artifactId" value="@{artifactId}" /> + </antcallback> + <propertycopy name="expected.value.os" from="artifactOsWsArch.(a){artifactId}.os" /> + <propertycopy name="expected.value.ws" from="artifactOsWsArch.(a){artifactId}.ws" /> + <propertycopy name="expected.value.arch" from="artifactOsWsArch.(a){artifactId}.arch" /> + <assert failonerror="false" + message="For @{artifactId}, artifactOs = ${artifactOs}; expected ${expected.value.os}" + > + <bool> + <equals arg1="${expected.value.os}" arg2="${artifactOs}" /> + </bool> + </assert> + <assert failonerror="false" + message="For @{artifactId}, artifactWs = ${artifactWs}; expected ${expected.value.ws}" + > + <bool> + <equals arg1="${expected.value.ws}" arg2="${artifactWs}" /> + </bool> + </assert> + <assert failonerror="false" + message="For @{artifactId}, artifactArch = ${artifactArch}; expected ${expected.value.arch}" + > + <bool> + <equals arg1="${expected.value.arch}" arg2="${artifactArch}" /> + </bool> + </assert> + <var name="expected.value.os" unset="true" /> + <var name="expected.value.ws" unset="true" /> + <var name="expected.value.arch" unset="true" /> + </sequential> + </for> + + </target> + + <target name="test.getArtifactType" depends="init, test.expected.values"> + <property name="dirs" + value=" + ${WORKINGDIR}/esb/features/org.jboss.tools.esb.feature + ${WORKINGDIR}/as/tests/org.jboss.ide.eclipse.as.archives.integration.test + ${WORKINGDIR}/esb/plugins/org.jboss.tools.esb.core + ${WORKINGDIR}/esb/plugins/org.jboss.tools.esb.core + ${WORKINGDIR}/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui + ${WORKINGDIR}/bpel/features/org.jboss.tools.bpel.sdk.feature + ${WORKINGDIR}/bpel/plugins/org.eclipse.bpel.xpath10 + ${WORKINGDIR}/vpe/plugins/org.jboss.tools.vpe.ui.palette + ${WORKINGDIR}/tests/features/org.jboss.tools.test.feature + ${WORKINGDIR}/portlet/features/org.jboss.tools.portlet.test.feature + ${WORKINGDIR}/jst/features/org.jboss.tools.jst.feature + ${WORKINGDIR}/jst/features/org.jboss.tools.jst.web.tiles.feature + ${WORKINGDIR}/flow/tests/org.jboss.tools.flow.common.test + ${WORKINGDIR}/jbpm/tests/org.jboss.tools.flow.jpdl4.test + " + /> + <for param="dir" list="${dirs}" delimiter=", + "> + <sequential> + <antcallback target="getArtifactType" return="artifactType"> + <property name="dir" value="@{dir}" /> + </antcallback> + <propertyregex property="activeDir" + input="@{dir}" + defaultvalue="@{dir}" + regexp="${WORKINGDIR}/" + replace="" + casesensitive="true" + override="true" + /> + <propertycopy name="expected.value" from="artifactType.${activeDir}" /> + <assert failonerror="false" + message="For ${activeDir}, artifactType = ${artifactType}; expected ${expected.value}" + > + <bool> + <equals arg1="${expected.value}" arg2="${artifactType}" /> + </bool> + </assert> + <var name="expected.value" unset="true" /> + <var name="artifactType" unset="true" /> + </sequential> + </for> + </target> + +</project> Copied: trunk/build/util/runstack.sh (from rev 22821, trunk/runstack.sh) =================================================================== --- trunk/build/util/runstack.sh (rev 0) +++ trunk/build/util/runstack.sh 2010-06-23 17:15:48 UTC (rev 22964) @@ -0,0 +1,40 @@ +#!/bin/bash + +#root of svn tree +workingdir=~/workspace36/jbosstools-modular_build + +#use commandline args as list of components to build +if [[ $# -lt 1 ]]; then + echo "Usage: $0 component1 component2 ..." + echo "Eg. $0 tests common jmx archives as" + echo "Eg. $0 jst jsf vpe struts seam -Dmaven.test.skip" + exit 1 +fi + +flags="" +components="" +while [ "$#" -gt 0 ]; do + case $1 in + '-'*) flags="$flags $1"; shift 1;; + *) components="$components $1"; shift 1;; + esac +done + +# run builds w/o running tests +for d in $components; do + # build features, plugins, and tests, but do not RUN tests + #cd $workingdir; ./runtests.sh ${d}/ clean install -Dmaven.test.skip + + # build features, plugins, and tests, then run ALL tests (don't stop after first failed test) + cd $workingdir; ./runtests.sh ${d}/ clean install --fail-at-end $flags +done + +# collect compilation results and failures +for d in $components; do + cd $workingdir; echo "==== $d ====" + egrep -v "org\.|com\." $d/buildlog.latest.txt | egrep "SUCCESS" + egrep "FAILURE|SKIPPED" $d/buildlog.latest.txt + egrep -A1 "Cannot complete the request|depends on|satisfy dependency|Missing requirement|requires '.+'" $d/buildlog.latest.txt + echo "" +done + Property changes on: trunk/build/util/runstack.sh ___________________________________________________________________ Name: svn:executable + * Copied: trunk/build/util/runtests.sh (from rev 22821, trunk/runtests.sh) =================================================================== --- trunk/build/util/runtests.sh (rev 0) +++ trunk/build/util/runtests.sh 2010-06-23 17:15:48 UTC (rev 22964) @@ -0,0 +1,89 @@ +#!/bin/bash + +# set corect path to mvn on your machine: +mvn3=/opt/maven3/bin/mvn + +if [[ $# -lt 1 ]]; then + # some useful flags: + # -pl - list of projects to build + # -o - offline mode (don't search remote repos) + # -Dmaven.test.skip - compile but do not run tests + # --fail-at-end - fail build after ALL tests have run, not at first failure + echo "Usage: $0 workingdir flags targets" + echo "Eg: $0 as/ -Dmaven.test.skip clean install" + echo "Eg: $0 bpel/tests/ -o --fail-at-end install" + exit 1; +fi + +#echo "[runtests] $0 started on: `date +%H\:%M\:%S`"; + +# environment variables +PATH=.:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:/usr/X11R6/bin:`pwd`/../linux;export PATH + +#export USERNAME=`whoami` +#echo "[runtests] Run as $USERNAME"; +#echo "[runtests] With PATH = $PATH"; + +# fix for org.eclipse.swt.SWTError: No more handles [gtk_init_check() failed] +# fix for Failed to invoke suite():org.eclipse.swt.SWTError: No more handles [gtk_init_check() failed] +export CVS_RSH=ssh +#ulimit -c unlimited; # set corefile size to unlimited; not allowed on build.eclipse + +#echo "[runtests] Set JAVA_HIGH_ZIPFDS=500 & LANG=C"; +#export JAVA_HIGH_ZIPFDS=500 +#export LANG=C + +usedPorts=""; maxPort=40 +for port in $(ps aux | egrep '[Xvnc|Xvfb]\ :' | egrep " :[0-9]+" | sed "s/$\^\|.\+$$Xvfb\|Xvnc$ :$[0-9]\+$$.\+\|$$/\3/g" | sort); do + if [[ $(echo $port | egrep "^:[0-9]+$") ]]; then + usedPorts=$usedPorts" "${port:1}; + thisPort=${port:1}; (( thisPort -= 0 )); + if [[ $maxPort -lt $thisPort ]]; then maxPort=$thisPort; fi + #echo "[$usedPorts], $thisPort, $maxPort" + fi +done +(( xport = maxPort + 1 )); +#echo "Existing DISPLAY ports include: $usedPorts." +#echo "Use DISPLAY port :$xport" + +xCmd="" +xvncExists=$(which Xvnc); xvncExists=${xvncExists##*no Xvnc *} +if [ $xvncExists ]; then + xCmd="Xvnc :${xport} -geometry 1024x768 -depth 24 -ac" +else + xvfbExists=$(which Xvfb); xvfbExists=${xvfbExists##*no Xvfb *} + if [ $xvfbExists ]; then + xCmd="Xvfb :${xport} -screen 0 1024x768x24 -ac" + else + echo "[runtests] WARNING! This script requires Xvfb or Xvnc. " + echo "[runtests] Without some way to run tests in a different display port, UI tests will run in front of you and you may accidentally interact with them." + fi +fi + +if [[ $xCmd ]]; then + #echo "[runtests] Using X server: '${xCmd}'" + ${xCmd} & + export DISPLAY=localhost:${xport}.0 + xhost + +else + echo "[runtests] Warning! UI tests will run in the current UI display port (usually :0). Please avoid accidentally interacting with them." +fi + + +# run tests +echo "[runtests] [`date +%H\:%M\:%S`] Launching Tycho..." +dir=$1; shift; + +cd $dir; $mvn3 2>&1 $* | tee buildlog.latest.txt + +echo "[runtests] [`date +%H\:%M\:%S`] Test run completed. " + +# xwd -silent -display :${xport} -root -out /tmp/snap.xwd; # save a snapshot + +############################# END RUN TESTS ############################# + +# drop X server process threads used by tests +if [[ -r /tmp/.X${xport}-lock ]]; then kill `cat /tmp/.X${xport}-lock`; fi +if [[ -f /tmp/.X${xport}-lock ]]; then rm -fr /tmp/.X${xport}-lock; fi + +#echo "[runtests] ${0##*/} done: `date +%H\:%M\:%S`" Property changes on: trunk/build/util/runtests.sh ___________________________________________________________________ Name: svn:executable + * Copied: trunk/build/util/svnignore.sh (from rev 22821, trunk/svnignore.sh) =================================================================== --- trunk/build/util/svnignore.sh (rev 0) +++ trunk/build/util/svnignore.sh 2010-06-23 17:15:48 UTC (rev 22964) @@ -0,0 +1,35 @@ +#!/bin/bash +tmpfile=/tmp/svn.ignore.txt +echo "target +buildlog.latest.txt +bin +build +*.class +" > $tmpfile + +dir="."; if [[ $1 ]]; then dir=$1; fi + +for p in com org net; do + for f in $(find $dir -mindepth 2 -type d -name "${p}.*" | sort); do + pushd $f 2>&1 >/dev/null + echo $f + svn up --accept 'theirs-full' + svn propset svn:ignore --file $tmpfile . + popd 2>&1 >/dev/null + echo "" + done +done +rm -fr $tmpfile +svn diff $dir + +echo "" +echo "===================================================================" +echo "" +echo "Pending changes:" +svn stat $dir + +echo "" +echo "To commit changes, type: + cd $dir; svn ci -m \"svn:ignore\"" +echo "" + Property changes on: trunk/build/util/svnignore.sh ___________________________________________________________________ Name: svn:executable + * Deleted: trunk/component-dependencies-graph.png =================================================================== (Binary files differ) Deleted: trunk/genpom.scala =================================================================== --- trunk/genpom.scala 2010-06-23 17:14:05 UTC (rev 22963) +++ trunk/genpom.scala 2010-06-23 17:15:48 UTC (rev 22964) @@ -1,281 +0,0 @@ -import java.io.File -import scala.io.Source -import scala.xml.XML - -object GenPom { - - case class GVA(groupId : String, artifactId : String, version : String) - - /********** Configuration Start **********/ - var projectName = "org.jboss.tools" - var pathToParentPom = "" - var parentPomVersion = "0.0.1-SNAPSHOT" - var sourcePomVersion = "0.0.1-SNAPSHOT" - /********** Configuration Ends **********/ - - var aggregatorcount = 0 - var modulecount = 0 - - def main(args: Array[String]) { - - generateAggregator(new File("."), - new File(pathToParentPom + "parent-pom.xml"), - GVA(projectName, projectName + ".parent.pom", parentPomVersion), - GVA(projectName, "trunk", sourcePomVersion) - ) - - println("Modules: " + modulecount + " Aggregator: " + aggregatorcount) - } - - def generateModule(dir : File, parentPom : File, parent : GVA, me : GVA) { - modulecount = modulecount + 1 - - - - var module = - <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> - <relativePath>{parentPom.getPath()}</relativePath> - <groupId>{parent.groupId}</groupId> - <artifactId>{parent.artifactId}</artifactId> - <version>{parent.version}</version> - </parent> - <groupId>{me.groupId}</groupId> - <artifactId>{me.artifactId}</artifactId> - <version>{getVersion(dir)}</version> - <packaging>{ if (dir.getParentFile().getAbsolutePath().endsWith("/tests") || dir.getParentFile().getAbsolutePath().endsWith("/tests/.")) - "eclipse-test-plugin" - else if (dir.getParentFile().getAbsolutePath().endsWith("/features") || dir.getParentFile().getAbsolutePath().endsWith("/features/.")) - "eclipse-feature" - else - "eclipse-plugin"}</packaging> - { getTarget(dir) } - </project>; - - val pp = new scala.xml.PrettyPrinter(80,2) - - writePom("Module ", pp.format(module), dir) - - } - - def getTarget(dir : File) : Object ={ - var env = <environment/>; - - if (dir.getAbsolutePath().endsWith("gtk.linux.x86")) { - env = <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86</arch> - </environment>; - } else if (dir.getAbsolutePath().endsWith("gtk.linux.x86_64")) { - env = <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86_64</arch> - </environment>; - } else if (dir.getAbsolutePath().endsWith("carbon.macosx")) { - env = <environment> - <os>macosx</os> - <ws>carbon</ws> - <arch>x86</arch> - </environment>; - } else if (dir.getAbsolutePath().endsWith("cocoa.macosx")) { - env = <environment> - <os>macosx</os> - <ws>cocoa</ws> - <arch>x86</arch> - </environment>; - } else if (dir.getAbsolutePath().endsWith("win32.win32.x86")) { - env = <environment> - <os>win32</os> - <ws>win32</ws> - <arch>x86</arch> - </environment>; - } - - var target = <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${{tychoVersion}}</version> - <configuration> - <resolver>p2</resolver> - <environments> - { env } - </environments> - </configuration> - </plugin> - </plugins> - </build>; - - if(dir.getAbsolutePath().endsWith("x86_64") - || dir.getAbsolutePath().endsWith("x86") - || dir.getAbsolutePath().endsWith("macosx")) { - return target - } - return "" - } - - def writePom(n : String, pp : String, dir : File) { - val pomxml = new File(dir, "pom.xml") - - val out = new java.io.FileWriter(pomxml) - out.write(pp) - out.close - - } - - def getVersion(dir : File) : String = { - - var mf = new File(new File(dir, "META-INF"), "MANIFEST.MF") - var featurexml = new File(dir, "feature.xml") - - if(mf.exists()) { - val lines = Source.fromFile(mf).getLines - for(l <- lines) - if(l.contains("Bundle-Version:")) { - return l.substring("Bundle-Version:".length()).trim().replaceAll("\\.qualifier","-SNAPSHOT") - } - } else if (featurexml.exists()) { - val data = XML.loadFile(featurexml) - return (data \ "@version").text.replaceAll("\\.qualifier","-SNAPSHOT") - } - return dir + " " + featurexml.exists() + " " + mf.exists() - } - - def getArtifactId(dir : File) : String = { - - var mf = new File(new File(dir, "META-INF"), "MANIFEST.MF") - var featurexml = new File(dir, "feature.xml") - - if(mf.exists()) { - val lines = Source.fromFile(mf).getLines - for(l <- lines) - if(l.contains("Bundle-SymbolicName:")) { - val x = l.substring("Bundle-SymbolicName:".length()).trim() - if(x.indexOf(";")>=0) { - return x.substring(0, x.indexOf(";")) - } else { - return x - } - } - } else if (featurexml.exists()) { - val data = XML.loadFile(featurexml) - return (data \ "@id").text - } - return dir + " " + featurexml.exists() + " " + mf.exists() - } - - def dump(dirs : Collection[File], parentPom : File, parent : GVA, me : GVA) { - for(f <- dirs) { - var aggregate = false - val manifest = new File(new File(f, "META-INF"), "MANIFEST.MF") - val plugins = new File(f, "plugins") - val tests = new File(f, "tests") - val features = new File(f, "features") - val featurexml = new File(f, "feature.xml") - - if(manifest.exists() || featurexml.exists()) { - generateModule(f, - new File("../" + parentPom.getPath()), - parent, - GVA(me.groupId, getArtifactId(f), me.version)) - } - - if(plugins.exists()) { - aggregate = true - generateAggregator(plugins, - new File("../../" + parentPom.getPath()), - parent, - GVA(me.groupId, f.getName() + ".plugins" , "0.0.1-SNAPSHOT") - ) - } - - if(tests.exists()) { - aggregate = true - generateAggregator(tests, - new File("../../" + parentPom.getPath()), - parent, - GVA(me.groupId, f.getName() + ".tests", "0.0.1-SNAPSHOT") - ) - } - - if(features.exists()) { - aggregate = true - generateAggregator(features, - new File("../../" + parentPom.getPath()), - parent, - GVA(me.groupId, f.getName()+".features" , "0.0.1-SNAPSHOT") - ) - } - - if(aggregate) { - println("Generate Agg for " + f) - generateAggregator(f, new File("../" + parentPom.getPath()), parent, GVA(me.groupId, f.getName()+".all", "0.0.1-SNAPSHOT")) - } - } - } - - def isModule(n : File) : Boolean = { - def v = (new File(n, "pom.xml").exists() && !n.getName().equals("docs")) || - (!n.getName().contains(".sdk.") && (new File(new File(n, "META-INF"), "MANIFEST.MF").exists()) || (new File(n, "feature.xml").exists())) || (hasDirectory(n, "features") || hasDirectory(n, "tests") || hasDirectory(n, "plugins")) - return v - } - - def hasDirectory(parent : File, name : String) : Boolean = { - - val dir = new File(parent, name) - return dir.isDirectory() && dir.exists() - } - - def generateAggregator(dir : File, - parentPom : File, - parent : GVA, - me : GVA - ) { - aggregatorcount = aggregatorcount + 1 - - val dirs = dir.listFiles().filter( - (n) => n.isDirectory() && !n.getName().startsWith(".") && !n.getName().contains(".sdk.") - ) - - val realModules = dirs.filter( - (n) => isModule(n)) - - var modules = - <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> - <relativePath>{parentPom.getPath()}</relativePath> - <groupId>{parent.groupId}</groupId> - <artifactId>{parent.artifactId}</artifactId> - <version>{parent.version}</version> - </parent> - <groupId>{me.groupId}</groupId> - <artifactId>{me.artifactId}</artifactId> - <version>{me.version}</version> - <packaging>pom</packaging> - <modules> - { - for(f <- realModules) yield { - <module>{ f.getName() }</module> - } - } - </modules> - </project>; - - val pp = new scala.xml.PrettyPrinter(80,2) - writePom("Aggregator ", pp.format(modules),dir) - //println(pp.format(modules)) - - dump(dirs, parentPom, parent, me) - - - } - -} - - -GenPom.main(args) Deleted: trunk/genpom.xml =================================================================== --- trunk/genpom.xml 2010-06-23 17:14:05 UTC (rev 22963) +++ trunk/genpom.xml 2010-06-23 17:15:48 UTC (rev 22964) @@ -1,1142 +0,0 @@ -<project default="run" basedir="." name="jbosstools genpom.xml"> -  - <property name="projectName" value="org.jboss.tools" /> - <property name="pathToParentPom" value="" /> - <property name="pomVersion" value="0.0.1-SNAPSHOT" /> - <property name="dirsToExclude" - value="**/*.sdk.*, **/doc*/**, **/releng/**, **/build/**, **/download.jboss.org, **/sampleprojects/**, **/util/**, **/test, **/builders/**, **/contrib, **/releng/**, ." - /> - <property name="testClassFilesToInclude" - value="**/AllTests.java, **/*AllTests*.java, **/*AllBotTests*.java, **/*TestSuite*.java" - /> - - <property name="overwrite.existing.pom.xml" value="false" /> -  - -  - <target name="help" description="Usage Instructions"> - <echo> -To run this script in Eclipse: - Run As > Ant Build - -To run this script via commandline: - cd /path/to/checked/out/source/tree; \ - ant -f genpom.xml -q - -or, to build a specific module IFF no poms already exist: - ant -f genpom.xml -q -DCOMPONENT=xulrunner - -or, to build a specific module and overwrite existing pom.xml files: - ant -f genpom.xml -q -DCOMPONENT=common -Doverwrite.existing.pom.xml=true -</echo> - </target> - - <target name="get.ant-contrib" unless="ant-contrib.jar.exists"> - <property name="ANTCONTRIB_MIRROR" value="http://downloads.sourceforge.net/ant-contrib/" /> - <get usetimestamp="true" - dest="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" - src="${ANTCONTRIB_MIRROR}/ant-contrib-1.0b2-bin.zip" - /> - <touch file="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" /> - <mkdir dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" /> - <unzip src="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" - dest="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" - overwrite="true" - /> - <copy file="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_/ant-contrib/lib/ant-contrib.jar" - tofile="${COMMON_TOOLS}/ant-contrib.jar" - failonerror="true" - /> - <delete dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" includeemptydirs="true" quiet="true" /> - </target> - -  - <condition property="isInHudson" value="true"> - <or> - <contains string="${user.dir}" substring="hudson" /> - <contains string="${user.name}" substring="hudson" /> - <contains string="${user.home}" substring="hudson" /> - </or> - </condition> - <target name="local" unless="isInHudson"> - <property name="WORKINGDIR" value="${basedir}" /> - <property name="COMMON_TOOLS" value="${java.io.tmpdir}" /> - </target> - - <target name="init" depends="local"> -  - <condition property="WORKINGDIR" value="/home/hudson/static_build_env/jbds/tools/sources" else="${basedir}"> - <available file="/home/hudson/static_build_env/jbds" type="dir" /> - </condition> - <mkdir dir="${WORKINGDIR}" /> - <echo level="info">WORKINGDIR = ${WORKINGDIR}</echo> - - <condition property="COMMON_TOOLS" - value="/home/hudson/static_build_env/jbds/tools" - else="${WORKINGDIR}/../tools" - > - <available file="/home/hudson/static_build_env/jbds" type="dir" /> - </condition> - <mkdir dir="${COMMON_TOOLS}" /> - <echo level="info">COMMON_TOOLS = ${COMMON_TOOLS}</echo> - - <available file="${COMMON_TOOLS}/ant-contrib.jar" type="file" property="ant-contrib.jar.exists" /> - <antcall target="get.ant-contrib" /> - <taskdef resource="net/sf/antcontrib/antlib.xml"> - <classpath> - <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" /> - </classpath> - </taskdef> - - <var name="pathToParentPomInput" value="${pathToParentPom}"/> - -  - <macrodef name="writeAggregatePom"> - <attribute name="dir" default="." /> - <attribute name="parentpom" /> - <attribute name="artifactId" default="" /> - <attribute name="artifactVersion" default="" /> - <sequential> - <if> - <equals arg1="@{artifactId}" arg2="" /> - <then> - <var name="artifactId" unset="true" /> - <antcallback target="getArtifactId" return="artifactId"> - <property name="dir" value="@{dir}" /> - </antcallback> - </then> - <else> - <var name="artifactId" value="@{artifactId}" /> - </else> - </if> - <if> - <equals arg1="@{artifactVersion}" arg2="" /> - <then> - <var name="artifactVersion" unset="true" /> - <antcallback target="getArtifactVersion" return="artifactVersion"> - <property name="dir" value="@{dir}" /> - </antcallback> - </then> - <else> - <var name="artifactVersion" value="@{artifactVersion}" /> - </else> - </if> - <var name="artifactType" value="pom" /> - <propertyregex property="activeDir" - input="@{dir}" - defaultvalue="@{dir}" - regexp="${WORKINGDIR}/" - replace="" - casesensitive="true" - override="true" - /> - <echo level="verbose"> Agg dir: ${activeDir}, artifactType: ${artifactType}, artifactId: ${artifactId}, artifactVersion: ${artifactVersion}, parentpom: @{parentpom}</echo> - <if> - <and> - <available file="@{dir}/pom.xml" type="file" /> - <not> - <istrue value="${overwrite.existing.pom.xml}" /> - </not> - </and> - <then> - <var name="show.pom.exists.warning" value="${show.pom.exists.warning}1" /> - </then> - </if> - <if> - <or> - <not> - <available file="@{dir}/pom.xml" type="file" /> - </not> - <istrue value="${overwrite.existing.pom.xml}" /> - </or> - <then> - <echo file="@{dir}/pom.xml"><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> - <relativePath>@{parentpom}</relativePath> - <groupId>${projectName}</groupId> - <artifactId>${projectName}.parent.pom</artifactId> - <version>${pomVersion}</version> - </parent> - <groupId>${projectName}</groupId> - <artifactId>${artifactId}</artifactId> - <version>${artifactVersion}</version> - <packaging>${artifactType}</packaging> - <modules> -</echo> - <var name="artifactId" unset="true" /> - <var name="artifactVersion" unset="true" /> - <for param="subdir" delimiter=", - "> - <path> - <dirset dir="@{dir}" excludes="${dirsToExclude}" includes="*" /> - </path> - <sequential> - <basename property="subdirSuffix" file="@{subdir}" /> - <echo file="@{dir}/pom.xml" append="true"> <module>${subdirSuffix}</module> -</echo> - <var name="subdirSuffix" unset="true" /> - </sequential> - </for> - <echo file="@{dir}/pom.xml" append="true"> </modules> -</project> - </echo> - </then> - </if> - </sequential> - </macrodef> - -  - <macrodef name="writeModulePom"> - <attribute name="dir" default="." /> - <attribute name="parentpom" /> - <sequential> - <var name="artifactType" unset="true" /> - <antcallback target="getArtifactType" return="artifactType"> - <property name="dir" value="@{dir}" /> - </antcallback> - <if> - <equals arg1="${artifactType}" arg2="eclipse-update-site" /> - <then> - <var name="artifactId" unset="true" /> - <basename property="artifactId" file="@{dir}" /> - <var name="artifactVersion" value="${pomVersion}" /> - </then> - <else> - <var name="artifactId" unset="true" /> - <antcallback target="getArtifactId" return="artifactId"> - <property name="dir" value="@{dir}" /> - </antcallback> - <var name="artifactVersion" unset="true" /> - <antcallback target="getArtifactVersion" return="artifactVersion"> - <property name="dir" value="@{dir}" /> - </antcallback> - <var name="artifactOs" unset="true" /> - <var name="artifactWs" unset="true" /> - <var name="artifactArch" unset="true" /> - <antcallback target="getArtifactOsWsArch" return="artifactOs, artifactWs, artifactArch"> - <property name="artifactId" value="${artifactId}" /> - </antcallback> - </else> - </if> - <propertyregex property="activeDir" - input="@{dir}" - defaultvalue="@{dir}" - regexp="${WORKINGDIR}/" - replace="" - casesensitive="true" - override="true" - /> - <echo level="verbose"> Mod dir: ${activeDir}, artifactType: ${artifactType}, artifactId: ${artifactId}, artifactVersion: ${artifactVersion}, parentpom: @{parentpom}</echo> - <if> - <and> - <available file="@{dir}/pom.xml" type="file" /> - <not> - <istrue value="${overwrite.existing.pom.xml}" /> - </not> - </and> - <then> - <var name="show.pom.exists.warning" value="${show.pom.exists.warning}1" /> - </then> - </if> - <if> - <or> - <not> - <available file="@{dir}/pom.xml" type="file" /> - </not> - <istrue value="${overwrite.existing.pom.xml}" /> - </or> - <then> - <echo file="@{dir}/pom.xml"><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> - <relativePath>@{parentpom}</relativePath> - <groupId>${projectName}</groupId> - <artifactId>${projectName}.parent.pom</artifactId> - <version>${pomVersion}</version> - </parent> - <groupId>${projectName}</groupId> - <artifactId>${artifactId}</artifactId> - <version>${artifactVersion}</version> - <packaging>${artifactType}</packaging> -</echo> - <if> - <or> - <and> - <isset property="artifactOs" /> - <not> - <equals arg1="" arg2="${artifactOs}" /> - </not> - </and> - <and> - <isset property="artifactWs" /> - <not> - <equals arg1="" arg2="${artifactWs}" /> - </not> - </and> - <and> - <isset property="artifactArch" /> - <not> - <equals arg1="" arg2="${artifactArch}" /> - </not> - </and> - </or> - <then> - <echo file="@{dir}/pom.xml" append="true"> <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tychoVersion}</version> - <configuration> - <resolver>p2</resolver> - <environments> - <environment> - <os>${artifactOs}</os> - <ws>${artifactWs}</ws> - <arch>${artifactArch}</arch> - </environment> - </environments> - </configuration> - </plugin> - </plugins> - </build> -</echo> - </then> - </if> - <echo file="@{dir}/pom.xml" append="true"></project> -</echo> - </then> - </if> - <var name="artifactId" unset="true" /> - <var name="artifactVersion" unset="true" /> - <var name="artifactType" unset="true" /> - <var name="artifactOs" unset="true" /> - <var name="artifactWs" unset="true" /> - <var name="artifactArch" unset="true" /> - <var name="modulecountstring" value="${modulecountstring}1" /> - </sequential> - </macrodef> - -  - <macrodef name="generateAggregator"> - <attribute name="dir" default="${WORKINGDIR}" /> - <attribute name="parentPom" default="${pathToParentPom}parent-pom.xml" /> - <attribute name="artifactId" default="" /> - <attribute name="artifactVersion" default="" /> - <sequential> - <writeAggregatePom dir="@{dir}" - parentpom="@{parentpom}" - artifactId="@{artifactId}" - artifactVersion="@{artifactVersion}" - /> - - <dump dir="@{dir}" - parentpom="@{parentpom}" - artifactId="@{artifactId}" - artifactVersion="@{artifactVersion}" - /> - <var name="aggregatorcountstring" value="${aggregatorcountstring}1" /> - - </sequential> - </macrodef> - - -  - <macrodef name="dump"> - <attribute name="dir" /> - <attribute name="parentpom" /> - <attribute name="artifactId" default="" /> - <attribute name="artifactVersion" default="" /> - <sequential> - <if> - <equals arg1="${COMPONENT}" arg2="trunk" /> - <then> - <path id="trunkDir"> - <dirset dir="@{dir}" excludes="${dirsToExclude}" includes="*" /> - </path> - </then> - <elseif> - <equals arg1="${COMPONENT}" arg2="site" /> - <then> - <dirname property="parent.dir" file="@{dir}" /> - <path id="trunkDir"> - <dirset dir="${parent.dir}" includes="site" /> - </path> - <var name="parent.dir" unset="true" /> - <var name="pathToParentPom" value="${pathToParentPom}site/" /> - </then> - </elseif> - <else> - <path id="trunkDir"> - <dirset dir="@{dir}/${pathToParentPom}" - excludes="${dirsToExclude}" - includes="${COMPONENT}/*/*, ${COMPONENT}/plugins, ${COMPONENT}/features, ${COMPONENT}/tests, ${COMPONENT}/site" - /> - </path> - </else> - </if> - <for param="subdir" delimiter=", - "> - <path refid="trunkDir" /> - <sequential> - <echo level="debug">@{subdir}</echo> - <var name="aggregate" value="false" /> - <if> - <or> -  - <available file="@{subdir}/META-INF/MANIFEST.MF" type="file" /> - <available file="@{subdir}/feature.xml" type="file" /> - </or> - <then> -  - <writeModulePom dir="@{subdir}" parentpom="../${pathToParentPom}@{parentpom}" /> - </then> - <elseif> - <available file="@{subdir}/site.xml" type="file" /> - <then> -  - <echo level="debug">writeModulePom dir="@{subdir}" parentpom="${pathToParentPom}@{parentpom}"</echo> - <writeModulePom dir="@{subdir}" parentpom="${pathToParentPom}@{parentpom}" /> - </then> - </elseif> - <else> - <for list="plugins tests features site" param="type" delimiter=" "> - <sequential> - <basename property="artifactIdAgg" file="@{subdir}" /> - <if> - <available file="@{subdir}/@{type}" type="dir" /> - <then> - <var name="aggregate" value="true" /> - <generateAggregator dir="@{subdir}/@{type}" - parentpom="../../${pathToParentPom}@{parentpom}" - artifactId="${artifactIdAgg}.@{type}" - artifactVersion="@{artifactVersion}" - /> - </then> - </if> - <var name="artifactIdAgg" unset="true" /> - </sequential> - </for> - - <if> - <istrue value="${aggregate}" /> - <else> - <basename property="artifactIdAgg" file="@{subdir}" /> - <if> - <equals arg1="${COMPONENT}" arg2="trunk" /> - <then> - <var name="artifactId" value="${artifactIdAgg}.all" /> - </then> - <else> - <var name="artifactId" value="${COMPONENT}.${artifactIdAgg}" /> - </else> - </if> - <writeAggregatePom dir="@{subdir}" - parentpom="../${pathToParentPom}parent-pom.xml" - artifactId="${artifactId}" - artifactVersion="@{artifactVersion}" - /> - - <echo level="debug">subdir = @{subdir}</echo> - <echo level="verbose">Aggregated: ${artifactIdAgg}</echo> - - <var name="artifactIdAgg" unset="true" /> - <var name="artifactId" unset="true" /> - </else> - </if> - </else> - </if> - </sequential> - </for> - </sequential> - </macrodef> - - </target> - - <target name="run" depends="init"> - <var name="show.pom.exists.warning" value="" /> - - <if> - <and> - <isset property="COMPONENT" /> - <not> - <equals arg1="${COMPONENT}" arg2="" /> - </not> - </and> - <then> - <var name="COMPONENTS" unset="true" /> - <var name="COMPONENTS" value="${COMPONENT}" /> - </then> - <elseif> - <not> - <isset property="COMPONENTS" /> - </not> - <then> - <var name="COMPONENTS" value="trunk" /> - </then> - </elseif> - </if> - <for param="COMPONENT" list="${COMPONENTS}" delimiter=",; - "> - <sequential> - <var name="COMPONENT" value="@{COMPONENT}" /> - <echo level="info">COMPONENT = '${COMPONENT}'</echo> - <if> - <not> - <available file="${WORKINGDIR}/${pathToParentPomInput}parent-pom.xml" type="file" /> - </not> - <then> - <fail>Error: no parent-pom.xml found in ${WORKINGDIR}/${pathToParentPomInput}</fail> - </then> - </if> - - <if> - <not> - <equals arg1="${COMPONENT}" arg2="trunk" /> - </not> - <then> - <var name="pathToParentPom" unset="true" /> - <var name="pathToParentPom" value="../" /> - </then> - </if> - <echo level="verbose">COMPONENT = '${COMPONENT}', pathToParentPom = ${pathToParentPom}</echo> - -  -  - - <if> - <and> - <isset property="tagsFile" /> - <available file="${tagsFile}" type="file" /> - </and> - <then> - <property file="${tagsFile}" prefix="tagsFile" /> - </then> - </if> - -  - <var name="aggregatorcountstring" value="" /> - <var name="modulecountstring" value="" /> - - <if> - <equals arg1="${COMPONENT}" arg2="trunk" /> - <then> -  - <generateAggregator dir="${WORKINGDIR}" - parentpom="${pathToParentPom}parent-pom.xml" - artifactId="${COMPONENT}" - artifactVersion="${pomVersion}" - /> - </then> - <else> -  - <generateAggregator dir="${WORKINGDIR}/${COMPONENT}" - parentpom="${pathToParentPom}parent-pom.xml" - artifactId="${COMPONENT}" - artifactVersion="${pomVersion}" - /> - </else> - </if> -  - <length string="${modulecountstring}" property="modulecount" /> - <length string="${aggregatorcountstring}" property="aggregatorcount" /> - <echo level="info">${WORKINGDIR}/${COMPONENT} :: Modules: ${modulecount}, Aggregations: ${aggregatorcount}</echo> - <if> - <not> - <equals arg1="${show.pom.exists.warning}" arg2="" /> - </not> - <then> - <length property="show.pom.exists.warning.count" string="${show.pom.exists.warning}" /> - <echo level="warning">${show.pom.exists.warning.count} '${COMPONENT}' pom.xml file(s) already exist. To overwrite, use -Doverwrite.existing.pom.xml=true</echo> - </then> - </if> - <var name="show.pom.exists.warning.count" unset="true" /> - <var name="show.pom.exists.warning" value="" /> - <var name="modulecount" unset="true" /> - <var name="aggregatorcount" unset="true" /> - </sequential> - </for> - </target> - - <target name="getArtifactType"> - <property name="dir" value="." /> - <if> - <matches string="${dir}" pattern=".+/features/.+" /> - <then> - <var name="artifactType" value="eclipse-feature" /> - </then> - <elseif> - <or> - <matches string="${dir}" pattern=".+/site" /> - <matches string="${dir}" pattern=".+site" /> - </or> - <then> - <var name="artifactType" value="eclipse-update-site" /> - </then> - </elseif> - <elseif> - <and> - <not> - <matches string="${dir}" pattern=".+/plugins/.+" /> - </not> - <matches string="${dir}" pattern=".+/tests/.+" /> - </and> - <then> - <var name="artifactType" value="eclipse-plugin" /> - <for param="testClassFile" delimiter=", "> - <path> - <fileset dir="${dir}" includes="${testClassFilesToInclude}" /> - </path> - <sequential> - <var name="artifactType" value="eclipse-test-plugin" /> - </sequential> - </for> - </then> - </elseif> - <else> - <var name="artifactType" value="eclipse-plugin" /> - </else> - </if> - </target> - - <target name="getArtifactVersion"> - <property name="dir" value="." /> -  - <if> - <available file="${dir}/META-INF/MANIFEST.MF" type="file" /> - <then> -  - <loadfile srcfile="${dir}/META-INF/MANIFEST.MF" property="artifactVersion"> - <filterchain> - <linecontains> - <contains value="Bundle-Version:" /> - </linecontains> - </filterchain> - </loadfile> - <propertyregex property="artifactVersion" - input="${artifactVersion}" - defaultvalue="${artifactVersion}" - regexp="Bundle-Version:( +)([^\n\r]+)[\n\r]+" - replace="\2" - casesensitive="true" - override="true" - /> - -  - <antcallback target="checkArtifactVersionAgainstTagFile" return="artifactVersion.from.tag" /> - <if> - <and> - <isset property="artifactVersion.from.tag" /> - <not> - <equals arg1="${artifactVersion.from.tag}" arg2="${artifactVersion}" /> - </not> - </and> - <then> - <loadfile property="manifest.file" srcfile="${dir}/META-INF/MANIFEST.MF"> - <filterchain> - <tokenfilter> - <replaceregex pattern="Bundle-Version:( +)${artifactVersion}" - replace="Bundle-Version: ${artifactVersion.from.tag}" - flags="" - /> - </tokenfilter> - </filterchain> - </loadfile> - <echo message="${manifest.file}" file="${dir}/META-INF/MANIFEST.MF" /> - <var name="manifest.file" unset="true" /> - </then> - <else> - <var name="artifactVersion.from.tag" value="${artifactVersion}" /> - </else> - </if> - -  - <propertyregex property="artifactVersion" - input="${artifactVersion.from.tag}" - defaultvalue="${artifactVersion.from.tag}" - regexp="(.+).qualifier" - replace="\1-SNAPSHOT" - casesensitive="true" - override="true" - /> - <var name="artifactVersion.from.tag" unset="true" /> - </then> - <elseif> - <available file="${dir}/feature.xml" type="file" /> - <then> -  - <xmlproperty file="${dir}/feature.xml" collapseAttributes="true" /> - <var name="artifactVersion" value="${feature.version}" /> - -  - <antcallback target="checkArtifactVersionAgainstTagFile" return="artifactVersion.from.tag" /> - <if> - <and> - <isset property="artifactVersion.from.tag" /> - <not> - <equals arg1="${artifactVersion.from.tag}" arg2="${artifactVersion}" /> - </not> - </and> - <then> - <loadfile property="manifest.file" srcfile="${dir}/feature.xml"> - <filterchain> - <tokenfilter> - <replaceregex pattern="version="${artifactVersion}"" - replace="version="${artifactVersion.from.tag}"" - flags="" - /> - </tokenfilter> - </filterchain> - </loadfile> - <echo message="${manifest.file}" file="${dir}/feature.xml" /> - <var name="manifest.file" unset="true" /> - </then> - <else> - <var name="artifactVersion.from.tag" value="${artifactVersion}" /> - </else> - </if> - <var name="feature.version" unset="true" /> - -  - <propertyregex property="artifactVersion" - input="${artifactVersion.from.tag}" - defaultvalue="${artifactVersion.from.tag}" - regexp="(.+).qualifier" - replace="\1-SNAPSHOT" - casesensitive="true" - override="true" - /> - <var name="artifactVersion.from.tag" unset="true" /> - </then> - </elseif> - <else> - <echo level="verbose">Warning! artifactVersion not found for ${dir}!</echo> - <var name="artifactVersion" value="0.0.0" /> - </else> - </if> - </target> - - <target name="checkArtifactVersionAgainstTagFile"> - <dirname property="this.dir" file="${dir}" /> - <dirname property="parent.dir.path" file="${this.dir}" /> - <basename property="parent.dir" file="${parent.dir.path}" /> - <var name="this.dir" unset="true" /> - <var name="parent.dir.path" unset="true" /> - <if> - <isset property="tagsFile.${parent.dir}" /> - <then> - <propertycopy from="tagsFile.${parent.dir}" property="artifactVersion.from.tag" /> - <propertyregex property="artifactVersion.from.tag" - input="${artifactVersion.from.tag}" - defaultvalue="${artifactVersion.from.tag}" - regexp="(.+).GA" - replace="\1.qualifier" - casesensitive="true" - override="true" - /> - </then> - </if> - <if> - <and> - <isset property="tagsFile.${parent.dir}" /> - <not> - <equals arg1="${artifactVersion}" arg2="${artifactVersion.from.tag}" /> - </not> - </and> - <then> - <basename file="${dir}" property="this.dir" /> - <echo level="info">For ${this.dir}, got ${artifactVersion}; should be ${artifactVersion.from.tag}</echo> - </then> - <else> - <var name="artifactVersion.from.tag" value="${artifactVersion}" /> - </else> - </if> - <var name="parent.dir" unset="true" /> - </target> - -  - <target name="getArtifactOsWsArch"> - <property name="artifactId" value="org.mozilla.xulrunner.cocoa.macosx" /> - <propertyregex property="artifactOs" - input="${artifactId}" - defaultvalue="" - regexp="(macosx|linux|win32)" - select="\1" - casesensitive="true" - override="true" - /> - <propertyregex property="artifactWs" - input="${artifactId}" - defaultvalue="" - regexp="(carbon|cocoa|win32|gtk)" - select="\1" - casesensitive="true" - override="true" - /> - <propertyregex property="artifactArch" - input="${artifactId}" - defaultvalue="" - regexp="\.(x86|x86_64)$" - select="\1" - casesensitive="true" - override="true" - /> - - </target> - - <target name="getArtifactId"> - <property name="dir" value="." /> -  - <if> - <available file="${dir}/META-INF/MANIFEST.MF" type="file" /> - <then> -  - <loadfile srcfile="${dir}/META-INF/MANIFEST.MF" property="artifactId"> - <filterchain> - <linecontains> - <contains value="Bundle-SymbolicName:" /> - </linecontains> - </filterchain> - </loadfile> - <propertyregex property="artifactId" - input="${artifactId}" - defaultvalue="${artifactId}" - regexp="Bundle-SymbolicName:([\t ]+)([^\n\r\t ]+);(.+)[\n\r\t ]+" - replace="\2" - casesensitive="true" - override="true" - /> - <propertyregex property="artifactId" - input="${artifactId}" - defaultvalue="${artifactId}" - regexp="Bundle-SymbolicName:([\t ]+)([^\n\r\t ]+)[\n\r\t ]+" - replace="\2" - casesensitive="true" - override="true" - /> - </then> - <elseif> - <available file="${dir}/feature.xml" type="file" /> - <then> -  - <xmlproperty file="${dir}/feature.xml" collapseAttributes="true" /> - <var name="artifactId" value="${feature.id}" /> - <var name="feature.id" unset="true" /> - </then> - </elseif> - <else> - <echo level="info">Warning! artifactId not found for ${dir}!</echo> - <basename property="artifactId" file="${dir}" /> - </else> - </if> - </target> - -  - - <target name="test.expected.values"> - <property name="ant.enable.asserts" value="true" /> - -  - <property name="artifactVersion.esb/features/org.jboss.tools.esb.feature" value="1.3.0-SNAPSHOT" /> - <property name="artifactVersion.as/tests/org.jboss.ide.eclipse.as.archives.integration.test" - value="2.1.0-SNAPSHOT" - /> - <property name="artifactVersion.esb/plugins/org.jboss.tools.esb.core" value="1.3.0-SNAPSHOT" /> - <property name="artifactVersion.bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui" value="0.5.0-SNAPSHOT" /> - <property name="artifactVersion.bpel/features/org.jboss.tools.bpel.sdk.feature" value="1.0.0-SNAPSHOT" /> - <property name="artifactVersion.bpel/plugins/org.eclipse.bpel.xpath10" value="0.5.0-SNAPSHOT" /> - <property name="artifactVersion.vpe/plugins/org.jboss.tools.vpe.ui.palette" value="3.1.0-SNAPSHOT" /> - <property name="artifactVersion.tests/features/org.jboss.tools.test.feature" value="3.1.0-SNAPSHOT" /> - <property name="artifactVersion.portlet/features/org.jboss.tools.portlet.test.feature" value="1.1.0-SNAPSHOT" /> - <property name="artifactVersion.jst/features/org.jboss.tools.jst.feature" value="3.1.0-SNAPSHOT" /> - <property name="artifactVersion.jst/features/org.jboss.tools.jst.web.tiles.feature" value="3.1.0-SNAPSHOT" /> - <property name="artifactVersion.drools/plugins/org.jboss.tools.flow.ruleflow" value="1.0.0" /> - -  - <property name="artifactId.esb/features/org.jboss.tools.esb.feature" value="org.jboss.tools.esb.feature" /> - <property name="artifactId.as/tests/org.jboss.ide.eclipse.as.archives.integration.test" - value="org.jboss.ide.eclipse.as.archives.integration.test" - /> - <property name="artifactId.esb/plugins/org.jboss.tools.esb.core" value="org.jboss.tools.esb.core" /> - <property name="artifactId.bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui" - value="org.eclipse.bpel.apache.ode.deploy.ui" - /> - <property name="artifactId.bpel/features/org.jboss.tools.bpel.sdk.feature" - value="org.jboss.tools.bpel.sdk.feature" - /> - <property name="artifactId.bpel/plugins/org.eclipse.bpel.xpath10" value="org.eclipse.bpel.xpath10" /> - <property name="artifactId.vpe/plugins/org.jboss.tools.vpe.ui.palette" value="org.jboss.tools.vpe.ui.palette" /> - <property name="artifactId.tests/features/org.jboss.tools.test.feature" value="org.jboss.tools.test.feature" /> - <property name="artifactId.portlet/features/org.jboss.tools.portlet.test.feature" - value="org.jboss.tools.portlet.test.feature" - /> - <property name="artifactId.jst/features/org.jboss.tools.jst.feature" value="org.jboss.tools.jst.feature" /> - <property name="artifactId.jst/features/org.jboss.tools.jst.web.tiles.feature" - value="org.jboss.tools.jst.web.tiles.feature" - /> - <property name="artifactId.drools/plugins/org.jboss.tools.flow.ruleflow" - value="org.jboss.tools.flow.ruleflow" - /> - -  - <property name="artifactType.esb/features/org.jboss.tools.esb.feature" value="eclipse-feature" /> - <property name="artifactType.as/tests/org.jboss.ide.eclipse.as.archives.integration.test" - value="eclipse-test-plugin" - /> - <property name="artifactType.flow/tests/org.jboss.tools.flow.common.test" value="eclipse-plugin" /> - <property name="artifactType.jbpm/tests/org.jboss.tools.flow.jpdl4.test" value="eclipse-plugin" /> - <property name="artifactType.esb/plugins/org.jboss.tools.esb.core" value="eclipse-plugin" /> - <property name="artifactType.bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui" value="eclipse-plugin" /> - <property name="artifactType.bpel/features/org.jboss.tools.bpel.sdk.feature" value="eclipse-feature" /> - <property name="artifactType.bpel/plugins/org.eclipse.bpel.xpath10" value="eclipse-plugin" /> - <property name="artifactType.vpe/plugins/org.jboss.tools.vpe.ui.palette" value="eclipse-plugin" /> - <property name="artifactType.tests/features/org.jboss.tools.test.feature" value="eclipse-feature" /> - <property name="artifactType.portlet/features/org.jboss.tools.portlet.test.feature" value="eclipse-feature" /> - <property name="artifactType.jst/features/org.jboss.tools.jst.feature" value="eclipse-feature" /> - <property name="artifactType.jst/features/org.jboss.tools.jst.web.tiles.feature" value="eclipse-feature" /> - <property name="artifactType.drools/plugins/org.jboss.tools.flow.ruleflow" value="eclipse-plugin" /> - -  - <property name="artifactOsWsArch.org.mozilla.xpcom.os" value="" /> - <property name="artifactOsWsArch.org.mozilla.xpcom.ws" value="" /> - <property name="artifactOsWsArch.org.mozilla.xpcom.arch" value="" /> - - <property name="artifactOsWsArch.org.mozilla.xulrunner.carbon.macosx.os" value="macosx" /> - <property name="artifactOsWsArch.org.mozilla.xulrunner.carbon.macosx.ws" value="carbon" /> - <property name="artifactOsWsArch.org.mozilla.xulrunner.carbon.macosx.arch" value="" /> - - <property name="artifactOsWsArch.org.mozilla.xulrunner.cocoa.macosx.os" value="macosx" /> - <property name="artifactOsWsArch.org.mozilla.xulrunner.cocoa.macosx.ws" value="cocoa" /> - <property name="artifactOsWsArch.org.mozilla.xulrunner.cocoa.macosx.arch" value="" /> - - <property name="artifactOsWsArch.org.mozilla.xulrunner.gtk.linux.x86.os" value="linux" /> - <property name="artifactOsWsArch.org.mozilla.xulrunner.gtk.linux.x86.ws" value="gtk" /> - <property name="artifactOsWsArch.org.mozilla.xulrunner.gtk.linux.x86.arch" value="x86" /> - - <property name="artifactOsWsArch.org.mozilla.xulrunner.gtk.linux.x86_64.os" value="linux" /> - <property name="artifactOsWsArch.org.mozilla.xulrunner.gtk.linux.x86_64.ws" value="gtk" /> - <property name="artifactOsWsArch.org.mozilla.xulrunner.gtk.linux.x86_64.arch" value="x86_64" /> - - <property name="artifactOsWsArch.org.mozilla.xulrunner.win32.win32.x86.os" value="win32" /> - <property name="artifactOsWsArch.org.mozilla.xulrunner.win32.win32.x86.ws" value="win32" /> - <property name="artifactOsWsArch.org.mozilla.xulrunner.win32.win32.x86.arch" value="x86" /> - </target> - - <target name="test.all" depends="init, test.expected.values"> - - <property name="dirs" - value=" - ${WORKINGDIR}/esb/features/org.jboss.tools.esb.feature - ${WORKINGDIR}/as/tests/org.jboss.ide.eclipse.as.archives.integration.test - ${WORKINGDIR}/esb/plugins/org.jboss.tools.esb.core - ${WORKINGDIR}/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui - ${WORKINGDIR}/bpel/features/org.jboss.tools.bpel.sdk.feature - ${WORKINGDIR}/bpel/plugins/org.eclipse.bpel.xpath10 - ${WORKINGDIR}/vpe/plugins/org.jboss.tools.vpe.ui.palette - ${WORKINGDIR}/tests/features/org.jboss.tools.test.feature - ${WORKINGDIR}/portlet/features/org.jboss.tools.portlet.test.feature - ${WORKINGDIR}/jst/features/org.jboss.tools.jst.feature - ${WORKINGDIR}/jst/features/org.jboss.tools.jst.web.tiles.feature - ${WORKINGDIR}/drools/plugins/org.jboss.tools.flow.ruleflow - " - /> - <antcall target="test.getArtifactVersion" /> - <antcall target="test.getArtifactId" /> - <antcall target="test.getArtifactType" /> - <antcall target="test.getArtifactOsWsArch" /> - </target> - - <target name="test.getArtifactVersion" depends="init, test.expected.values"> - <property name="dirs" - value=" - ${WORKINGDIR}/esb/features/org.jboss.tools.esb.feature - ${WORKINGDIR}/as/tests/org.jboss.ide.eclipse.as.archives.integration.test - ${WORKINGDIR}/esb/plugins/org.jboss.tools.esb.core - ${WORKINGDIR}/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui - ${WORKINGDIR}/tests/features/org.jboss.tools.test.feature - ${WORKINGDIR}/portlet/features/org.jboss.tools.portlet.test.feature - ${WORKINGDIR}/jst/features/org.jboss.tools.jst.feature - ${WORKINGDIR}/jst/features/org.jboss.tools.jst.web.tiles.feature - " - /> - <for param="dir" list="${dirs}" delimiter=", - "> - <sequential> - <antcallback target="getArtifactVersion" return="artifactVersion"> - <property name="dir" value="@{dir}" /> - </antcallback> - <propertyregex property="activeDir" - input="@{dir}" - defaultvalue="@{dir}" - regexp="${WORKINGDIR}/" - replace="" - casesensitive="true" - override="true" - /> - <propertycopy name="expected.value" from="artifactVersion.${activeDir}" /> - <assert failonerror="false" - message="For ${activeDir}, artifactVersion = ${artifactVersion}; expected ${expected.value}" - > - <bool> - <equals arg1="${expected.value}" arg2="${artifactVersion}" /> - </bool> - </assert> - <var name="expected.value" unset="true" /> - <var name="artifactVersion" unset="true" /> - </sequential> - </for> - </target> - - <target name="test.getArtifactId" depends="init, test.expected.values"> - <property name="dirs" - value=" - ${WORKINGDIR}/esb/features/org.jboss.tools.esb.feature - ${WORKINGDIR}/as/tests/org.jboss.ide.eclipse.as.archives.integration.test - ${WORKINGDIR}/esb/plugins/org.jboss.tools.esb.core - " - /> - <for param="dir" list="${dirs}" delimiter=", - "> - <sequential> - <antcallback target="getArtifactId" return="artifactId"> - <property name="dir" value="@{dir}" /> - </antcallback> - <propertyregex property="activeDir" - input="@{dir}" - defaultvalue="@{dir}" - regexp="${WORKINGDIR}/" - replace="" - casesensitive="true" - override="true" - /> - <propertycopy name="expected.value" from="artifactId.${activeDir}" /> - <assert failonerror="false" - message="For ${activeDir}, artifactId = ${artifactId}; expected ${expected.value}" - > - <bool> - <equals arg1="${expected.value}" arg2="${artifactId}" /> - </bool> - </assert> - <var name="expected.value" unset="true" /> - <var name="artifactId" unset="true" /> - </sequential> - </for> - </target> - - <target name="test.getArtifactOsWsArch" depends="init, test.expected.values"> - <property name="artifactIds" - value=" - org.mozilla.xpcom - org.mozilla.xulrunner.carbon.macosx - org.mozilla.xulrunner.cocoa.macosx - org.mozilla.xulrunner.gtk.linux.x86 - org.mozilla.xulrunner.gtk.linux.x86_64 - org.mozilla.xulrunner.win32.win32.x86 - " - /> - <for param="artifactId" list="${artifactIds}" delimiter=", - "> - <sequential> - <echo level="debug">artifactId = @{artifactId}</echo> - <antcallback target="getArtifactOsWsArch" return="artifactOs, artifactWs, artifactArch"> - <property name="artifactId" value="@{artifactId}" /> - </antcallback> - <propertycopy name="expected.value.os" from="artifactOsWsArch.(a){artifactId}.os" /> - <propertycopy name="expected.value.ws" from="artifactOsWsArch.(a){artifactId}.ws" /> - <propertycopy name="expected.value.arch" from="artifactOsWsArch.(a){artifactId}.arch" /> - <assert failonerror="false" - message="For @{artifactId}, artifactOs = ${artifactOs}; expected ${expected.value.os}" - > - <bool> - <equals arg1="${expected.value.os}" arg2="${artifactOs}" /> - </bool> - </assert> - <assert failonerror="false" - message="For @{artifactId}, artifactWs = ${artifactWs}; expected ${expected.value.ws}" - > - <bool> - <equals arg1="${expected.value.ws}" arg2="${artifactWs}" /> - </bool> - </assert> - <assert failonerror="false" - message="For @{artifactId}, artifactArch = ${artifactArch}; expected ${expected.value.arch}" - > - <bool> - <equals arg1="${expected.value.arch}" arg2="${artifactArch}" /> - </bool> - </assert> - <var name="expected.value.os" unset="true" /> - <var name="expected.value.ws" unset="true" /> - <var name="expected.value.arch" unset="true" /> - </sequential> - </for> - - </target> - - <target name="test.getArtifactType" depends="init, test.expected.values"> - <property name="dirs" - value=" - ${WORKINGDIR}/esb/features/org.jboss.tools.esb.feature - ${WORKINGDIR}/as/tests/org.jboss.ide.eclipse.as.archives.integration.test - ${WORKINGDIR}/esb/plugins/org.jboss.tools.esb.core - ${WORKINGDIR}/esb/plugins/org.jboss.tools.esb.core - ${WORKINGDIR}/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui - ${WORKINGDIR}/bpel/features/org.jboss.tools.bpel.sdk.feature - ${WORKINGDIR}/bpel/plugins/org.eclipse.bpel.xpath10 - ${WORKINGDIR}/vpe/plugins/org.jboss.tools.vpe.ui.palette - ${WORKINGDIR}/tests/features/org.jboss.tools.test.feature - ${WORKINGDIR}/portlet/features/org.jboss.tools.portlet.test.feature - ${WORKINGDIR}/jst/features/org.jboss.tools.jst.feature - ${WORKINGDIR}/jst/features/org.jboss.tools.jst.web.tiles.feature - ${WORKINGDIR}/flow/tests/org.jboss.tools.flow.common.test - ${WORKINGDIR}/jbpm/tests/org.jboss.tools.flow.jpdl4.test - " - /> - <for param="dir" list="${dirs}" delimiter=", - "> - <sequential> - <antcallback target="getArtifactType" return="artifactType"> - <property name="dir" value="@{dir}" /> - </antcallback> - <propertyregex property="activeDir" - input="@{dir}" - defaultvalue="@{dir}" - regexp="${WORKINGDIR}/" - replace="" - casesensitive="true" - override="true" - /> - <propertycopy name="expected.value" from="artifactType.${activeDir}" /> - <assert failonerror="false" - message="For ${activeDir}, artifactType = ${artifactType}; expected ${expected.value}" - > - <bool> - <equals arg1="${expected.value}" arg2="${artifactType}" /> - </bool> - </assert> - <var name="expected.value" unset="true" /> - <var name="artifactType" unset="true" /> - </sequential> - </for> - </target> - -</project> Deleted: trunk/runstack.sh =================================================================== --- trunk/runstack.sh 2010-06-23 17:14:05 UTC (rev 22963) +++ trunk/runstack.sh 2010-06-23 17:15:48 UTC (rev 22964) @@ -1,40 +0,0 @@ -#!/bin/bash - -#root of svn tree -workingdir=~/workspace36/jbosstools-modular_build - -#use commandline args as list of components to build -if [[ $# -lt 1 ]]; then - echo "Usage: $0 component1 component2 ..." - echo "Eg. $0 tests common jmx archives as" - echo "Eg. $0 jst jsf vpe struts seam -Dmaven.test.skip" - exit 1 -fi - -flags="" -components="" -while [ "$#" -gt 0 ]; do - case $1 in - '-'*) flags="$flags $1"; shift 1;; - *) components="$components $1"; shift 1;; - esac -done - -# run builds w/o running tests -for d in $components; do - # build features, plugins, and tests, but do not RUN tests - #cd $workingdir; ./runtests.sh ${d}/ clean install -Dmaven.test.skip - - # build features, plugins, and tests, then run ALL tests (don't stop after first failed test) - cd $workingdir; ./runtests.sh ${d}/ clean install --fail-at-end $flags -done - -# collect compilation results and failures -for d in $components; do - cd $workingdir; echo "==== $d ====" - egrep -v "org\.|com\." $d/buildlog.latest.txt | egrep "SUCCESS" - egrep "FAILURE|SKIPPED" $d/buildlog.latest.txt - egrep -A1 "Cannot complete the request|depends on|satisfy dependency|Missing requirement|requires '.+'" $d/buildlog.latest.txt - echo "" -done - Deleted: trunk/runtests.sh =================================================================== --- trunk/runtests.sh 2010-06-23 17:14:05 UTC (rev 22963) +++ trunk/runtests.sh 2010-06-23 17:15:48 UTC (rev 22964) @@ -1,89 +0,0 @@ -#!/bin/bash - -# set corect path to mvn on your machine: -mvn3=/opt/maven3/bin/mvn - -if [[ $# -lt 1 ]]; then - # some useful flags: - # -pl - list of projects to build - # -o - offline mode (don't search remote repos) - # -Dmaven.test.skip - compile but do not run tests - # --fail-at-end - fail build after ALL tests have run, not at first failure - echo "Usage: $0 workingdir flags targets" - echo "Eg: $0 as/ -Dmaven.test.skip clean install" - echo "Eg: $0 bpel/tests/ -o --fail-at-end install" - exit 1; -fi - -#echo "[runtests] $0 started on: `date +%H\:%M\:%S`"; - -# environment variables -PATH=.:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:/usr/X11R6/bin:`pwd`/../linux;export PATH - -#export USERNAME=`whoami` -#echo "[runtests] Run as $USERNAME"; -#echo "[runtests] With PATH = $PATH"; - -# fix for org.eclipse.swt.SWTError: No more handles [gtk_init_check() failed] -# fix for Failed to invoke suite():org.eclipse.swt.SWTError: No more handles [gtk_init_check() failed] -export CVS_RSH=ssh -#ulimit -c unlimited; # set corefile size to unlimited; not allowed on build.eclipse - -#echo "[runtests] Set JAVA_HIGH_ZIPFDS=500 & LANG=C"; -#export JAVA_HIGH_ZIPFDS=500 -#export LANG=C - -usedPorts=""; maxPort=40 -for port in $(ps aux | egrep '[Xvnc|Xvfb]\ :' | egrep " :[0-9]+" | sed "s/$\^\|.\+$$Xvfb\|Xvnc$ :$[0-9]\+$$.\+\|$$/\3/g" | sort); do - if [[ $(echo $port | egrep "^:[0-9]+$") ]]; then - usedPorts=$usedPorts" "${port:1}; - thisPort=${port:1}; (( thisPort -= 0 )); - if [[ $maxPort -lt $thisPort ]]; then maxPort=$thisPort; fi - #echo "[$usedPorts], $thisPort, $maxPort" - fi -done -(( xport = maxPort + 1 )); -#echo "Existing DISPLAY ports include: $usedPorts." -#echo "Use DISPLAY port :$xport" - -xCmd="" -xvncExists=$(which Xvnc); xvncExists=${xvncExists##*no Xvnc *} -if [ $xvncExists ]; then - xCmd="Xvnc :${xport} -geometry 1024x768 -depth 24 -ac" -else - xvfbExists=$(which Xvfb); xvfbExists=${xvfbExists##*no Xvfb *} - if [ $xvfbExists ]; then - xCmd="Xvfb :${xport} -screen 0 1024x768x24 -ac" - else - echo "[runtests] WARNING! This script requires Xvfb or Xvnc. " - echo "[runtests] Without some way to run tests in a different display port, UI tests will run in front of you and you may accidentally interact with them." - fi -fi - -if [[ $xCmd ]]; then - #echo "[runtests] Using X server: '${xCmd}'" - ${xCmd} & - export DISPLAY=localhost:${xport}.0 - xhost + -else - echo "[runtests] Warning! UI tests will run in the current UI display port (usually :0). Please avoid accidentally interacting with them." -fi - - -# run tests -echo "[runtests] [`date +%H\:%M\:%S`] Launching Tycho..." -dir=$1; shift; - -cd $dir; $mvn3 2>&1 $* | tee buildlog.latest.txt - -echo "[runtests] [`date +%H\:%M\:%S`] Test run completed. " - -# xwd -silent -display :${xport} -root -out /tmp/snap.xwd; # save a snapshot - -############################# END RUN TESTS ############################# - -# drop X server process threads used by tests -if [[ -r /tmp/.X${xport}-lock ]]; then kill `cat /tmp/.X${xport}-lock`; fi -if [[ -f /tmp/.X${xport}-lock ]]; then rm -fr /tmp/.X${xport}-lock; fi - -#echo "[runtests] ${0##*/} done: `date +%H\:%M\:%S`" Deleted: trunk/svnignore.sh =================================================================== --- trunk/svnignore.sh 2010-06-23 17:14:05 UTC (rev 22963) +++ trunk/svnignore.sh 2010-06-23 17:15:48 UTC (rev 22964) @@ -1,35 +0,0 @@ -#!/bin/bash -tmpfile=/tmp/svn.ignore.txt -echo "target -buildlog.latest.txt -bin -build -*.class -" > $tmpfile - -dir="."; if [[ $1 ]]; then dir=$1; fi - -for p in com org net; do - for f in $(find $dir -mindepth 2 -type d -name "${p}.*" | sort); do - pushd $f 2>&1 >/dev/null - echo $f - svn up --accept 'theirs-full' - svn propset svn:ignore --file $tmpfile . - popd 2>&1 >/dev/null - echo "" - done -done -rm -fr $tmpfile -svn diff $dir - -echo "" -echo "===================================================================" -echo "" -echo "Pending changes:" -svn stat $dir - -echo "" -echo "To commit changes, type: - cd $dir; svn ci -m \"svn:ignore\"" -echo "" -

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22963 - trunk/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-06-23 13:14:05 -0400 (Wed, 23 Jun 2010) New Revision: 22963 Modified: trunk/build/target-platform/e36-wtp32-svn.target trunk/build/target-platform/e36-wtp32.target Log: replace interim and milestone sites w/ release sites Modified: trunk/build/target-platform/e36-wtp32-svn.target =================================================================== --- trunk/build/target-platform/e36-wtp32-svn.target 2010-06-23 17:10:51 UTC (rev 22962) +++ trunk/build/target-platform/e36-wtp32-svn.target 2010-06-23 17:14:05 UTC (rev 22963) @@ -17,8 +17,11 @@ </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0.v20100617-1315-35-7w3121172802426"/> +<repository location="http://download.eclipse.org/birt/update-site/2.6/"/> +</location> + <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.10.0.20100209-0800"/> <repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/> @@ -102,8 +105,11 @@ </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <unit id="org.eclipse.platform.ide" version="3.6.0.I20100603-1500"/> +<repository location="http://download.eclipse.org/eclipse/updates/3.6/"/> +</location> + <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/> </location> Modified: trunk/build/target-platform/e36-wtp32.target =================================================================== --- trunk/build/target-platform/e36-wtp32.target 2010-06-23 17:10:51 UTC (rev 22962) +++ trunk/build/target-platform/e36-wtp32.target 2010-06-23 17:14:05 UTC (rev 22963) @@ -10,8 +10,11 @@ <repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/> </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> +<repository location="http://download.eclipse.org/birt/update-site/2.6/"/> +</location> + <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/> </location> @@ -31,8 +34,11 @@ <repository location="http://download.eclipse.org/releases/helios/"/> </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> +<repository location="http://download.eclipse.org/eclipse/updates/3.6/"/> +</location> + <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/> </location>

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22962 - trunk.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-06-23 13:10:51 -0400 (Wed, 23 Jun 2010) New Revision: 22962 Modified: trunk/parent-pom.xml Log: add orbit & freshly released replacements for milestones and interim sites Modified: trunk/parent-pom.xml =================================================================== --- trunk/parent-pom.xml 2010-06-23 16:55:53 UTC (rev 22961) +++ trunk/parent-pom.xml 2010-06-23 17:10:51 UTC (rev 22962) @@ -11,7 +11,8 @@ <tychoVersion>0.9.0-SNAPSHOT</tychoVersion> <scmBranch>trunk</scmBranch> <BUILD_ALIAS>M1</BUILD_ALIAS> - <memoryOptions>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m</memoryOptions> + <memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1> + <memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2> <systemProperties></systemProperties> <target.platform>e36-wtp32</target.platform> </properties> @@ -48,11 +49,8 @@ <ws>cocoa</ws> <arch>x86</arch> </environment> -  +  <environment> <os>win32</os> <ws>win32</ws> @@ -85,7 +83,7 @@ <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds> <useUIHarness>true</useUIHarness> <useUIThread>true</useUIThread> - <argLine>${memoryOptions} ${systemProperties}</argLine> + <argLine>${memoryOptions1} ${memoryOptions2} ${systemProperties}</argLine>    @@ -210,9 +208,8 @@ </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> <releases> <enabled>true</enabled> </releases> </repository> --> -  +  <repository> <id>galileo</id> <url>http://download.eclipse.org/releases/galileo/</url> @@ -257,10 +254,10 @@ <enabled>true</enabled> </releases> </repository> - </repositories> + </repositories> </profile> -  +  <profile> <id>helios-no-target</id> <repositories> @@ -287,8 +284,9 @@ </releases> </repository> <repository> - <id>eclipse36m</id> - <url>http://download.eclipse.org/eclipse/updates/3.6milestones/</url> + <id>eclipse36</id> + <url>http://download.eclipse.org/eclipse/updates/3.6/ + </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -297,9 +295,13 @@ <enabled>true</enabled> </releases> </repository> +  <repository> - <id>birt26i</id> - <url>http://download.eclipse.org/birt/update-site/2.6-interim/</url> + <id>birt26</id> + <url>http://download.eclipse.org/birt/update-site/2.6/ + </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -308,6 +310,9 @@ <enabled>true</enabled> </releases> </repository> +  <repository> <id>swtbot-helios</id> <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/ @@ -342,6 +347,24 @@ <enabled>true</enabled> </releases> </repository> + <repository> + <id>orbit</id> + <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u... + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> +  +  </repositories> </profile> @@ -481,7 +504,8 @@ </repository> <repository> <id>orbit</id> - <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u...</url> + <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u... + </url> <layout>p2</layout> <releases> <enabled>true</enabled>

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22961 - in branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd: jpdl and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2010-06-23 12:55:53 -0400 (Wed, 23 Jun 2010) New Revision: 22961 Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/DeployProcessAction.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/DeployProcessActionDelegate.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/PingServerAction.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/PingServerActionDelegate.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/SaveProcessArchiveAction.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/SaveProcessArchiveActionDelegate.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/ToggleGridActionDelegate.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ClassesAndResourcesContentProvider.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ProcessArchiveBuilder.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ProcessArchiveDeployer.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlDeploymenEditorPage.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/PreferencesConstants.java Removed: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/IncludeClassesTreeContentProvider.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/IncludeFilesTreeContentProvider.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/IncludeInDeploymentTreeViewer.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlDeploymentEditorPage.java Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/editor/ActionBarContributor.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/DeploymentForm.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/DeploymentInfo.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlContentProvider.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlEditor.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/Jbpm3PreferencesManager.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/ServerDeploymentPage.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/util/ProcessDeployer.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/ConfigureRuntimePage.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizard.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java Log: JBIDE-6521 JBIDE-5910 JBIDE-5911 JBIDE-5912 JBIDE-6104 JBIDE-6090 JBIDE-6394 JBIDE-6306 JBIDE-3611 Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/editor/ActionBarContributor.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/editor/ActionBarContributor.java 2010-06-23 16:42:50 UTC (rev 22960) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/editor/ActionBarContributor.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -22,15 +22,10 @@ package org.jbpm.gd.common.editor; import org.eclipse.gef.ui.actions.ActionRegistry; -import org.eclipse.gef.ui.actions.GEFActionConstants; import org.eclipse.jface.action.IAction; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.MenuManager; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.actions.ActionFactory; -import org.eclipse.ui.actions.RetargetAction; import org.eclipse.ui.ide.IDEActionFactory; import org.eclipse.ui.part.MultiPageEditorActionBarContributor; import org.eclipse.ui.texteditor.ITextEditorActionConstants; @@ -39,7 +34,7 @@ public class ActionBarContributor extends MultiPageEditorActionBarContributor { - ActionRegistry actionRegistry = new ActionRegistry(); +// ActionRegistry actionRegistry = new ActionRegistry(); private static final String[] WORKBENCH_ACTION_IDS = { ActionFactory.PRINT.getId(), @@ -75,8 +70,8 @@ hookGlobalGraphicalEditorActions((GraphPage)activeEditor, actionBars); } else if (activeEditor instanceof StructuredTextEditor) { hookGlobalXmlEditorActions((StructuredTextEditor)activeEditor, actionBars); - } else { - actionBars.setGlobalActionHandler( GEFActionConstants.TOGGLE_SNAP_TO_GEOMETRY, null); +// } else { +// actionBars.setGlobalActionHandler( GEFActionConstants.TOGGLE_SNAP_TO_GEOMETRY, null); } actionBars.updateActionBars(); } @@ -88,7 +83,7 @@ WORKBENCH_ACTION_IDS[i], part.getAction(TEXTEDITOR_ACTION_IDS[i])); } - actionBars.setGlobalActionHandler( GEFActionConstants.TOGGLE_GRID_VISIBILITY, null); +// actionBars.setGlobalActionHandler( GEFActionConstants.TOGGLE_GRID_VISIBILITY, null); } private void hookGlobalGraphicalEditorActions( @@ -100,38 +95,38 @@ WORKBENCH_ACTION_IDS[i], action); } - IAction action = registry.getAction(GEFActionConstants.TOGGLE_GRID_VISIBILITY); - actionBars.setGlobalActionHandler( GEFActionConstants.TOGGLE_GRID_VISIBILITY, action); +// IAction action = registry.getAction(GEFActionConstants.TOGGLE_GRID_VISIBILITY); +// actionBars.setGlobalActionHandler( GEFActionConstants.TOGGLE_GRID_VISIBILITY, action); } - protected void addRetargetAction(RetargetAction action) { - actionRegistry.registerAction(action); - getPage().addPartListener(action); - } +// protected void addRetargetAction(RetargetAction action) { +// actionRegistry.registerAction(action); +// getPage().addPartListener(action); +// } - public void init(IActionBars bars) { - buildActions(); - super.init(bars); - } +// public void init(IActionBars bars) { +// buildActions(); +// super.init(bars); +// } - public void dispose() { - RetargetAction action = (RetargetAction)actionRegistry.getAction(GEFActionConstants.TOGGLE_GRID_VISIBILITY); - getPage().removePartListener(action); - action.dispose(); - actionRegistry.dispose(); - super.dispose(); - } +// public void dispose() { +// RetargetAction action = (RetargetAction)actionRegistry.getAction(GEFActionConstants.TOGGLE_GRID_VISIBILITY); +// getPage().removePartListener(action); +// action.dispose(); +// actionRegistry.dispose(); +// super.dispose(); +// } - protected void buildActions() { - addRetargetAction(new RetargetAction(GEFActionConstants.TOGGLE_GRID_VISIBILITY, - "Show Grid", IAction.AS_CHECK_BOX)); - } +// protected void buildActions() { +// addRetargetAction(new RetargetAction(GEFActionConstants.TOGGLE_GRID_VISIBILITY, +// "Show Grid", IAction.AS_CHECK_BOX)); +// } - public void contributeToMenu(IMenuManager menubar) { - super.contributeToMenu(menubar); - MenuManager viewMenu = new MenuManager("View"); - viewMenu.add(actionRegistry.getAction(GEFActionConstants.TOGGLE_GRID_VISIBILITY)); - menubar.insertAfter(IWorkbenchActionConstants.M_EDIT, viewMenu); - } +// public void contributeToMenu(IMenuManager menubar) { +// super.contributeToMenu(menubar); +// MenuManager viewMenu = new MenuManager("View"); +// viewMenu.add(actionRegistry.getAction(GEFActionConstants.TOGGLE_GRID_VISIBILITY)); +// menubar.insertAfter(IWorkbenchActionConstants.M_EDIT, viewMenu); +// } } Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/DeployProcessAction.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/DeployProcessAction.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/DeployProcessAction.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -0,0 +1,39 @@ +package org.jbpm.gd.jpdl.action; + +import org.eclipse.jface.action.Action; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.swt.SWT; +import org.jbpm.gd.jpdl.deployment.ProcessArchiveBuilder; +import org.jbpm.gd.jpdl.deployment.ProcessArchiveDeployer; +import org.jbpm.gd.jpdl.editor.JpdlEditor; + +public class DeployProcessAction extends Action { + + private JpdlEditor jpdlEditor; + + public DeployProcessAction(JpdlEditor jpdlEditor) { + this.jpdlEditor = jpdlEditor; + } + + public void run() { + byte[] processArchive = new ProcessArchiveBuilder(jpdlEditor).build(); + if (processArchive == null) return; + boolean success = new ProcessArchiveDeployer(jpdlEditor).deploy(processArchive); + if (success) { + showSuccessDialog(); + } + } + + private void showSuccessDialog() { + MessageDialog dialog = new MessageDialog( + jpdlEditor.getSite().getShell(), + "Deployment Successful", + null, + "The process archive deployed successfully.", + SWT.ICON_INFORMATION, + new String[] { "OK" }, + 0); + dialog.open(); + } + +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/DeployProcessAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/DeployProcessActionDelegate.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/DeployProcessActionDelegate.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/DeployProcessActionDelegate.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -0,0 +1,28 @@ +package org.jbpm.gd.jpdl.action; + +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ui.IEditorActionDelegate; +import org.eclipse.ui.IEditorPart; +import org.jbpm.gd.jpdl.editor.JpdlEditor; + +public class DeployProcessActionDelegate implements IEditorActionDelegate { + + private JpdlEditor jpdlEditor; + + public void setActiveEditor(IAction action, IEditorPart editorPart) { + if (editorPart != null && editorPart instanceof JpdlEditor) { + jpdlEditor = (JpdlEditor)editorPart; + } + } + + public void run(IAction action) { + if (jpdlEditor != null) { + new DeployProcessAction(jpdlEditor).run(); + } + } + + public void selectionChanged(IAction action, ISelection selection) { + } + +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/DeployProcessActionDelegate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/PingServerAction.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/PingServerAction.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/PingServerAction.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -0,0 +1,36 @@ +package org.jbpm.gd.jpdl.action; + +import org.eclipse.jface.action.Action; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.swt.SWT; +import org.jbpm.gd.jpdl.deployment.ProcessArchiveDeployer; +import org.jbpm.gd.jpdl.editor.JpdlEditor; + +public class PingServerAction extends Action { + + private JpdlEditor jpdlEditor; + + public PingServerAction(JpdlEditor jpdlEditor) { + this.jpdlEditor = jpdlEditor; + } + + public void run() { + boolean success = new ProcessArchiveDeployer(jpdlEditor).pingServer(); + if (success) { + showSuccessDialog(); + } + } + + private void showSuccessDialog() { + MessageDialog dialog = new MessageDialog( + jpdlEditor.getSite().getShell(), + "Ping Server Successful", + null, + "The server could be reached successfully.", + SWT.ICON_INFORMATION, + new String[] { "OK" }, + 0); + dialog.open(); + } + +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/PingServerAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/PingServerActionDelegate.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/PingServerActionDelegate.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/PingServerActionDelegate.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -0,0 +1,28 @@ +package org.jbpm.gd.jpdl.action; + +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ui.IEditorActionDelegate; +import org.eclipse.ui.IEditorPart; +import org.jbpm.gd.jpdl.editor.JpdlEditor; + +public class PingServerActionDelegate implements IEditorActionDelegate { + + private JpdlEditor jpdlEditor; + + public void setActiveEditor(IAction action, IEditorPart editorPart) { + if (editorPart != null && editorPart instanceof JpdlEditor) { + jpdlEditor = (JpdlEditor)editorPart; + } + } + + public void run(IAction action) { + if (jpdlEditor != null) { + new PingServerAction(jpdlEditor).run(); + } + } + + public void selectionChanged(IAction action, ISelection selection) { + } + +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/PingServerActionDelegate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/SaveProcessArchiveAction.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/SaveProcessArchiveAction.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/SaveProcessArchiveAction.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -0,0 +1,70 @@ +package org.jbpm.gd.jpdl.action; + +import java.io.ByteArrayInputStream; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.swt.SWT; +import org.eclipse.ui.dialogs.SaveAsDialog; +import org.jbpm.gd.jpdl.deployment.ProcessArchiveBuilder; +import org.jbpm.gd.jpdl.editor.JpdlEditor; + +public class SaveProcessArchiveAction extends Action { + + private JpdlEditor jpdlEditor; + + public SaveProcessArchiveAction(JpdlEditor jpdlEditor) { + this.jpdlEditor = jpdlEditor; + } + + public void run() { + try { + byte[] processArchive = new ProcessArchiveBuilder(jpdlEditor).build(); + if (processArchive == null) return; + SaveAsDialog saveAsDialog = new SaveAsDialog(jpdlEditor.getSite().getShell()); + saveAsDialog.open(); + IPath path = saveAsDialog.getResult(); + IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path); + if (!file.exists()) { + file.create(new ByteArrayInputStream(new byte[0]), IResource.NONE, null); + } else { + if (!askIfOverwriteAllowed()) { + return; + } + } + file.setContents(new ByteArrayInputStream(processArchive), IResource.NONE, null); + } catch (CoreException e) { + showSaveProcessArchiveException(); + } + } + + private void showSaveProcessArchiveException() { + MessageDialog dialog = new MessageDialog( + jpdlEditor.getSite().getShell(), + "Save Process Archive Failed", + null, + "The process archive could not be saved.", + SWT.ICON_ERROR, + new String[] { "OK" }, + 0); + dialog.open(); + } + + private boolean askIfOverwriteAllowed() { + MessageDialog dialog = new MessageDialog( + jpdlEditor.getSite().getShell(), + "Overwrite Existing File?", + null, + "The chosen file exists. Is it OK to overwrite the contents?", + SWT.ICON_QUESTION, + new String[] { "Yes", "No" }, + 0); + return (dialog.open() == 0); + } + +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/SaveProcessArchiveAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/SaveProcessArchiveActionDelegate.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/SaveProcessArchiveActionDelegate.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/SaveProcessArchiveActionDelegate.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -0,0 +1,28 @@ +package org.jbpm.gd.jpdl.action; + +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ui.IEditorActionDelegate; +import org.eclipse.ui.IEditorPart; +import org.jbpm.gd.jpdl.editor.JpdlEditor; + +public class SaveProcessArchiveActionDelegate implements IEditorActionDelegate { + + private JpdlEditor jpdlEditor; + + public void setActiveEditor(IAction action, IEditorPart editorPart) { + if (editorPart != null && editorPart instanceof JpdlEditor) { + jpdlEditor = (JpdlEditor)editorPart; + } + } + + public void run(IAction action) { + if (jpdlEditor != null) { + new SaveProcessArchiveAction(jpdlEditor).run(); + } + } + + public void selectionChanged(IAction action, ISelection selection) { + } + +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/SaveProcessArchiveActionDelegate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/ToggleGridActionDelegate.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/ToggleGridActionDelegate.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/ToggleGridActionDelegate.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -0,0 +1,31 @@ +package org.jbpm.gd.jpdl.action; + +import org.eclipse.gef.GraphicalViewer; +import org.eclipse.gef.ui.actions.ToggleGridAction; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ui.IEditorActionDelegate; +import org.eclipse.ui.IEditorPart; +import org.jbpm.gd.jpdl.editor.JpdlEditor; + +public class ToggleGridActionDelegate implements IEditorActionDelegate { + + private GraphicalViewer graphicalViewer; + + public void setActiveEditor(IAction action, IEditorPart editorPart) { + if (editorPart != null && editorPart instanceof JpdlEditor) { + graphicalViewer = ((JpdlEditor)editorPart).getGraphicalViewer(); + } + } + + public void run(IAction action) { + if (graphicalViewer != null) { + ToggleGridAction toggleGridAction = new ToggleGridAction(graphicalViewer); + toggleGridAction.run(); + } + } + + public void selectionChanged(IAction action, ISelection selection) { + } + +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/ToggleGridActionDelegate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ClassesAndResourcesContentProvider.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ClassesAndResourcesContentProvider.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ClassesAndResourcesContentProvider.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -0,0 +1,45 @@ +package org.jbpm.gd.jpdl.deployment; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IPackageFragment; +import org.eclipse.jdt.core.IPackageFragmentRoot; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.ui.StandardJavaElementContentProvider; + +public class ClassesAndResourcesContentProvider extends + StandardJavaElementContentProvider { + + protected Object[] getPackageFragmentRoots(IJavaProject project) throws JavaModelException { + Object[] roots = super.getPackageFragmentRoots(project); + List<Object> list = new ArrayList<Object>(); + for (int i = 0; i < roots.length; i++) { + if (roots[i] instanceof IPackageFragmentRoot) { + IPackageFragmentRoot root = (IPackageFragmentRoot)roots[i]; + if (root.hasChildren()) { + list.add(root); + } + } + } + return list.toArray(); + } + + protected Object[] getPackageFragmentRootContent(IPackageFragmentRoot root) throws JavaModelException { + Object[] fragments = super.getPackageFragmentRootContent(root); + List<Object> list = new ArrayList<Object>(); + for (int i = 0; i < fragments.length; i++) { + if (fragments[i] instanceof IPackageFragment) { + IPackageFragment fragment = (IPackageFragment)fragments[i]; + if (fragment.hasChildren()) { + list.add(fragment); + } + } else { + list.add(fragments[i]); + } + } + return list.toArray(); + } + +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ClassesAndResourcesContentProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/DeploymentForm.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/DeploymentForm.java 2010-06-23 16:42:50 UTC (rev 22960) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/DeploymentForm.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -21,33 +21,19 @@ */ package org.jbpm.gd.jpdl.deployment; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jdt.core.IClassFile; import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IPackageFragment; -import org.eclipse.jdt.core.IPackageFragmentRoot; -import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.viewers.CheckStateChangedEvent; -import org.eclipse.jface.viewers.ICheckStateListener; +import org.eclipse.jdt.ui.JavaElementLabelProvider; +import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.KeyAdapter; -import org.eclipse.swt.events.KeyEvent; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -55,73 +41,71 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.FileDialog; -import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Table; +import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.Tree; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.forms.FormColors; -import org.eclipse.ui.forms.widgets.Form; +import org.eclipse.ui.dialogs.ElementTreeSelectionDialog; +import org.eclipse.ui.dialogs.ISelectionStatusValidator; +import org.eclipse.ui.forms.IFormColors; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.eclipse.ui.forms.widgets.ScrolledForm; import org.eclipse.ui.forms.widgets.Section; +import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.jbpm.gd.jpdl.Logger; import org.jbpm.gd.jpdl.Plugin; import org.jbpm.gd.jpdl.editor.JpdlEditor; -import org.jbpm.gd.jpdl.util.JavaClassNameCollector; -import org.jbpm.gd.jpdl.util.ProcessDeployer; public class DeploymentForm { - - public static final int NONE = 0; - public static final int EXPRESSION = 1; - public static final int HANDLER = 2; + private static ILabelProvider LABELPROVIDER = new WorkbenchLabelProvider(); + private FormToolkit toolkit; private Composite composite; - private IFolder processFolder; private JpdlEditor editor; private DeploymentInfo deploymentInfo; - private Form form; - private Text nameText; - private Text portText; - private Text deployerText; - private Text locationText; - private Text usernameText; - private Text passwordText; - private Button deployButton; - private Button saveButton; - private Button locationButton; - private Button testConnectionButton; - private Button saveLocallyButton; + private ScrolledForm form; + + private Button includeProcessInfoFileButton; + private Text processInfoFileText; + private Button includeGraphicalInfoFileButton; + private Text graphicalInfoFileText; + private Button browseGraphicalInfoFileButton; + private Button includeImageFileButton; + private Text imageFileText; + private Button browseImageFileButton; + private Button additionalFilesAddButton; + private Button additionalFilesRemoveButton; + private Table additionalFilesList; + private Button classesAndResourcesAddButton; + private Button classesAndResourcesRemoveButton; + private Table classesAndResourcesList; + private Text serverNameText; + private Text serverPortText; + private Text serverDeployerText; private Button useCredentialsButton; + private Text userNameText; + private Text passwordText; - private IncludeInDeploymentTreeViewer includeFilesTreeViewer; - private IncludeInDeploymentTreeViewer includeClassesTreeViewer; - - public DeploymentForm(FormToolkit toolkit, Composite composite, IFolder processFolder, JpdlEditor editor) { + public DeploymentForm(FormToolkit toolkit, Composite composite, JpdlEditor editor) { this.toolkit = toolkit; this.composite = composite; - this.processFolder = processFolder; this.editor = editor; + deploymentInfo = editor.getDeploymentInfo(); } public void create() { createMainForm(); - createIncludeFilesSection(); - createIncludeClassesSection(); - createLocalSaveSection(); + createMainFilesSection(); + createAdditionalFilesSection(); + createClassesAndResourcesSection(); + createUserCredentialsSection(); createServerInfoSection(); - toolkit.createForm(form.getBody()); // Create an empty grid cell - createDeployButton(); } private void createMainForm() { - form = toolkit.createForm(composite); + form = toolkit.createScrolledForm(composite); GridData layoutData = new GridData(GridData.FILL_BOTH); form.setLayoutData(layoutData); GridLayout layout = new GridLayout(); @@ -130,631 +114,546 @@ form.getBody().setLayout(layout); form.getBody().setLayoutData(new GridData(GridData.FILL_BOTH)); } - - private void createDeployButton() { - deployButton = toolkit.createButton(form.getBody(), "Deploy Process Archive...", SWT.PUSH); - deployButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END)); - deployButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - if (cancelOrSaveAndContinue()) { - createProcessDeployer().deploy(); - } - } - }); - } - private IPreferenceStore getPreferenceStore() { - return Plugin.getDefault().getPreferenceStore(); - } - - public DeploymentInfo getDeploymentInfo() { - if (deploymentInfo == null) { - deploymentInfo = new DeploymentInfo(); - String serverName = getPreferenceStore().getString("server name"); - deploymentInfo.setServerName(serverName == null ? "localhost" : serverName); - String serverPort = getPreferenceStore().getString("server port"); - deploymentInfo.setServerPort(serverPort == null ? "8080" : serverPort); - String serverDeployer = getPreferenceStore().getString("server deployer"); - deploymentInfo.setServerDeployer(serverDeployer == null ? "/jbpm-console/upload" : serverDeployer); - final IJavaProject project = JavaCore.create(processFolder.getProject()); - deploymentInfo.setClassesAndResources(new ArrayList(getElementsToCheckFor(project)).toArray()); - deploymentInfo.setFilesAndFolders(getElementsToCheckFor(processFolder).toArray()); - } - return deploymentInfo; - } - - public void setDeploymentInfo(DeploymentInfo deploymentInfo) { - this.deploymentInfo = deploymentInfo; - refresh(); - } - - private ProcessDeployer createProcessDeployer() { - ProcessDeployer result = new ProcessDeployer(); - String location = null; - if (saveButton.isEnabled()) { - location = locationText.getText(); - } - result.setTargetLocation(location); - result.setServerName(nameText.getText()); - result.setServerPort(portText.getText()); - result.setServerDeployer(deployerText.getText()); - result.setUseCredentials(useCredentialsButton.getSelection()); - if (useCredentialsButton.getSelection()) { - result.setUsername(usernameText.getText() == null ? "" : usernameText.getText()); - result.setPassword(passwordText.getText() == null ? "" : passwordText.getText()); - } - result.setShell(form.getShell()); - result.setProcessFolder(processFolder); - result.setFilesAndFolders(getIncludedFiles()); - result.setClassesAndResources(getClassesAndResources()); - return result; - } - - private ArrayList getIncludedFiles() { - ArrayList result = new ArrayList(); - Object[] objects = includeFilesTreeViewer.getCheckedElements(); - for (int i = 0; i < objects.length; i++) { - result.add(objects[i]); - } - return result; - } - - private ArrayList getClassesAndResources() { - ArrayList result = new ArrayList(); - Object[] objects = includeClassesTreeViewer.getCheckedElements(); - for (int i = 0; i < objects.length; i++) { - if (objects[i] instanceof ICompilationUnit) { - String string = getResourceName(((ICompilationUnit)objects[i]).getResource()); - result.add(string.substring(0, string.lastIndexOf(".java")) + ".class"); - } else if (objects[i] instanceof IFile) { - result.add(getResourceName((IFile)objects[i])); - } - } - return result; - } - - private String getResourceName(IResource resource) { - IPackageFragmentRoot root = getPackageFragmentRoot(resource); - if (root == null) { - return null; - } else { - int index = root.getResource().getProjectRelativePath().toString().length() + 1; - return resource.getProjectRelativePath().toString().substring(index); - } - } - - private IPackageFragmentRoot getPackageFragmentRoot(IResource resource) { - IPackageFragmentRoot root = null; - IResource r = resource; - while (r != null) { - IJavaElement javaElement = JavaCore.create(r); - if (javaElement != null && javaElement instanceof IPackageFragmentRoot) { - root = (IPackageFragmentRoot)javaElement; - break; - } - r = r.getParent(); - } - return root; - } - - private Composite createServerInfoFormClient() { - Section serverInfoDetails = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.DESCRIPTION); - serverInfoDetails.marginWidth = 5; - serverInfoDetails.setText("Deployment Server Settings"); + private void createMainFilesSection() { + Section mainFilesSection = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.DESCRIPTION); + mainFilesSection.marginWidth = 5; + mainFilesSection.setText("Main Process Files"); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.verticalAlignment = GridData.BEGINNING; - serverInfoDetails.setLayoutData(gridData); + gridData.horizontalSpan = 2; + mainFilesSection.setLayoutData(gridData); - Composite infoFormClient = toolkit.createComposite(serverInfoDetails); - serverInfoDetails.setClient(infoFormClient); - serverInfoDetails.setDescription("Specify the settings of the server you wish to deploy to."); - toolkit.paintBordersFor(infoFormClient); + Composite mainFilesClient = toolkit.createComposite(mainFilesSection); + mainFilesSection.setClient(mainFilesClient); + mainFilesSection.setDescription("Check and select the files to be included in the deployment."); + toolkit.paintBordersFor(mainFilesClient); GridLayout layout = new GridLayout(); layout.marginWidth = 2; layout.marginHeight = 2; layout.numColumns = 3; - infoFormClient.setLayout(layout); - return infoFormClient; + mainFilesClient.setLayout(layout); + createProcessInfoFileField(mainFilesClient); + createGraphicalInfoFileField(mainFilesClient); + createImageFileField(mainFilesClient); } - private void createServerInfoSection() { - Composite serverInfoFormClient = createServerInfoFormClient(); - createServerNameField(serverInfoFormClient); - createServerPortField(serverInfoFormClient); - createServerDeployerField(serverInfoFormClient); - createUseCredentialsButton(serverInfoFormClient); - createUseCredentialsGroup(serverInfoFormClient); - createTestConnectionButton(serverInfoFormClient); + private void createProcessInfoFileField(Composite parent) { + includeProcessInfoFileButton = toolkit.createButton(parent, "Process Info File:", SWT.CHECK); + includeProcessInfoFileButton.setSelection(true); + includeProcessInfoFileButton.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); + processInfoFileText = toolkit.createText(parent, ""); + processInfoFileText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + processInfoFileText.setEditable(false); + toolkit.createLabel(parent, ""); } - - private void createLocalSaveSection() { - Composite localSaveFormClient = createLocalSaveFormClient(); - createSaveLocallyCheckBox(localSaveFormClient); - createSaveLocationField(localSaveFormClient); - createSaveButton(localSaveFormClient); + + private void createGraphicalInfoFileField(Composite parent) { + includeGraphicalInfoFileButton = toolkit.createButton(parent, "Graphical Info File:", SWT.CHECK); + includeGraphicalInfoFileButton.setSelection(true); + includeGraphicalInfoFileButton.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); + graphicalInfoFileText = toolkit.createText(parent, ""); + graphicalInfoFileText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + graphicalInfoFileText.setEditable(false); + browseGraphicalInfoFileButton = toolkit.createButton(parent, "Browse...", SWT.NONE); } - private void createServerNameField(Composite infoFormClient) { - Label nameLabel = toolkit.createLabel(infoFormClient, "Server Name:"); - nameLabel.setForeground(toolkit.getColors().getColor(FormColors.TITLE)); - nameText = toolkit.createText(infoFormClient, ""); - String nameString = getDeploymentInfo().getServerName(); - nameText.setText(nameString == null ? "localhost" : nameString); - GridData gridData = new GridData(GridData.FILL_HORIZONTAL); - gridData.horizontalSpan = 2; - nameText.setLayoutData(gridData); - nameText.addKeyListener(new KeyAdapter() { - public void keyReleased(KeyEvent e) { - updateTestConnectionAndDeployButtons(); - getDeploymentInfo().setServerName(nameText.getText()); - editor.setDirty(true); - } - }); + private void createImageFileField(Composite parent) { + includeImageFileButton = toolkit.createButton(parent, "Image File:", SWT.CHECK); + includeImageFileButton.setSelection(true); + includeImageFileButton.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); + imageFileText = toolkit.createText(parent, ""); + imageFileText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + imageFileText.setEditable(false); + browseImageFileButton = toolkit.createButton(parent, "Browse...", SWT.NONE); } - private void createServerPortField(Composite infoFormClient) { - Label portLabel = toolkit.createLabel(infoFormClient, "Server Port:"); - portLabel.setForeground(toolkit.getColors().getColor(FormColors.TITLE)); - portText = toolkit.createText(infoFormClient, ""); - String portString = getDeploymentInfo().getServerPort(); - portText.setText(portString == null ? "8080" : portString); + private void createAdditionalFilesSection() { + Section additionalFilesSection = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.DESCRIPTION); + additionalFilesSection.marginWidth = 5; + additionalFilesSection.setText("Additional Files"); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); - gridData.horizontalSpan = 2; - portText.setLayoutData(gridData); - portText.addKeyListener(new KeyAdapter() { - public void keyReleased(KeyEvent e) { - updateTestConnectionAndDeployButtons(); - getDeploymentInfo().setServerPort(portText.getText()); - editor.setDirty(true); - } - }); +// gridData.verticalAlignment = GridData.BEGINNING; + additionalFilesSection.setLayoutData(gridData); + + Composite additionalFilesClient = toolkit.createComposite(additionalFilesSection); + additionalFilesSection.setClient(additionalFilesClient); + additionalFilesSection.setDescription("Add additional files such as forms that need to be included in the deployment."); + toolkit.paintBordersFor(additionalFilesClient); + + GridLayout layout = new GridLayout(); + layout.numColumns = 2; + additionalFilesClient.setLayout(layout); + createAdditionalFilesList(additionalFilesClient); + createAdditionalFilesButtons(additionalFilesClient); } - private void createServerDeployerField(Composite infoFormClient) { - Label deployerLabel = toolkit.createLabel(infoFormClient, "Server Deployer:"); - deployerLabel.setForeground(toolkit.getColors().getColor(FormColors.TITLE)); - deployerText = toolkit.createText(infoFormClient, ""); - String deployerString = deploymentInfo.getServerDeployer(); - deployerText.setText(deployerString == null ? "/jbpm-console/upload" : deployerString); - GridData gridData = new GridData(GridData.FILL_HORIZONTAL); - gridData.horizontalSpan = 2; - deployerText.setLayoutData(gridData); - deployerText.addKeyListener(new KeyAdapter() { - public void keyReleased(KeyEvent e) { - updateTestConnectionAndDeployButtons(); - getDeploymentInfo().setServerDeployer(deployerText.getText()); - editor.setDirty(true); - } - }); + private void createAdditionalFilesList(Composite parent) { + additionalFilesList = toolkit.createTable(parent, SWT.SINGLE | SWT.V_SCROLL | SWT.H_SCROLL); + GridData gridData = new GridData(GridData.FILL_BOTH); + gridData.heightHint = 70; + gridData.widthHint = 100; + additionalFilesList.setLayoutData(gridData); } - private void createUserNameField(Composite composite) { - Label usernameLabel = toolkit.createLabel(composite, "Username:"); - usernameLabel.setForeground(toolkit.getColors().getColor(FormColors.TITLE)); - usernameText = toolkit.createText(composite, "", SWT.BORDER); - String usernameString = Plugin.getDefault().getPreferenceStore().getString("user name"); - usernameText.setText(usernameString == null ? "" : usernameString); - usernameText.setEnabled(useCredentialsButton.getSelection()); - usernameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + private void createAdditionalFilesButtons(Composite parent) { + Composite composite = toolkit.createComposite(parent); + composite.setLayoutData(new GridData(GridData.FILL_VERTICAL)); + GridLayout gridLayout = new GridLayout(); + gridLayout.numColumns = 1; + composite.setLayout(gridLayout); + additionalFilesAddButton = toolkit.createButton(composite, "Add...", SWT.NONE); + additionalFilesAddButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + additionalFilesRemoveButton = toolkit.createButton(composite, "Remove", SWT.NONE); + additionalFilesRemoveButton.setEnabled(false); } - private void createPasswordField(Composite composite) { - Label passwordLabel = toolkit.createLabel(composite, "Password:"); - passwordLabel.setForeground(toolkit.getColors().getColor(FormColors.TITLE)); - passwordText = toolkit.createText(composite, "", SWT.PASSWORD | SWT.BORDER); - String passwordString = Plugin.getDefault().getPreferenceStore().getString("password"); - passwordText.setText(passwordString == null ? "" : passwordString); - passwordText.setEnabled(useCredentialsButton.getSelection()); - passwordText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - } - - private void createUseCredentialsButton(Composite infoFormClient) { - useCredentialsButton = toolkit.createButton(infoFormClient, "Use credentials", SWT.CHECK); - useCredentialsButton.setForeground(toolkit.getColors().getColor(FormColors.TITLE)); - useCredentialsButton.setSelection(Plugin.getDefault().getPreferenceStore().getBoolean("use credentials")); - GridData gridData = new GridData(); - gridData.horizontalSpan = 3; - useCredentialsButton.setLayoutData(gridData); - useCredentialsButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - usernameText.setEnabled(useCredentialsButton.getSelection()); - passwordText.setEnabled(useCredentialsButton.getSelection()); - } - }); - } - - private void createUseCredentialsGroup(Composite infoFormClient) { - Composite useCredentialsGroup = toolkit.createComposite(infoFormClient, SWT.BORDER); + private void createClassesAndResourcesSection() { + Section classesAndResourcesSection = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.DESCRIPTION); + classesAndResourcesSection.marginWidth = 5; + classesAndResourcesSection.setText("Classes and Resources"); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); - gridData.horizontalSpan = 3; - useCredentialsGroup.setLayoutData(gridData); - useCredentialsGroup.setLayout(new GridLayout(2, false)); - createUserNameField(useCredentialsGroup); - createPasswordField(useCredentialsGroup); - } - - private void createTestConnectionButton(Composite infoFormClient) { - testConnectionButton = toolkit.createButton(infoFormClient, "Test Connection...", SWT.PUSH); - testConnectionButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - createProcessDeployer().pingServer(); - } - }); - } - - private Composite createIncludeFilesSection() { - Section includeFilesDetails = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.DESCRIPTION); - includeFilesDetails.marginWidth = 5; - includeFilesDetails.setText("Files and Folders"); - includeFilesDetails.setLayoutData(new GridData(GridData.FILL_BOTH)); + classesAndResourcesSection.setLayoutData(gridData); - Composite includeFilesFormClient = toolkit.createComposite(includeFilesDetails); - includeFilesDetails.setClient(includeFilesFormClient); - includeFilesDetails.setDescription("Select the files and folders to include in the process archive."); - toolkit.paintBordersFor(includeFilesFormClient); + Composite classesAndResourcesClient = toolkit.createComposite(classesAndResourcesSection); + classesAndResourcesSection.setClient(classesAndResourcesClient); + classesAndResourcesSection.setDescription("Add classes and/or resources that need to be included in the deployment."); + toolkit.paintBordersFor(classesAndResourcesClient); GridLayout layout = new GridLayout(); - layout.marginWidth = 2; - layout.marginHeight = 2; - layout.numColumns = 1; - includeFilesFormClient.setLayout(layout); + layout.numColumns = 2; + classesAndResourcesClient.setLayout(layout); + createClassesAndResourcesList(classesAndResourcesClient); + createClassesAndResourcesButtons(classesAndResourcesClient); + } - Tree tree = toolkit.createTree(includeFilesFormClient, SWT.CHECK); - tree.setLayoutData(new GridData(GridData.FILL_BOTH)); - - includeFilesTreeViewer = new IncludeInDeploymentTreeViewer(tree); - includeFilesTreeViewer.setContentProvider(new IncludeFilesTreeContentProvider()); - includeFilesTreeViewer.setLabelProvider(new WorkbenchLabelProvider()); - includeFilesTreeViewer.setInput(processFolder); - tree.getDisplay().asyncExec(new Runnable() { - public void run() { - includeFilesTreeViewer.setCheckedElements(getDeploymentInfo().getFilesAndFolders()); - } - }); - includeFilesTreeViewer.addCheckStateListener(new ICheckStateListener() { - public void checkStateChanged(CheckStateChangedEvent event) { - getDeploymentInfo().setFilesAndFolders(includeFilesTreeViewer.getCheckedElements()); - editor.setDirty(true); - } - }); - - final Button includeFilesDefaultButton = toolkit.createButton(includeFilesFormClient, "Reset Defaults", SWT.PUSH); - includeFilesDefaultButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END)); - includeFilesDefaultButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - includeFilesDefaultButton.getDisplay().asyncExec(new Runnable() { - public void run() { - includeFilesTreeViewer.setCheckedElements(getDeploymentInfo().getFilesAndFolders()); - } - }); - } - }); - - - return includeFilesFormClient; + private void createClassesAndResourcesList(Composite parent) { + classesAndResourcesList = toolkit.createTable(parent, SWT.SINGLE | SWT.V_SCROLL | SWT.H_SCROLL); + GridData gridData = new GridData(GridData.FILL_BOTH | GridData.GRAB_VERTICAL); + gridData.heightHint = 70; + gridData.widthHint = 100; + classesAndResourcesList.setLayoutData(gridData); } - private ArrayList getElementsToCheckFor(IFolder folder) { - ArrayList list = new ArrayList(); - try { - IResource[] members = folder.members(); - for (int i = 0; i < members.length; i++) { - list.add(members[i]); - if (members[i] instanceof IFolder) { - list.addAll(getElementsToCheckFor((IFolder)members[i])); - } - } - } catch(CoreException e) { - Logger.logError(e); - } - return list; + private void createClassesAndResourcesButtons(Composite parent) { + Composite composite = toolkit.createComposite(parent); + composite.setLayoutData(new GridData(GridData.FILL_VERTICAL)); + GridLayout gridLayout = new GridLayout(); + gridLayout.numColumns = 1; + composite.setLayout(gridLayout); + + classesAndResourcesAddButton = toolkit.createButton(composite, "Add", SWT.NONE); + classesAndResourcesAddButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + classesAndResourcesRemoveButton = toolkit.createButton(composite, "Remove", SWT.NONE); + classesAndResourcesRemoveButton.setEnabled(false); } - private Set getElementsToCheckFor(IJavaProject project) { - Set result = new HashSet(); - try { - if (project != null) { - Set javaClassNames = JavaClassNameCollector.getJavaClassNames(editor.getProcessDefinition()); - Iterator iterator = javaClassNames.iterator(); - while (iterator.hasNext()) { - IType type = project.findType((String)iterator.next()); - if (type != null) { - result.add(type.getCompilationUnit()); - } - } - } - } - catch (JavaModelException e) { - Logger.logError(e); - } - return result; - } - - private Composite createIncludeClassesSection() { - Section includeClassesDetails = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.DESCRIPTION); - includeClassesDetails.marginWidth = 5; - includeClassesDetails.setText("Java Classes and Resources"); - includeClassesDetails.setLayoutData(new GridData(GridData.FILL_BOTH)); + private void createUserCredentialsSection() { + Section userCredentialsSection = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.DESCRIPTION); + userCredentialsSection.marginWidth = 5; + userCredentialsSection.setText("User Credentials"); + + GridData gridData = new GridData(GridData.FILL_HORIZONTAL); + userCredentialsSection.setLayoutData(gridData); - Composite includeClassesFormClient = toolkit.createComposite(includeClassesDetails); - includeClassesDetails.setClient(includeClassesFormClient); - includeClassesDetails.setDescription("Select the Java classes and resources to include in the process archive."); - toolkit.paintBordersFor(includeClassesFormClient); + Composite userCredentialsClient = toolkit.createComposite(userCredentialsSection); + userCredentialsSection.setClient(userCredentialsClient); + userCredentialsSection.setDescription("Specify the user credentials for the chosen server."); + toolkit.paintBordersFor(userCredentialsClient); GridLayout layout = new GridLayout(); - layout.marginWidth = 2; - layout.marginHeight = 2; - layout.numColumns = 1; - includeClassesFormClient.setLayout(layout); - - Tree tree = toolkit.createTree(includeClassesFormClient, SWT.CHECK); - tree.setLayoutData(new GridData(GridData.FILL_BOTH)); + layout.numColumns = 2; + userCredentialsClient.setLayout(layout); - includeClassesTreeViewer = new IncludeInDeploymentTreeViewer(tree); - includeClassesTreeViewer.setContentProvider(new IncludeClassesTreeContentProvider()); - includeClassesTreeViewer.setLabelProvider(new WorkbenchLabelProvider()); - final IJavaProject project = JavaCore.create(processFolder.getProject()); - if (project != null) { - includeClassesTreeViewer.setInput(project); - } - composite.getDisplay().asyncExec(new Runnable() { - public void run() { - includeClassesTreeViewer.setCheckedElements(getDeploymentInfo().getClassesAndResources()); - } - }); - includeClassesTreeViewer.addCheckStateListener(new ICheckStateListener() { - public void checkStateChanged(CheckStateChangedEvent event) { - getDeploymentInfo().setClassesAndResources(includeClassesTreeViewer.getCheckedElements()); - editor.setDirty(true); - } - }); - - final Button includeClassesDefaultButton = toolkit.createButton(includeClassesFormClient, "Reset Defaults", SWT.PUSH); - includeClassesDefaultButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END)); - includeClassesDefaultButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - composite.getDisplay().asyncExec(new Runnable() { - public void run() { - includeClassesTreeViewer.setCheckedElements(getDeploymentInfo().getClassesAndResources()); - } - }); - } - }); + useCredentialsButton = toolkit.createButton(userCredentialsClient, "Use credentials", SWT.CHECK); + useCredentialsButton.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); + GridData buttonData = new GridData(); + buttonData.horizontalSpan = 2; + useCredentialsButton.setLayoutData(buttonData); - return includeClassesFormClient; + Label userNameLabel = toolkit.createLabel(userCredentialsClient, "Username:"); + userNameLabel.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); + userNameText = toolkit.createText(userCredentialsClient, ""); + userNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + Label passwordLabel = toolkit.createLabel(userCredentialsClient, "Password:"); + passwordLabel.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); + passwordText = toolkit.createText(userCredentialsClient, "", SWT.PASSWORD); + passwordText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); } - private Composite createLocalSaveFormClient() { - Section httpInfoDetails = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.DESCRIPTION); - httpInfoDetails.marginWidth = 5; - httpInfoDetails.setText("Local Save Settings"); + private void createServerInfoSection() { + Section serverInfoSection = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.DESCRIPTION); + serverInfoSection.marginWidth = 5; + serverInfoSection.setText("Server Settings"); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); - gridData.verticalAlignment = GridData.BEGINNING; - httpInfoDetails.setLayoutData(gridData); + serverInfoSection.setLayoutData(gridData); - Composite detailClient = toolkit.createComposite(httpInfoDetails); - httpInfoDetails.setClient(detailClient); - httpInfoDetails.setDescription("Choose if and where you wish to save the process archive locally."); - toolkit.paintBordersFor(detailClient); + Composite serverInfoClient = toolkit.createComposite(serverInfoSection); + serverInfoSection.setClient(serverInfoClient); + serverInfoSection.setDescription("Specify the settings of the server you wish to deploy to."); + toolkit.paintBordersFor(serverInfoClient); GridLayout layout = new GridLayout(); - layout.marginWidth = 2; - layout.marginHeight = 2; - layout.numColumns = 3; - detailClient.setLayout(layout); - return detailClient; + layout.numColumns = 2; + serverInfoClient.setLayout(layout); + + Label serverNameLabel = toolkit.createLabel(serverInfoClient, "Server Name:"); + serverNameLabel.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); + serverNameText = toolkit.createText(serverInfoClient, ""); + serverNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + Label serverPortLabel = toolkit.createLabel(serverInfoClient, "Server Port:"); + serverPortLabel.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); + serverPortText = toolkit.createText(serverInfoClient, ""); + serverPortText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + Label serverDeployerLabel = toolkit.createLabel(serverInfoClient, "Server Deployer:"); + serverDeployerLabel.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); + serverDeployerText = toolkit.createText(serverInfoClient, ""); + serverDeployerText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); } - - private void createSaveLocallyCheckBox(Composite localSaveFormclient) { - saveLocallyButton = toolkit.createButton(localSaveFormclient, "Save Process Archive Locally", SWT.CHECK); - GridData gridData = new GridData(GridData.FILL_HORIZONTAL); - gridData.horizontalSpan = 3; - saveLocallyButton.setLayoutData(gridData); - saveLocallyButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - boolean selection = ((Button)e.widget).getSelection(); - locationText.setEditable(selection); - locationButton.setEnabled(selection); - updateSaveAndDeployButtons(selection); - } - }); + + public void refresh() { + unhookListeners(); + updateControls(); + hookListeners(); + } + + private void unhookListeners() { + includeGraphicalInfoFileButton.removeSelectionListener(includeGraphicalInfoFileButtonSelectionListener); + browseGraphicalInfoFileButton.removeSelectionListener(browseGraphicalInfoFileButtonSelectionListener); + includeImageFileButton.removeSelectionListener(includeImageFileButtonSelectionListener); + browseImageFileButton.removeSelectionListener(browseImageFileButtonSelectionListener); + additionalFilesList.removeSelectionListener(additionalFilesListSelectionListener); + additionalFilesAddButton.removeSelectionListener(additionaFilesAddButtonSelectionListener); + additionalFilesRemoveButton.removeSelectionListener(additionaFilesRemoveButtonSelectionListener); + classesAndResourcesList.removeSelectionListener(classesAndResourcesListSelectionListener); + classesAndResourcesAddButton.removeSelectionListener(classesAndResourcesAddButtonSelectionListener); + classesAndResourcesRemoveButton.removeSelectionListener(classesAndResourcesRemoveButtonSelectionListener); + serverNameText.removeModifyListener(serverNameTextListener); + serverPortText.removeModifyListener(serverPortTextListener); + serverDeployerText.removeModifyListener(serverDeployerTextListener); } - private void updateSaveAndDeployButtons(boolean selection) { - if (!selection) { - deployButton.setEnabled(testConnectionButton.isEnabled()); - saveButton.setEnabled(false); - } else { - if (notEmpty(locationText)) { - saveButton.setEnabled(true); - deployButton.setEnabled(testConnectionButton.isEnabled()); - } else { - saveButton.setEnabled(false); - deployButton.setEnabled(false); - } + private void updateControls() { + updateProcessInfoFileControls(); + updateGraphicalInfoFileControls(); + updateImageFileControls(); + updateAdditionalFilesControls(); + updateClassesAndResourcesControls(); + updateUseCredentialsControls(); + updateServerInfoControls(); + } + + private void updateProcessInfoFileControls() { + IFile processInfoFile = deploymentInfo.getProcessInfoFile(); + String value = ""; + if (processInfoFile != null) { + value = processInfoFile.getFullPath().toString(); } + includeProcessInfoFileButton.setSelection(!"".equals(value)); + includeProcessInfoFileButton.setEnabled(false); + processInfoFileText.setText(value); } - private boolean notEmpty(Text text) { - String string = text.getText(); - return string != null && !"".equals(string); + private void updateGraphicalInfoFileControls() { + IFile graphicalInfoFile = deploymentInfo.getGraphicalInfoFile(); + String value = ""; + if (graphicalInfoFile != null) { + value = graphicalInfoFile.getFullPath().toString(); + } + includeGraphicalInfoFileButton.setSelection(graphicalInfoFile != null); + graphicalInfoFileText.setText(value); + browseGraphicalInfoFileButton.setEnabled(graphicalInfoFile != null); } - private void updateTestConnectionAndDeployButtons() { - if (notEmpty(nameText) && notEmpty(portText) && notEmpty(deployerText)) { - testConnectionButton.setEnabled(true); - if (saveLocallyButton.getSelection()) { - deployButton.setEnabled(saveButton.isEnabled()); - } else { - deployButton.setEnabled(true); + private void updateImageFileControls() { + IFile imageFile = deploymentInfo.getImageFile(); + String value = ""; + if (imageFile != null) { + value = imageFile.getFullPath().toString(); + } + includeImageFileButton.setSelection(imageFile != null); + imageFileText.setText(value); + browseImageFileButton.setEnabled(imageFile != null); + } + + private void updateAdditionalFilesControls() { + Object[] additionalFiles = deploymentInfo.getAdditionalFiles(); + for (Object object : additionalFiles) { + if (object instanceof IFile) { + IFile file = (IFile)object; + TableItem tableItem = new TableItem(additionalFilesList, SWT.NULL); + tableItem.setText(LABELPROVIDER.getText(file) + " (" + file.getFullPath() + ")"); + tableItem.setImage(LABELPROVIDER.getImage(file)); + tableItem.setData(object); } - } else { - testConnectionButton.setEnabled(false); - deployButton.setEnabled(false); } } - private void createSaveLocationField(Composite localSaveFormclient) { - Label locationLabel = toolkit.createLabel(localSaveFormclient, "Location:"); - locationLabel.setForeground(toolkit.getColors().getColor(FormColors.TITLE)); - locationText = toolkit.createText(localSaveFormclient, ""); - locationText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - locationText.addKeyListener(new KeyAdapter() { - public void keyReleased(KeyEvent e) { - updateSaveAndDeployButtons(true); + private void updateClassesAndResourcesControls() { + Object[] classesAndResources = deploymentInfo.getClassesAndResources(); + for (Object object : classesAndResources) { + IPath path = null; + if (object instanceof IFile) { + path = ((IFile)object).getFullPath(); + } else if (object instanceof ICompilationUnit) { + path = ((ICompilationUnit)object).getPath(); + } else if (object instanceof IClassFile) { + path = ((IClassFile)object).getPath(); } - }); - locationText.setEditable(false); - locationButton = toolkit.createButton(localSaveFormclient, "Search...", SWT.PUSH); - locationButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - searchLocation(); + if (path != null) { + TableItem tableItem = new TableItem(classesAndResourcesList, SWT.NULL); + tableItem.setData(object); + tableItem.setText(LABELPROVIDER.getText(object) + " (" + path + ")"); + tableItem.setImage(LABELPROVIDER.getImage(object)); } - }); - locationButton.setEnabled(false); + } } - private void searchLocation() { - FileDialog dialog = new FileDialog(form.getShell(), SWT.OPEN); - String result = dialog.open(); - if (result != null) { - locationText.setText(result); - updateSaveAndDeployButtons(true); + private void updateUseCredentialsControls() { + boolean useCredentials = deploymentInfo.getUseCredentials(); + useCredentialsButton.setSelection(useCredentials); + String userName = deploymentInfo.getUserName(); + if (userName != null) { + userNameText.setText(userName); + } + userNameText.setEnabled(useCredentials); + String password = deploymentInfo.getPassword(); + if (password != null) { + passwordText.setText(password); + } + passwordText.setEnabled(useCredentials); + } + + private void updateServerInfoControls() { + String serverName = deploymentInfo.getServerName(); + if (serverName != null) { + serverNameText.setText(serverName); + } + String serverPort = deploymentInfo.getServerPort(); + if (serverPort != null) { + serverPortText.setText(serverPort); + } + String serverDeployer = deploymentInfo.getServerDeployer(); + if (serverDeployer != null) { + serverDeployerText.setText(serverDeployer); } } - private void createSaveButton(Composite localSaveFormClient) { - saveButton = toolkit.createButton(localSaveFormClient, "Save Without Deploying...", SWT.PUSH); - GridData gridData = new GridData(); - gridData.horizontalSpan = 3; - gridData.horizontalAlignment = SWT.BEGINNING; - saveButton.setLayoutData(gridData); - saveButton.setEnabled(false); - saveButton.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e) { - if (cancelOrSaveAndContinue()) { - createProcessDeployer().saveWithoutDeploying(); - } - } - }); + private void hookListeners() { + includeGraphicalInfoFileButton.addSelectionListener(includeGraphicalInfoFileButtonSelectionListener); + browseGraphicalInfoFileButton.addSelectionListener(browseGraphicalInfoFileButtonSelectionListener); + includeImageFileButton.addSelectionListener(includeImageFileButtonSelectionListener); + browseImageFileButton.addSelectionListener(browseImageFileButtonSelectionListener); + additionalFilesList.addSelectionListener(additionalFilesListSelectionListener); + additionalFilesAddButton.addSelectionListener(additionaFilesAddButtonSelectionListener); + additionalFilesRemoveButton.addSelectionListener(additionaFilesRemoveButtonSelectionListener); + classesAndResourcesList.addSelectionListener(classesAndResourcesListSelectionListener); + classesAndResourcesAddButton.addSelectionListener(classesAndResourcesAddButtonSelectionListener); + classesAndResourcesRemoveButton.addSelectionListener(classesAndResourcesRemoveButtonSelectionListener); + serverNameText.addModifyListener(serverNameTextListener); + serverPortText.addModifyListener(serverPortTextListener); + serverDeployerText.addModifyListener(serverDeployerTextListener); + useCredentialsButton.addSelectionListener(useCredentialsButtonSelectionListener); } -// public void refresh(final ArrayList objectsToRefresh) { -// form.getDisplay().asyncExec(new Runnable() { -// public void run() { -// refreshIncludeClassesTreeViewer(objectsToRefresh); -// refreshIncludeFilesTreeViewer(objectsToRefresh); -// } -// }); -// } + private SelectionListener useCredentialsButtonSelectionListener = new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + userNameText.setEnabled(useCredentialsButton.getSelection()); + passwordText.setEnabled(useCredentialsButton.getSelection()); + } + }; + + private ModifyListener serverNameTextListener = new ModifyListener() { + public void modifyText(ModifyEvent event) { + deploymentInfo.setServerName(serverNameText.getText()); + editor.setDirty(true); + } + }; -// private void refreshIncludeFilesTreeViewer(ArrayList objectsToRefresh) { -// Object[] elements = includeFilesTreeViewer.getCheckedElements(); -// includeFilesTreeViewer.refresh(); -// includeFilesTreeViewer.setCheckedElements(elements); -// IWorkspaceRoot root = processFolder.getWorkspace().getRoot(); -// for (int i = 0; i < objectsToRefresh.size(); i++) { -// IPath path = (IPath)objectsToRefresh.get(i); -// if (root.getFile(path).exists()) { -// includeFilesTreeViewer.setChecked(root.getFile(path), true); -// } else if (root.getFolder(path).exists()) { -// includeFilesTreeViewer.setChecked(root.getFolder(path), true); -// } -// } -// } + private ModifyListener serverPortTextListener = new ModifyListener() { + public void modifyText(ModifyEvent event) { + deploymentInfo.setServerPort(serverPortText.getText()); + editor.setDirty(true); + } + }; -// private void refreshIncludeClassesTreeViewer(ArrayList objectsToRefresh) { -// Set referencedJavaClassNames = null; -// Object[] elements = includeClassesTreeViewer.getCheckedElements(); -// includeClassesTreeViewer.refresh(); -// includeClassesTreeViewer.setCheckedElements(elements); -// IWorkspaceRoot root = processFolder.getWorkspace().getRoot(); -// for (int i = 0; i < objectsToRefresh.size(); i++) { -// IPath path = (IPath)objectsToRefresh.get(i); -// IJavaElement javaElement = JavaCore.create(root.getFile(path)); -// if (javaElement != null && javaElement instanceof ICompilationUnit) { -// if (referencedJavaClassNames == null) { -// referencedJavaClassNames = JavaClassNameCollector.getJavaClassNames(editor.getProcessDefinition()); -// } -// String name = getTypeName((ICompilationUnit)javaElement); -// boolean checkNeeded = referencedJavaClassNames.contains(name); -// includeClassesTreeViewer.setChecked(javaElement, checkNeeded); -// } -// } -// } + private ModifyListener serverDeployerTextListener = new ModifyListener() { + public void modifyText(ModifyEvent event) { + deploymentInfo.setServerDeployer(serverDeployerText.getText()); + editor.setDirty(true); + } + }; - private String getTypeName(ICompilationUnit unit) { - try { - IType[] types = unit.getTypes(); - if (types.length > 0) { - return types[0].getFullyQualifiedName(); - } - } catch (JavaModelException e) { - Logger.logError(e); + private SelectionListener includeGraphicalInfoFileButtonSelectionListener = new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + boolean include = includeGraphicalInfoFileButton.getSelection(); + browseGraphicalInfoFileButton.setEnabled(include); + if (include && graphicalInfoFileText.getData() != null) { + deploymentInfo.setGraphicalInfoFile((IFile)graphicalInfoFileText.getData()); + } else { + deploymentInfo.setGraphicalInfoFile(null); } - return null; - } + editor.setDirty(true); + } + }; - private boolean cancelOrSaveAndContinue() { - IEditorPart editor = getEditorPart(); - boolean result = true; - if (editor.isDirty()) { - int saveProceedCancel = openSaveProceedCancelDialog(); - if (saveProceedCancel == 2) { - result = false; - } else if (saveProceedCancel == 0) { - editor.doSave(null); + private SelectionListener includeImageFileButtonSelectionListener = new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + boolean include = includeImageFileButton.getSelection(); + browseImageFileButton.setEnabled(include); + if (include && imageFileText.getData() != null) { + deploymentInfo.setImageFile((IFile)imageFileText.getData()); + } else { + deploymentInfo.setImageFile(null); } + editor.setDirty(true); } - return result; - } - - private int openSaveProceedCancelDialog() { - MessageDialog dialog = new MessageDialog( - getWorkBenchWindow().getShell(), - "Save Resource", - null, - "'" + processFolder.getName() + "' has been modified. Save changes before deploying?", - MessageDialog.QUESTION, - new String[] { - IDialogConstants.YES_LABEL, - IDialogConstants.NO_LABEL, - IDialogConstants.CANCEL_LABEL}, - 0); - return dialog.open(); - - } + }; - private IWorkbenchWindow getWorkBenchWindow() { - return PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - } + private SelectionListener browseGraphicalInfoFileButtonSelectionListener = new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(null, new WorkbenchLabelProvider(), new WorkbenchContentProvider()); + dialog.setTitle("Graphical Info File Selection"); + dialog.setMessage("Select the graphical info file."); + dialog.setInput(ResourcesPlugin.getWorkspace().getRoot()); + dialog.setValidator(fileSelectionStatusValidator); + dialog.open(); + if (dialog.getFirstResult() != null && dialog.getFirstResult() instanceof IFile) { + IFile file = (IFile)dialog.getFirstResult(); + graphicalInfoFileText.setText(file.getFullPath().toString()); + graphicalInfoFileText.setData(file); + deploymentInfo.setGraphicalInfoFile(file); + editor.setDirty(true); + } + } + }; - private IEditorPart getEditorPart() { - return getWorkBenchWindow().getActivePage().getActiveEditor(); - } + private SelectionListener browseImageFileButtonSelectionListener = new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(null, new WorkbenchLabelProvider(), new WorkbenchContentProvider()); + dialog.setTitle("Image File Selection"); + dialog.setMessage("Select the image file."); + dialog.setInput(ResourcesPlugin.getWorkspace().getRoot()); + dialog.setValidator(fileSelectionStatusValidator); + dialog.open(); + if (dialog.getFirstResult() != null && dialog.getFirstResult() instanceof IFile) { + IFile file = (IFile)dialog.getFirstResult(); + imageFileText.setText(file.getFullPath().toString()); + imageFileText.setData(file); + deploymentInfo.setImageFile(file); + editor.setDirty(true); + } + } + }; - public void refresh() { - if (composite.isDisposed()) return; - nameText.setText(getDeploymentInfo().getServerName()); - portText.setText(getDeploymentInfo().getServerPort()); - deployerText.setText(getDeploymentInfo().getServerDeployer()); - composite.getDisplay().asyncExec(new Runnable() { - public void run() { - if (!includeClassesTreeViewer.getTree().isDisposed()) { - includeClassesTreeViewer.refresh(); - includeClassesTreeViewer.setCheckedElements(getDeploymentInfo().getClassesAndResources()); + private SelectionListener additionalFilesListSelectionListener = new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + additionalFilesRemoveButton.setEnabled(additionalFilesList.getSelectionCount() > 0); + } + }; + + private SelectionListener additionaFilesAddButtonSelectionListener = new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(null, new WorkbenchLabelProvider(), new WorkbenchContentProvider()); + dialog.setTitle("Additional File Selection"); + dialog.setMessage("Select the additional file."); + dialog.setAllowMultiple(false); + dialog.setInput(ResourcesPlugin.getWorkspace().getRoot()); + dialog.setValidator(fileSelectionStatusValidator); + dialog.open(); + if (dialog.getFirstResult() != null && dialog.getFirstResult() instanceof IFile) { + IFile file = (IFile)dialog.getFirstResult(); + TableItem tableItem = new TableItem(additionalFilesList, SWT.NULL); + tableItem.setText(LABELPROVIDER.getText(file) + " (" + file.getFullPath() + ")"); + tableItem.setImage(LABELPROVIDER.getImage(file)); + deploymentInfo.addToAdditionalFiles(file); + editor.setDirty(true); + } + } + }; + + private ISelectionStatusValidator fileSelectionStatusValidator = + new ISelectionStatusValidator() { + public IStatus validate(Object[] arg0) { + if (arg0.length == 1 && arg0[0] instanceof IFile) { + return new Status(IStatus.OK, Plugin.getDefault().getBundle().getSymbolicName(), "Press OK to confirm."); + } else { + return new Status(IStatus.ERROR, Plugin.getDefault().getBundle().getSymbolicName(), "Select a single file."); } - } - }); - composite.getDisplay().asyncExec(new Runnable() { - public void run() { - if (!includeFilesTreeViewer.getTree().isDisposed()) { - includeFilesTreeViewer.refresh(); - includeFilesTreeViewer.setCheckedElements(getDeploymentInfo().getFilesAndFolders()); + } + }; + + private SelectionListener additionaFilesRemoveButtonSelectionListener = new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + int[] indices = additionalFilesList.getSelectionIndices(); + if (indices.length > 0) { + TableItem tableItem = additionalFilesList.getItem(indices[0]); + Object object = tableItem.getData(); + deploymentInfo.removeFromAdditionalFiles(object); + additionalFilesList.remove(indices[0]); + editor.setDirty(true); + } + } + }; + + private SelectionListener classesAndResourcesListSelectionListener = new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + classesAndResourcesRemoveButton.setEnabled(classesAndResourcesList.getSelectionCount() > 0); + } + }; + + private SelectionListener classesAndResourcesAddButtonSelectionListener = new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(null, new JavaElementLabelProvider(), new ClassesAndResourcesContentProvider()); + dialog.setTitle("Classes and Resources Selection"); + dialog.setAllowMultiple(false); + dialog.setMessage("Select a class or resouce."); + dialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot())); + dialog.setValidator(classesAndResourcesSelectionStatusValidator); + dialog.open(); + if (dialog.getFirstResult() != null) { //&& dialog.getFirstResult() instanceof IFile) { + IPath path = null; + if (dialog.getFirstResult() instanceof IFile) { + path = ((IFile)dialog.getFirstResult()).getFullPath(); + } else if (dialog.getFirstResult() instanceof ICompilationUnit) { + path = ((ICompilationUnit)dialog.getFirstResult()).getPath(); + } else if (dialog.getFirstResult() instanceof IClassFile) { + path = ((IClassFile)dialog.getFirstResult()).getPath(); } - } - }); - } + if (path != null) { + TableItem tableItem = new TableItem(classesAndResourcesList, SWT.NULL); + tableItem.setData(dialog.getFirstResult()); + tableItem.setText(LABELPROVIDER.getText(dialog.getFirstResult()) + " (" + path + ")"); + tableItem.setImage(LABELPROVIDER.getImage(dialog.getFirstResult())); + deploymentInfo.addToClassesAndResources(dialog.getFirstResult()); + editor.setDirty(true); + } + } + } + }; + private ISelectionStatusValidator classesAndResourcesSelectionStatusValidator = + new ISelectionStatusValidator() { + public IStatus validate(Object[] arg0) { + if (arg0.length == 1 && (arg0[0] instanceof IFile || arg0[0] instanceof ICompilationUnit || arg0[0] instanceof IClassFile)) { + return new Status(IStatus.OK, Plugin.getDefault().getBundle().getSymbolicName(), "Press OK to confirm."); + } else { + return new Status(IStatus.ERROR, Plugin.getDefault().getBundle().getSymbolicName(), "Select a single file."); + } + } + }; + + private SelectionListener classesAndResourcesRemoveButtonSelectionListener = new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + int[] indices = classesAndResourcesList.getSelectionIndices(); + if (indices.length > 0) { + TableItem tableItem = classesAndResourcesList.getItem(indices[0]); + Object object = tableItem.getData(); + deploymentInfo.removeFromClassesAndResources(object); + classesAndResourcesList.remove(indices[0]); + } + } + }; + } Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/DeploymentInfo.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/DeploymentInfo.java 2010-06-23 16:42:50 UTC (rev 22960) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/DeploymentInfo.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -2,17 +2,49 @@ import java.util.ArrayList; -import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IFile; +import org.eclipse.jface.preference.IPreferenceStore; +import org.jbpm.gd.jpdl.Plugin; +import org.jbpm.gd.jpdl.prefs.PreferencesConstants; -public class DeploymentInfo { +public class DeploymentInfo implements PreferencesConstants { + private IFile processInfoFile = null; + private IFile graphicalInfoFile = null; + private IFile imageFile = null; private String serverName = null; private String serverPort = null; private String serverDeployer = null; - private IFolder processFolder = null; - private Object[] classesAndResources = null; - private Object[] filesAndFolders = null; + private ArrayList<Object> classesAndResources = new ArrayList<Object>(); + private ArrayList<Object> additionalFiles = new ArrayList<Object>(); + private Boolean useCredentials = null; + private String userName = null; + private String password = null; + public void setProcessInfoFile(IFile processInfoFile) { + this.processInfoFile = processInfoFile; + } + + public IFile getProcessInfoFile() { + return processInfoFile; + } + + public void setGraphicalInfoFile(IFile graphicalInfoFile) { + this.graphicalInfoFile = graphicalInfoFile; + } + + public IFile getGraphicalInfoFile() { + return graphicalInfoFile; + } + + public void setImageFile(IFile imageFile) { + this.imageFile = imageFile; + } + + public IFile getImageFile() { + return imageFile; + } + public void setServerName(String serverName) { this.serverName = serverName; } @@ -37,28 +69,91 @@ return serverDeployer; } - public void setProcessFolder(IFolder processFolder) { - this.processFolder = processFolder; + public void addToClassesAndResources(Object element) { + classesAndResources.add(element); } - public IFolder getProcessFolder() { - return processFolder; + public void removeFromClassesAndResources(Object element) { + classesAndResources.remove(element); } - - public void setClassesAndResources(Object[] classesAndResources) { - this.classesAndResources = classesAndResources; - } public Object[] getClassesAndResources() { - return classesAndResources; + return classesAndResources.toArray(new Object[classesAndResources.size()]); } - public void setFilesAndFolders(Object[] filesAndFolders) { - this.filesAndFolders = filesAndFolders; + public void addToAdditionalFiles(Object element) { + additionalFiles.add(element); } - public Object[] getFilesAndFolders() { - return filesAndFolders; + public void removeFromAdditionalFiles(Object element) { + additionalFiles.remove(element); } + + public Object[] getAdditionalFiles() { + return additionalFiles.toArray(new Object[additionalFiles.size()]); + } + + public boolean getUseCredentials() { + if (useCredentials == null) { + useCredentials = getPrefs().getBoolean(USE_CREDENTIALS); + if (useCredentials == null) { + useCredentials = false; + } + } + return useCredentials; + } + + public void setUseCredentials(boolean useCredentials) { + this.useCredentials = useCredentials; + } + + public String getUserName() { + if (userName == null) { + userName = getPrefs().getString(USER_NAME); + } + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPassword() { + if (password == null) { + password = getPrefs().getString(PASSWORD); + } + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public boolean isEmpty() { + return + graphicalInfoFile == null && + imageFile == null && + isServerNameDefault() && + isServerPortDefault() && + isServerDeployerDefault() && + classesAndResources.isEmpty() && + additionalFiles.isEmpty(); + } + + private boolean isServerNameDefault() { + return serverName == null || serverName.equals(getPrefs().getString(SERVER_NAME)); + } + + private boolean isServerPortDefault() { + return serverPort == null || serverPort.equals(getPrefs().getString(SERVER_PORT)); + } + + private boolean isServerDeployerDefault() { + return serverDeployer == null || serverDeployer.equals(getPrefs().getString(SERVER_DEPLOYER)); + } + + private IPreferenceStore getPrefs() { + return Plugin.getDefault().getPreferenceStore(); + } } Deleted: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/IncludeClassesTreeContentProvider.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/IncludeClassesTreeContentProvider.java 2010-06-23 16:42:50 UTC (rev 22960) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/IncludeClassesTreeContentProvider.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -1,137 +0,0 @@ -package org.jbpm.gd.jpdl.deployment; - -import java.util.ArrayList; - -import org.eclipse.core.resources.IResource; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IPackageFragment; -import org.eclipse.jdt.core.IPackageFragmentRoot; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.widgets.Control; -import org.jbpm.gd.jpdl.Logger; - -public class IncludeClassesTreeContentProvider implements ITreeContentProvider { - - public Object[] getElements(Object parent) { - if (parent instanceof IJavaProject) { - return getPackageFragmentRoots((IJavaProject)parent); - } - return new Object[0]; - } - - private IPackageFragmentRoot[] getPackageFragmentRoots(IJavaProject project) { - try { - ArrayList list = new ArrayList(); - IClasspathEntry[] entries = project.getRawClasspath(); - for (int i = 0; i < entries.length; i++) { - if (entries[i].getEntryKind() != IClasspathEntry.CPE_CONTAINER) { - IPackageFragmentRoot[] roots = project.findPackageFragmentRoots(entries[i]); - for (int j = 0; j < roots.length; j++) { - list.add(roots[j]); - } - } - } - return (IPackageFragmentRoot[])list.toArray(new IPackageFragmentRoot[list.size()]); - } - catch (JavaModelException e) { - Logger.logError(e); - } - return new IPackageFragmentRoot[0]; - } - - public Object[] getChildren(Object parent) { - ArrayList list = new ArrayList(); - try { - if (parent instanceof IPackageFragmentRoot) { - list.addAll(toArrayList(((IPackageFragmentRoot)parent).getNonJavaResources())); - list.addAll(getNonEmptyPackageFragments((IPackageFragmentRoot) parent)); - } else if (parent instanceof IPackageFragment) { - list.addAll(toArrayList(((IPackageFragment)parent).getNonJavaResources())); - list.addAll(toArrayList(((IPackageFragment)parent).getChildren())); - } - } catch (JavaModelException e) { - Logger.logError(e); - } - return list.toArray(); - } - - private ArrayList toArrayList(Object[] resources){ - ArrayList list = new ArrayList(); - for (int i = 0; i < resources.length; i++) { - list.add(resources[i]); - } - return list; - } - - private ArrayList getNonEmptyPackageFragments(IPackageFragmentRoot parent) { - ArrayList list = new ArrayList(); - try { - Object[] children = parent.getChildren(); - for (int i = 0; i < children.length; i++) { - if (children[i] instanceof IPackageFragment && hasChildren(children, i)) { - list.add(children[i]); - } - } - } catch (JavaModelException e) { - Logger.logError(e); - } - return list; - } - - private boolean hasChildren(Object[] children, int i) throws JavaModelException { - return (((IPackageFragment)children[i]).getChildren().length != 0) - || (((IPackageFragment)children[i]).getNonJavaResources().length != 0); - } - - public Object getParent(Object element) { - if (element == null) { - return null; - } else if (element instanceof IJavaElement) { - return ((IJavaElement)element).getParent(); - } else if (element instanceof IResource) { - IJavaElement javaElement = JavaCore.create(((IResource) element).getParent()); - if (javaElement != null) { - return javaElement; - } else { - return ((IResource)element).getParent(); - } - } - return null; - } - - public boolean hasChildren(Object element) { - if (element instanceof IPackageFragmentRoot) { - return getChildren(element).length > 0; - } else if (element instanceof IPackageFragment) { - return getChildren(element).length > 0; - } - return false; - } - - public void dispose() { - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - asyncRefresh(viewer); - } - - private void asyncRefresh(final Viewer viewer) { - Control control = viewer.getControl(); - if (!control.isDisposed()) { - control.getDisplay().asyncExec(new Runnable() { - - public void run() { - if (!viewer.getControl().isDisposed()) { - viewer.refresh(); - } - } - }); - } - } - -} Deleted: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/IncludeFilesTreeContentProvider.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/IncludeFilesTreeContentProvider.java 2010-06-23 16:42:50 UTC (rev 22960) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/IncludeFilesTreeContentProvider.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -1,67 +0,0 @@ -package org.jbpm.gd.jpdl.deployment; - -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.widgets.Control; -import org.jbpm.gd.jpdl.Logger; - -public class IncludeFilesTreeContentProvider implements ITreeContentProvider { - - public Object[] getElements(Object parent) { - if (parent instanceof IFolder) { - try { - return ((IFolder) parent).members(); - } catch (CoreException e) { - Logger.logError(e); - } - } - return new Object[0]; - } - - public Object[] getChildren(Object parent) { - try { - if (parent instanceof IFolder) - return ((IFolder) parent).members(); - } catch (CoreException e) { - Logger.logError(e); - } - return new Object[0]; - } - - public Object getParent(Object element) { - if (element != null && element instanceof IResource) { - return ((IResource) element).getParent(); - } - return null; - } - - public boolean hasChildren(Object element) { - if (element instanceof IFolder) - return getChildren(element).length > 0; - return false; - } - - public void dispose() { - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - asyncRefresh(viewer); - } - - private void asyncRefresh(final Viewer viewer) { - Control control = viewer.getControl(); - if (!control.isDisposed()) { - control.getDisplay().asyncExec(new Runnable() { - public void run() { - if (!viewer.getControl().isDisposed()) { - viewer.refresh(); - } - } - }); - } - } - -} Deleted: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/IncludeInDeploymentTreeViewer.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/IncludeInDeploymentTreeViewer.java 2010-06-23 16:42:50 UTC (rev 22960) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/IncludeInDeploymentTreeViewer.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -1,159 +0,0 @@ -package org.jbpm.gd.jpdl.deployment; - -import org.eclipse.jface.viewers.CheckStateChangedEvent; -import org.eclipse.jface.viewers.CheckboxTreeViewer; -import org.eclipse.jface.viewers.ICheckStateListener; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.swt.widgets.Tree; - -public class IncludeInDeploymentTreeViewer extends CheckboxTreeViewer { - - public IncludeInDeploymentTreeViewer(Tree tree) { - super(tree); - addCheckStateListener(new ICheckStateListener() { - public void checkStateChanged(CheckStateChangedEvent event) { - handleCheckStateChanged(event); - } - }); - } - - private void handleCheckStateChanged(CheckStateChangedEvent event) { - updateChecks(event.getElement(), event.getChecked()); - } - -// private void handleCheckStateChangedForChildren(Object object, boolean checked) { -// expandToLevel(object, ALL_LEVELS); -// setGrayed(object, false); -// ITreeContentProvider provider = (ITreeContentProvider)getContentProvider(); -// Object[] children = provider.getChildren(object); -// for (int i = 0; i < children.length; i++) { -// setChecked(children[i], checked); -// handleCheckStateChangedForChildren(children[i], checked); -// } -// } - -// private void handleCheckStateChangedForParent(Object object) { -// ITreeContentProvider provider = (ITreeContentProvider)getContentProvider(); -// Object parent = provider.getParent(object); -// if (parent != null) { -// Object[] children = provider.getChildren(parent); -// int numberChecked = 0; -// boolean grayedChildren = false; -// for (int i = 0; i < children.length; i++) { -// if (getChecked(children[i])) numberChecked++; -// if (getGrayed(children[i])) grayedChildren = true; -// } -// setChecked(parent, numberChecked > 0); -// setGrayed(parent, (numberChecked > 0 && numberChecked < children.length) || grayedChildren); -// handleCheckStateChangedForParent(parent); -// } -// } - - public boolean setChecked(final Object element, final boolean state) { - boolean result = super.setChecked(element, state); - if (result) { - updateChecks(element, state); - } - return result; - } - - public void setCheckedElements(final Object[] elements) { - super.setCheckedElements(elements); - for (int i = 0; i < elements.length; i++) { - updateChecks(elements[i], true); - } - } - - private void updateChecks(Object object, boolean state) { - updateChecksForChildren(object, state); - updateChecksForParents(object, state); - } - - private void updateChecksForChildren(Object object, boolean state) { - setGrayed(object, false); - Object[] children = ((ITreeContentProvider)getContentProvider()).getChildren(object); - for (int i = 0; i < children.length; i++) { - if (getChecked(children[i]) != state) { - super.setChecked(children[i], state); - updateChecksForChildren(children[i], state); - } - } - } - - private void updateChecksForParents(Object object, boolean state) { - ITreeContentProvider provider = (ITreeContentProvider)getContentProvider(); - Object child = object; - Object parent = provider.getParent(child); - boolean change = true; - while (parent != null && change) { - Object[] siblings = provider.getChildren(parent); - int numberChecked = 0; - boolean grayed = false; - change = false; - for (int i = 0; i < siblings.length; i++) { - if (getChecked(siblings[i])) numberChecked++; - if (getGrayed(siblings[i])) grayed = true; - } - if (numberChecked == 0) { - if (getChecked(parent) || getGrayed(parent)) change = true; - setGrayChecked(parent, false); - } - else if (numberChecked == siblings.length) { - if (!getChecked(parent) || getGrayed(parent) != grayed) change = true; - setGrayed(parent, false); - setChecked(parent, true); - } - else { - if (!getChecked(parent) || !getGrayed(parent)) change = true; - setGrayChecked(parent, true); - } - child = parent; - parent = provider.getParent(child); - } - - } - -// public void updateChecks() { -// getControl().getDisplay().asyncExec(new Runnable() { -// public void run() { -// ITreeContentProvider provider = (ITreeContentProvider)getContentProvider(); -// Object[] elements = provider.getElements(getInput()); -// for (int i = 0; i < elements.length; i++) { -// updateChecks(provider, elements[i]); -// } -// } -// }); -// } - - - -// private int[] updateChecks(ITreeContentProvider provider, Object object) { -// int[] result = new int[2]; // result[0] contains the number of checked, result[1] the number of grayed elements -// int[] updates = new int[2]; -// Object[] children = provider.getChildren(object); -// if ((children == null || children.length == 0)) { -// if (getChecked(object)) result[0]++; -// } else { -// for (int i = 0; i < children.length; i++) { -// int[] runner = updateChecks(provider, children[i]); -// updates[0] += runner[0]; -// updates[1] += runner[1]; -// } -// if (updates[0] == children.length && updates[1] == 0) { -// setChecked(object, true); -// result[0]++; -// setGrayed(object, false); -// } else if (updates[0] > 0 || updates[1] > 0) { -// setChecked(object, true); -// result[0]++; -// setGrayed(object, true); -// result[1]++; -// } else { -// setChecked(object, false); -// setGrayed(object, false); -// } -// } -// return result; -// } - -} \ No newline at end of file Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ProcessArchiveBuilder.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ProcessArchiveBuilder.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ProcessArchiveBuilder.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -0,0 +1,241 @@ +package org.jbpm.gd.jpdl.deployment; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.IClassFile; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IPackageFragmentRoot; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.launching.JavaRuntime; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.swt.SWT; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IFileEditorInput; +import org.jbpm.gd.jpdl.Logger; +import org.jbpm.gd.jpdl.editor.JpdlEditor; + +public class ProcessArchiveBuilder { + + private JpdlEditor jpdlEditor; + + public ProcessArchiveBuilder(JpdlEditor jpdlEditor) { + this.jpdlEditor = jpdlEditor; + } + + public byte[] build() { + try { + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStream); + if (jpdlEditor.getDeploymentInfo() != null) { + addProcessInfoFile(zipOutputStream); + addGraphicalInfoFile(zipOutputStream); + addProcessImageFile(zipOutputStream); + addAdditionalFiles(zipOutputStream); + addClassesAndResources(zipOutputStream); + } + zipOutputStream.close(); + return byteArrayOutputStream.toByteArray(); + } catch (Exception e) { + showBuildProcessArchiveException(); + return null; + } + } + + private void showBuildProcessArchiveException() { + MessageDialog dialog = new MessageDialog( + jpdlEditor.getSite().getShell(), + "Build Process Archive Failed", + null, + "There was a problem creating the process archive to deploy.", + SWT.ICON_ERROR, + new String[] { "OK" }, + 0); + dialog.open(); + } + + private void addFile(ZipOutputStream zipOutputStream, IFile file, String entryName) throws Exception { + byte[] buffer = new byte[256]; + InputStream inputStream; + try { + inputStream = file.getContents(); + } catch (CoreException e) { + Logger.logError("CoreException getting contents of file " + file.getName(), e); + throw e; + } + try { + zipOutputStream.putNextEntry(new ZipEntry(entryName)); + } catch (IOException e) { + Logger.logError("IOException creating entry '" + entryName + "'.", e); + } + int read; + try { + while ((read = inputStream.read(buffer)) != -1) { + zipOutputStream.write(buffer, 0, read); + } + } catch(IOException e) { + Logger.logError("IOException writing file '"+ entryName +"'.", e); + } + } + + private void addProcessInfoFile(ZipOutputStream zipOutputStream) throws Exception { + IFile processInfoFile = jpdlEditor.getDeploymentInfo().getProcessInfoFile(); + if (processInfoFile != null) { + addFile(zipOutputStream, processInfoFile, "processdefinition.xml"); + } + } + + private void addGraphicalInfoFile(ZipOutputStream zipOutputStream) throws Exception { + IFile graphicalInfoFile = jpdlEditor.getDeploymentInfo().getGraphicalInfoFile(); + if (graphicalInfoFile != null) { + addFile(zipOutputStream, graphicalInfoFile, "gpd.xml"); + } + } + + private void addProcessImageFile(ZipOutputStream zipOutputStream) throws Exception { + IFile processImageFile = jpdlEditor.getDeploymentInfo().getImageFile(); + if (processImageFile != null) { + addFile(zipOutputStream, processImageFile, "processimage.jpg"); + } + } + + private void addAdditionalFiles(ZipOutputStream zipOutputStream) throws Exception { + Object[] additionalFiles = jpdlEditor.getDeploymentInfo().getAdditionalFiles(); + if (additionalFiles == null) return; + for (int i = 0; i < additionalFiles.length; i++) { + if (!(additionalFiles[i] instanceof IFile)) continue; + IFile file = (IFile)additionalFiles[i]; + addFile(zipOutputStream, file, file.getName()); + } + } + + private void addClassesAndResources(ZipOutputStream zipOutputStream) throws Exception { + Object[] classesAndResources = jpdlEditor.getDeploymentInfo().getClassesAndResources(); + if (classesAndResources == null) return; + for (int i = 0; i < classesAndResources.length; i++) { + if (classesAndResources[i] instanceof IFile) { + addFile(zipOutputStream, (IFile)classesAndResources[i]); + } else if (classesAndResources[i] instanceof ICompilationUnit) { + addCompilationUnit(zipOutputStream, (ICompilationUnit)classesAndResources[i]); + } else if (classesAndResources[i] instanceof IClassFile) { + addClassFile(zipOutputStream, (IClassFile)classesAndResources[i]); + } + } + } + + private void addFile(ZipOutputStream zipOutputStream, String name, ClassLoader classLoader) throws Exception { + byte[] buff = new byte[256]; + zipOutputStream.putNextEntry(new ZipEntry("classes/" + name)); + InputStream is = classLoader.getResourceAsStream(name); + int read; + while ((read = is.read(buff)) != -1) { + zipOutputStream.write(buff, 0, read); + } + is.close(); + } + + private void addFile(ZipOutputStream zipOutputStream, IFile file) throws Exception { + addFile(zipOutputStream, getResourceName(file), getClassLoader()); + } + + private void addCompilationUnit(ZipOutputStream zipOutputStream, ICompilationUnit compilationUnit) throws Exception { + String name = getResourceName(compilationUnit.getResource()); + name = name.substring(0, name.lastIndexOf(".java")) + ".class"; + ClassLoader classLoader = getClassLoader(); + addFile(zipOutputStream, name, classLoader); + addInnerClasses(zipOutputStream, name, classLoader); + } + + private String[] getNestedClassNames(String name, ClassLoader classLoader) { + final String className = + name.substring(name.lastIndexOf('/') + 1, name.length() - 6) + '$'; + URL url = classLoader.getResource(name); + File file = new File(url.getFile()); + File folder = new File(file.getParent()); + return folder.list(new FilenameFilter() { + public boolean accept(File dir, String name) { + return name.startsWith(className); + } + }); + } + + private void addInnerClasses(ZipOutputStream zipOutputStream, String name, ClassLoader classLoader) throws Exception { + String[] nestedClassNames = getNestedClassNames(name, classLoader); + if (nestedClassNames == null) return; + for (int i = 0; i < nestedClassNames.length; i++) { + String fileName = name.substring(0, name.lastIndexOf("/") + 1) + nestedClassNames[i]; + addFile(zipOutputStream, fileName, classLoader); + } + + } + + private void addClassFile(ZipOutputStream zipOutputStream, IClassFile classFile) throws Exception { + String name = classFile.getParent().getElementName().replace('.', '/') + "/" + classFile.getElementName(); + zipOutputStream.putNextEntry(new ZipEntry("classes/" + name)); + zipOutputStream.write(classFile.getBytes()); + } + + private ClassLoader getClassLoader() throws Exception { + return new URLClassLoader(getProjectClasspathUrls(), getClass().getClassLoader()); + } + + private URL[] getProjectClasspathUrls() throws Exception { + URL[] urls = new URL[0]; + IProject project = getProject(); + IJavaProject javaProject = JavaCore.create(project); + if (javaProject == null) { + return urls; + } + String[] pathArray = JavaRuntime.computeDefaultRuntimeClassPath(javaProject); + urls = new URL[pathArray.length]; + for (int i = 0; i < pathArray.length; i++) { + urls[i] = new File(pathArray[i]).toURI().toURL(); + } + return urls; + } + + private IProject getProject() { + IEditorInput editorInput = jpdlEditor.getEditorInput(); + if (!(editorInput instanceof IFileEditorInput)) return null; + IFile file = ((IFileEditorInput)editorInput).getFile(); + return file.getProject(); + } + + private IPackageFragmentRoot getPackageFragmentRoot(IResource resource) { + IPackageFragmentRoot root = null; + IResource r = resource; + while (r != null) { + IJavaElement javaElement = JavaCore.create(r); + if (javaElement != null && javaElement instanceof IPackageFragmentRoot) { + root = (IPackageFragmentRoot)javaElement; + break; + } + r = r.getParent(); + } + return root; + } + + private String getResourceName(IResource resource) { + IPackageFragmentRoot root = getPackageFragmentRoot(resource); + if (root == null) { + return null; + } else { + int index = root.getResource().getProjectRelativePath().toString().length() + 1; + return resource.getProjectRelativePath().toString().substring(index); + } + } + +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ProcessArchiveBuilder.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ProcessArchiveDeployer.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ProcessArchiveDeployer.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ProcessArchiveDeployer.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -0,0 +1,219 @@ +package org.jbpm.gd.jpdl.deployment; + +import java.io.DataOutputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.ConnectException; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; + +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.swt.SWT; +import org.jbpm.gd.common.util.Base64Converter; +import org.jbpm.gd.jpdl.editor.JpdlEditor; + +public class ProcessArchiveDeployer { + + private static final String BOUNDARY = "AaB03x"; + + private JpdlEditor jpdlEditor; + + public ProcessArchiveDeployer(JpdlEditor jpdlEditor) { + this.jpdlEditor = jpdlEditor; + } + + public boolean deploy(byte[] processArchive) { + URL url = createConnectionUrl(); + if (url == null) return false; + URLConnection connection = openConnection(url); + if (connection == null) return false; + prepareConnection(connection); + if (!sendData(connection, processArchive)) return false; + String response = receiveData(connection); + if (response == null) { + return false; + } + System.out.println(response); + return true; + } + + public boolean pingServer() { + URL url = createConnectionUrl(); + if (url == null) return false; + URLConnection connection = openConnection(url); + if (connection == null) return false; + connection.setDoOutput(true); + String response = receiveData(connection); + if (response == null) { + return false; + } + System.out.println(response); + return true; + } + + private String constructUrlString() { + String result = "http://"; + String serverName = jpdlEditor.getDeploymentInfo().getServerName(); + if (serverName != null) { + result += serverName; + } + result += ":"; + String serverPort = jpdlEditor.getDeploymentInfo().getServerPort(); + if (serverPort != null) { + result += serverPort; + } + String serverDeployer = jpdlEditor.getDeploymentInfo().getServerDeployer(); + if (serverDeployer != null) { + if (!serverDeployer.startsWith("/")) { + result += "/"; + } + result += serverDeployer; + } + return result; + } + + private URLConnection openConnection(URL url) { + try { + return url.openConnection(); + } catch (IOException e) { + showConnectException(); + return null; + } + } + + private URL createConnectionUrl() { + try { + return new URL(constructUrlString()); + } catch (MalformedURLException e) { + showConstructUrlException(); + return null; + } + } + + private void prepareConnection(URLConnection connection) { + if (jpdlEditor.getDeploymentInfo().getUseCredentials()) { + addCredentials(connection); + } + connection.setDoInput(true); + connection.setDoOutput(true); + connection.setUseCaches(false); + connection.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + BOUNDARY); + } + + private void addCredentials(URLConnection connection) { + String userPassword = jpdlEditor.getDeploymentInfo().getUserName(); + userPassword += ":"; + userPassword += jpdlEditor.getDeploymentInfo().getPassword(); + String encoding = Base64Converter.encode(userPassword); + connection.setRequestProperty("Authorization", "Basic " + encoding); + } + + private boolean sendData(URLConnection connection, byte[] processArchive) { + try { + OutputStream outputStream = connection.getOutputStream(); + DataOutputStream dataOutputStream = new DataOutputStream(outputStream); + dataOutputStream.writeBytes("--" + BOUNDARY + "\r\n"); + dataOutputStream.writeBytes("Content-Disposition: form-data; name=\"definition\"; filename=\"dummy.par\"\r\n"); + dataOutputStream.writeBytes("Content-Type: application/x-zip-compressed\r\n\r\n"); + dataOutputStream.write(processArchive); + dataOutputStream.writeBytes("\r\n--" + BOUNDARY + "--\r\n"); + dataOutputStream.flush(); + dataOutputStream.close(); + return true; + } catch (ConnectException e) { + showConnectException(); + return false; + } catch (IOException e) { + showSendDataException(); + return false; + } + } + + private String receiveData(URLConnection connection) { + try { + InputStream inputStream = connection.getInputStream(); + StringBuffer result = new StringBuffer(); + int read; + while ((read = inputStream.read()) != -1) { + result.append((char)read); + } + return result.toString(); + } catch (ConnectException e) { + showConnectException(); + return null; + } catch (FileNotFoundException e) { + showFileNotFoundException(); + return null; + } catch (IOException e) { + showReceiveDataException(); + return null; + } + + } + + private void showConstructUrlException() { + MessageDialog dialog = new MessageDialog( + jpdlEditor.getSite().getShell(), + "Invalid Connection URL", + null, + "The constructed URL is invalid. Check your connection parameters.", + SWT.ICON_ERROR, + new String[] { "OK" }, + 0); + dialog.open(); + } + + private void showConnectException() { + MessageDialog dialog = new MessageDialog( + jpdlEditor.getSite().getShell(), + "Connection Failed", + null, + "A connection to the server could not be established. " + + "Check your connection parameters and verify that the server is running.", + SWT.ICON_ERROR, + new String[] { "OK" }, + 0); + dialog.open(); + } + + private void showFileNotFoundException() { + MessageDialog dialog = new MessageDialog( + jpdlEditor.getSite().getShell(), + "Connection Failed", + null, + "The server deployer application could not be reached. " + + "Check your connection parameters and verify that the server is running.", + SWT.ICON_ERROR, + new String[] { "OK" }, + 0); + dialog.open(); + } + + private void showSendDataException() { + MessageDialog dialog = new MessageDialog( + jpdlEditor.getSite().getShell(), + "Deployment Failed", + null, + "Unexpected exception while sending the deployment archive to the server.", + SWT.ICON_ERROR, + new String[] { "OK" }, + 0); + dialog.open(); + } + + private void showReceiveDataException() { + MessageDialog dialog = new MessageDialog( + jpdlEditor.getSite().getShell(), + "Deployment Failed", + null, + "Unexpected exception while receiving the response from the server.", + SWT.ICON_ERROR, + new String[] { "OK" }, + 0); + dialog.open(); + } + +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ProcessArchiveDeployer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlContentProvider.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlContentProvider.java 2010-06-23 16:42:50 UTC (rev 22960) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlContentProvider.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -22,7 +22,6 @@ package org.jbpm.gd.jpdl.editor; import java.io.InputStreamReader; -import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; @@ -32,14 +31,15 @@ import org.dom4j.io.SAXReader; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IClassFile; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.ui.IFileEditorInput; import org.jbpm.gd.common.editor.AbstractContentProvider; import org.jbpm.gd.common.model.SemanticElement; import org.jbpm.gd.common.notation.Edge; @@ -47,12 +47,14 @@ import org.jbpm.gd.common.notation.NodeContainer; import org.jbpm.gd.common.notation.NotationElement; import org.jbpm.gd.common.notation.RootContainer; +import org.jbpm.gd.jpdl.Plugin; import org.jbpm.gd.jpdl.deployment.DeploymentInfo; import org.jbpm.gd.jpdl.model.NodeElement; import org.jbpm.gd.jpdl.model.NodeElementContainer; import org.jbpm.gd.jpdl.model.Transition; +import org.jbpm.gd.jpdl.prefs.PreferencesConstants; -public class JpdlContentProvider extends AbstractContentProvider{ +public class JpdlContentProvider extends AbstractContentProvider implements PreferencesConstants { JpdlEditor jpdlEditor; @@ -63,6 +65,9 @@ public String getNotationInfoFileName(String semanticInfoFileName) { if ("processdefinition.xml".equals(semanticInfoFileName)) { return "gpd.xml"; + } else if (semanticInfoFileName.endsWith("jpdl.xml")) { + int index = semanticInfoFileName.indexOf("jpdl.xml"); + return "." + semanticInfoFileName.substring(0, index) + "gpd.xml"; } else { return super.getNotationInfoFileName(semanticInfoFileName); } @@ -71,6 +76,9 @@ public String getDiagramImageFileName(String semanticInfoFileName) { if ("processdefinition.xml".equals(semanticInfoFileName)) { return "processimage.jpg"; + } else if (semanticInfoFileName.endsWith("jpdl.xml")) { + int index = semanticInfoFileName.indexOf("jpdl.xml"); + return semanticInfoFileName.substring(0, index) + "jpg"; } else { return super.getDiagramImageFileName(semanticInfoFileName); } @@ -121,43 +129,66 @@ } private void writeDeploymentInfo(DeploymentInfo deploymentInfo, Element element) { + if (deploymentInfo.isEmpty()) return; Element deploymentElement = addElement(element, "deployment"); - addAttribute(deploymentElement, "serverName", deploymentInfo.getServerName()); - addAttribute(deploymentElement, "serverPort", deploymentInfo.getServerPort()); - addAttribute(deploymentElement, "serverDeployer", deploymentInfo.getServerDeployer()); - Element classesAndResourcesElement = addElement(deploymentElement, "classesAndResources"); + if (deploymentInfo.getGraphicalInfoFile() != null) { + addAttribute(deploymentElement, "graphicalInfoFile", deploymentInfo.getGraphicalInfoFile().getFullPath().toString()); + } + if (deploymentInfo.getImageFile() != null) { + addAttribute(deploymentElement, "imageFile", deploymentInfo.getImageFile().getFullPath().toString()); + } + if (deploymentInfo.getServerName() != null) { + addAttribute(deploymentElement, "serverName", deploymentInfo.getServerName()); + } + if (deploymentInfo.getServerPort() != null) { + addAttribute(deploymentElement, "serverPort", deploymentInfo.getServerPort()); + } + if (deploymentInfo.getServerDeployer() != null) { + addAttribute(deploymentElement, "serverDeployer", deploymentInfo.getServerDeployer()); + } Object[] classesAndResources = deploymentInfo.getClassesAndResources(); - for (int i = 0; i < classesAndResources.length; i++) { - Object object = classesAndResources[i]; - String value = null; - if (object instanceof ICompilationUnit) { - value = ((ICompilationUnit)object).getResource().getFullPath().toString(); - } else if (object instanceof IResource) { - value = ((IResource)object).getFullPath().toString(); + if (classesAndResources.length > 0) { + Element classesAndResourcesElement = addElement(deploymentElement, "classesAndResources"); + for (int i = 0; i < classesAndResources.length; i++) { + String value = null; + String type = null; + if (classesAndResources[i] instanceof ICompilationUnit) { + value = ((ICompilationUnit)classesAndResources[i]).getPath().toString(); + type = "java"; + } else if (classesAndResources[i] instanceof IClassFile) { + value = ((IClassFile)classesAndResources[i]).getHandleIdentifier(); + type = "class"; + } else if (classesAndResources[i] instanceof IFile) { + value = ((IFile)classesAndResources[i]).getFullPath().toString(); + type = "file"; + } + if (value != null) { + Element el = addElement(classesAndResourcesElement, "element"); + addAttribute(el, "type", type); + addAttribute(el, "value", value); + } } - if (value != null) { - Element el = addElement(classesAndResourcesElement, "element"); - addAttribute(el, "value", value); - } } - Element filesAndFoldersElement = addElement(deploymentElement, "filesAndFolders"); - Object[] filesAndFolders = deploymentInfo.getFilesAndFolders(); - for (int i = 0; i < filesAndFolders.length; i++) { - Object object = filesAndFolders[i]; - if (object instanceof IFile) { - Element el = addElement(filesAndFoldersElement, "element"); - addAttribute(el, "value", ((IFile)object).getFullPath().toString()); + Object[] additionalFiles = deploymentInfo.getAdditionalFiles(); + if (additionalFiles.length > 0) { + Element filesAndFoldersElement = addElement(deploymentElement, "additionalFiles"); + for (int i = 0; i < additionalFiles.length; i++) { + if (additionalFiles[i] instanceof IFile) { + IFile file = (IFile)additionalFiles[i]; + Element el = addElement(filesAndFoldersElement, "element"); + addAttribute(el, "value", file.getFullPath().toString()); + } } } } - protected void addDeploymentInfo(DeploymentInfo deploymentInfo, IEditorInput editorInput) { + protected void initializeDeploymentInfo(DeploymentInfo deploymentInfo, IEditorInput editorInput) { try { - IFile file = getNotationInfoFile(((FileEditorInput)editorInput).getFile()); + IFile file = getNotationInfoFile(((IFileEditorInput)editorInput).getFile()); // the file should exist as this is performed by the addNotationInfo previously InputStreamReader reader = new InputStreamReader(file.getContents()); Element rootElement = new SAXReader().read(reader).getRootElement(); - processDeploymentInfo(deploymentInfo, rootElement); + processDeploymentInfo(deploymentInfo, rootElement, (IFileEditorInput)editorInput); } catch (DocumentException e) { e.printStackTrace(); throw new RuntimeException(e); @@ -167,66 +198,130 @@ } } - protected void processDeploymentInfo(DeploymentInfo deploymentInfo, Element element) { + protected void processDeploymentInfo(DeploymentInfo deploymentInfo, Element element, IFileEditorInput editorInput) { Element deploymentElement = element.element("deployment"); + processProcessInfoFile(deploymentInfo, deploymentElement, editorInput); + processGraphicalInfoFile(deploymentInfo, deploymentElement, editorInput); + processImageFile(deploymentInfo, deploymentElement, editorInput); + processClassesAndResources(deploymentInfo, deploymentElement, editorInput); + processAdditionalFiles(deploymentInfo, deploymentElement, editorInput); + processServerInfo(deploymentInfo, deploymentElement, editorInput); + } + + protected void processServerInfo(DeploymentInfo deploymentInfo, Element deploymentElement, IFileEditorInput editorInput) { if (deploymentElement == null) return; - processServerName(deploymentInfo, deploymentElement.attribute("serverName")); - processServerPort(deploymentInfo, deploymentElement.attribute("serverPort")); - processServerDeployer(deploymentInfo, deploymentElement.attribute("serverDeployer")); - processClassesAndResources(deploymentInfo, deploymentElement.element("classesAndResources")); - processFilesAndFolders(deploymentInfo, deploymentElement.element("filesAndFolders")); + IPreferenceStore prefs = Plugin.getDefault().getPreferenceStore(); + processServerName(deploymentInfo, deploymentElement.attribute("serverName"), prefs); + processServerPort(deploymentInfo, deploymentElement.attribute("serverPort"), prefs); + processServerDeployer(deploymentInfo, deploymentElement.attribute("serverDeployer"), prefs); + } - protected void processServerName(DeploymentInfo deploymentInfo, Attribute attribute) { - if (attribute == null) return; - String value = attribute.getValue(); - if (value == null) return; - deploymentInfo.setServerName(value); + private void processServerName(DeploymentInfo deploymentInfo, Attribute attribute, IPreferenceStore prefs) { + if (attribute == null) { + deploymentInfo.setServerName(prefs.getString(SERVER_NAME)); + } else { + deploymentInfo.setServerName(attribute.getValue()); + } } - protected void processServerPort(DeploymentInfo deploymentInfo, Attribute attribute) { - if (attribute == null) return; - String value = attribute.getValue(); - if (value == null) return; - deploymentInfo.setServerPort(value); + private void processServerPort(DeploymentInfo deploymentInfo, Attribute attribute, IPreferenceStore prefs) { + if (attribute == null) { + deploymentInfo.setServerPort(prefs.getString(SERVER_PORT)); + } else { + deploymentInfo.setServerPort(attribute.getValue()); + } } - protected void processServerDeployer(DeploymentInfo deploymentInfo, Attribute attribute) { - if (attribute == null) return; - String value = attribute.getValue(); - if (value == null) return; - deploymentInfo.setServerDeployer(value); + private void processServerDeployer(DeploymentInfo deploymentInfo, Attribute attribute, IPreferenceStore prefs) { + if (attribute == null) { + deploymentInfo.setServerDeployer(prefs.getString(SERVER_DEPLOYER)); + } else { + deploymentInfo.setServerDeployer(attribute.getValue()); + } } - protected void processClassesAndResources(DeploymentInfo deploymentInfo, Element element) { - if (element == null) return; - ArrayList classesAndResources = new ArrayList(); - List elements = element.elements("element"); + protected void processProcessInfoFile(DeploymentInfo deploymentInfo, Element deploymentElement, IFileEditorInput editorInput) { + deploymentInfo.setProcessInfoFile(editorInput.getFile()); + } + + protected void processGraphicalInfoFile(DeploymentInfo deploymentInfo, Element deploymentElement, IFileEditorInput editorInput) { + if (deploymentElement == null) return; + Attribute attribute = deploymentElement.attribute("graphicalInfoFile"); + if (attribute == null) { + attribute = deploymentElement.attribute("gpdFile"); + } + IFile graphicalInfoFile = null; + if (attribute != null && attribute.getValue() != null) { + IResource resource = editorInput.getFile().getWorkspace().getRoot().findMember(new Path(attribute.getValue())); + if (resource instanceof IFile) { + graphicalInfoFile = (IFile)resource; + } + } + deploymentInfo.setGraphicalInfoFile(graphicalInfoFile); + } + + protected void processImageFile(DeploymentInfo deploymentInfo, Element deploymentElement, IFileEditorInput editorInput) { + if (deploymentElement == null) return; + Attribute attribute = deploymentElement.attribute("imageFile"); + IFile imageFile = null; + if (attribute != null && attribute.getValue() != null) { + IResource resource = editorInput.getFile().getWorkspace().getRoot().findMember(new Path(attribute.getValue())); + if (resource instanceof IFile) { + imageFile = (IFile)resource; + } + } + deploymentInfo.setImageFile(imageFile); + } + + @SuppressWarnings("unchecked") + protected void processClassesAndResources(DeploymentInfo deploymentInfo, Element deploymentElement, IFileEditorInput editorInput) { + if (deploymentElement == null) return; + Element classesAndResourcesElement = deploymentElement.element("classesAndResources"); + if (classesAndResourcesElement == null) return; + List elements = classesAndResourcesElement.elements("element"); for (int i = 0; i < elements.size(); i++) { - String value = ((Element)elements.get(i)).attributeValue("value"); - IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(value)); - if (!file.exists()) continue; - IJavaElement javaElement = JavaCore.create(file); - if (javaElement != null) { - classesAndResources.add(javaElement); - } else { - classesAndResources.add(file); + Element element = (Element)elements.get(i); + String type = element.attributeValue("type"); + String value = element.attributeValue("value"); + if ("java".equals(type)) { + IResource resource = editorInput.getFile().getWorkspace().getRoot().findMember(new Path(value)); + if (resource instanceof IFile) { + IJavaElement javaElement = JavaCore.create((IFile)resource); + if (javaElement instanceof ICompilationUnit) { + deploymentInfo.addToClassesAndResources(javaElement); + } + } + } else if ("class".equals(type)) { + IJavaElement javaElement = JavaCore.create(value); + if (javaElement instanceof IClassFile) { + deploymentInfo.addToClassesAndResources(javaElement); + } + } else if ("file".equals(type)) { + IResource resource = editorInput.getFile().getWorkspace().getRoot().findMember(new Path(value)); + if (resource instanceof IFile) { + deploymentInfo.addToClassesAndResources(resource); + } } } - deploymentInfo.setClassesAndResources(classesAndResources.toArray()); } - protected void processFilesAndFolders(DeploymentInfo deploymentInfo, Element element) { - if (element == null) return; - ArrayList filesAndFolders = new ArrayList(); - List elements = element.elements("element"); + @SuppressWarnings("unchecked") + protected void processAdditionalFiles(DeploymentInfo deploymentInfo, Element deploymentElement, IFileEditorInput editorInput) { + if (deploymentElement == null) return; + Element additionalFilesElement = deploymentElement.element("additionalFiles"); + if (additionalFilesElement == null) { + additionalFilesElement = deploymentElement.element("filesAndFolders"); + } + if (additionalFilesElement == null) return; + List elements = additionalFilesElement.elements("element"); for (int i = 0; i < elements.size(); i++) { String value = ((Element)elements.get(i)).attributeValue("value"); - IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(value)); - if (!file.exists()) continue; - filesAndFolders.add(file); + IResource resource = editorInput.getFile().getWorkspace().getRoot().findMember(new Path(value)); + if (resource instanceof IFile) { + deploymentInfo.addToAdditionalFiles(resource); + } } - deploymentInfo.setFilesAndFolders(filesAndFolders.toArray()); } Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlDeploymenEditorPage.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlDeploymenEditorPage.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlDeploymenEditorPage.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.gd.jpdl.editor; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorSite; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.forms.widgets.FormToolkit; +import org.eclipse.ui.forms.widgets.ScrolledForm; +import org.eclipse.ui.part.EditorPart; +import org.jbpm.gd.jpdl.deployment.DeploymentForm; + +public class JpdlDeploymenEditorPage extends EditorPart { + + JpdlEditor editor; + DeploymentForm deploymentInfoForm; + + public JpdlDeploymenEditorPage(JpdlEditor editor) { + this.editor = editor; + } + + public void createPartControl(Composite parent) { + FormToolkit toolkit = new FormToolkit(parent.getDisplay()); + ScrolledForm form = toolkit.createScrolledForm(parent); + form.setText("Deployment"); + setPartLayout(form); + createForm(toolkit, form.getBody()); + } + + private void setPartLayout(ScrolledForm form) { + GridLayout layout = new GridLayout(); + layout.numColumns = 1; + form.getBody().setLayout(layout); + } + + private void createForm(FormToolkit toolkit, Composite form) { + deploymentInfoForm = new DeploymentForm(toolkit, form, editor); + deploymentInfoForm.create(); + deploymentInfoForm.refresh(); + } + + public void setFocus() { + } + + public void doSave(IProgressMonitor monitor) { + } + + public void doSaveAs() { + } + + public boolean isDirty() { + return false; + } + + public boolean isSaveAsAllowed() { + return false; + } + + public void init(IEditorSite site, IEditorInput input) throws PartInitException { + setSite(site); + setInput(input); + } + +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlDeploymenEditorPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlDeploymentEditorPage.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlDeploymentEditorPage.java 2010-06-23 16:42:50 UTC (rev 22960) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlDeploymentEditorPage.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -1,113 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.gd.jpdl.editor; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IResourceChangeEvent; -import org.eclipse.core.resources.IResourceChangeListener; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorSite; -import org.eclipse.ui.IFileEditorInput; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.ScrolledForm; -import org.eclipse.ui.part.EditorPart; -import org.jbpm.gd.jpdl.deployment.DeploymentForm; -import org.jbpm.gd.jpdl.deployment.DeploymentInfo; - -public class JpdlDeploymentEditorPage extends EditorPart { - - JpdlEditor editor; - DeploymentForm deploymentForm; - - public JpdlDeploymentEditorPage(JpdlEditor editor) { - this.editor = editor; - } - - public void createPartControl(Composite parent) { - FormToolkit toolkit = new FormToolkit(parent.getDisplay()); - ScrolledForm form = toolkit.createScrolledForm(parent); - form.setText("Deployment"); - setPartLayout(form); - createForm(toolkit, form.getBody()); - } - - private void setPartLayout(ScrolledForm form) { - GridLayout layout = new GridLayout(); - layout.numColumns = 1; - form.getBody().setLayout(layout); - } - - private void createForm(FormToolkit toolkit, Composite form) { - IFolder folder = getProcessFolder(); - deploymentForm = new DeploymentForm(toolkit, form, folder, editor); - deploymentForm.create(); -// folder.getWorkspace().addResourceChangeListener(new IResourceChangeListener() { -// public void resourceChanged(IResourceChangeEvent event) { -// deploymentForm.refresh(); -// } -// }); - } - - private IFolder getProcessFolder() { - IFile file = ((IFileEditorInput)editor.getEditorInput()).getFile(); - if (file.getParent() instanceof IFolder) { - return (IFolder)file.getParent(); - } - return null; - } - - public void setFocus() { - } - - public void doSave(IProgressMonitor monitor) { - } - - public DeploymentInfo getDeploymentInfo() { - return deploymentForm.getDeploymentInfo(); - } - - public void setDeploymentInfo(DeploymentInfo deploymentInfo) { - deploymentForm.setDeploymentInfo(deploymentInfo); - } - - public void doSaveAs() { - } - - public boolean isDirty() { - return false; - } - - public boolean isSaveAsAllowed() { - return false; - } - - public void init(IEditorSite site, IEditorInput input) throws PartInitException { - setSite(site); - setInput(input); - } - -} Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlEditor.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlEditor.java 2010-06-23 16:42:50 UTC (rev 22960) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlEditor.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -21,20 +21,9 @@ */ package org.jbpm.gd.jpdl.editor; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResourceChangeEvent; -import org.eclipse.core.resources.IResourceChangeListener; -import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.resources.WorkspaceJob; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorSite; -import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.FileEditorInput; import org.jbpm.gd.common.editor.ContentProvider; @@ -50,58 +39,28 @@ public class JpdlEditor extends Editor { - private IResourceChangeListener resourceChangeListener; - private JpdlDeploymentEditorPage deploymentEditorPage; + private JpdlDeploymenEditorPage deploymentInfoEditorPage; + private DeploymentInfo deploymentInfo; public void init(IEditorSite site, IEditorInput input) throws PartInitException { super.init(site, input); - initResourceChangeListener(); initPartName(); } - private void initResourceChangeListener() { - resourceChangeListener = new IResourceChangeListener() { - public void resourceChanged(IResourceChangeEvent event) { - handleResourceChange(event); - } - }; - getWorkspace().addResourceChangeListener(resourceChangeListener); - } - - - private void handleResourceChange(IResourceChangeEvent event) { - if (event.getType() == IResourceChangeEvent.POST_CHANGE) { - IFile file = ((IFileEditorInput)getEditorInput()).getFile(); - if (!file.exists()) { - deleteProcessFolder(file); - } - } - } - - private void deleteProcessFolder(IFile file) { - final IContainer processFolder = getWorkspace().getRoot().getFolder(file.getFullPath().removeLastSegments(1)); - if (processFolder != null && processFolder.exists()) { - WorkspaceJob job = new WorkspaceJob("delete") { - public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { - processFolder.delete(true, null); - return Status.OK_STATUS; - } - }; - job.setRule(getWorkspace().getRuleFactory().deleteRule(processFolder)); - job.schedule(); - } - } - - private IWorkspace getWorkspace() { - return ((IFileEditorInput)getEditorInput()).getFile().getWorkspace(); - } - private void initPartName() { FileEditorInput fileInput = (FileEditorInput) getEditorInput(); - IPath path = fileInput.getPath().removeLastSegments(1); - path = path.removeFirstSegments(path.segmentCount() - 1); - setPartName(path.lastSegment()); + String fileName = fileInput.getFile().getName(); + String processName = fileName; + if ("processdefinition.xml".equals(fileName)) { + IPath path = fileInput.getPath().removeLastSegments(1); + path = path.removeFirstSegments(path.segmentCount() - 1); + processName = path.lastSegment(); + } else if (fileName.endsWith(".jpdl.xml")){ + int index = fileName.indexOf(".jpdl.xml"); + processName = fileName.substring(0, index); + } + setPartName(processName); } protected SelectionSynchronizer createSelectionSynchronizer() { @@ -130,15 +89,13 @@ protected void createPages() { super.createPages(); - initDeploymentPage(); + initDeploymentInfoPage(); } - protected void initDeploymentPage() { - deploymentEditorPage = new JpdlDeploymentEditorPage(this); - addPage(1, deploymentEditorPage, "Deployment"); - DeploymentInfo deploymentInfo = getDeploymentInfo(); - ((JpdlContentProvider)getContentProvider()).addDeploymentInfo(deploymentInfo, getEditorInput()); - deploymentEditorPage.setDeploymentInfo(deploymentInfo); + protected void initDeploymentInfoPage() { + ((JpdlContentProvider)getContentProvider()).initializeDeploymentInfo(getDeploymentInfo(), getEditorInput()); + deploymentInfoEditorPage = new JpdlDeploymenEditorPage(this); + addPage(1, deploymentInfoEditorPage, "DeploymentInfo"); } protected SemanticElement createMainElement() { @@ -150,12 +107,15 @@ } public DeploymentInfo getDeploymentInfo() { - return deploymentEditorPage.getDeploymentInfo(); + if (deploymentInfo == null) { + deploymentInfo = new DeploymentInfo(); + } + return deploymentInfo; } - - public void dispose() { - getWorkspace().removeResourceChangeListener(resourceChangeListener); - super.dispose(); + + @SuppressWarnings("restriction") + public boolean isSaveOnCloseNeeded() { + return isDirty() || super.isSaveOnCloseNeeded(); } } Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/Jbpm3PreferencesManager.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/Jbpm3PreferencesManager.java 2010-06-23 16:42:50 UTC (rev 22960) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/Jbpm3PreferencesManager.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -30,7 +30,7 @@ public class Jbpm3PreferencesManager extends PreferencesManager { public static final Jbpm3PreferencesManager INSTANCE = new Jbpm3PreferencesManager(); - + protected Jbpm3PreferencesManager() { super(); initialize(); @@ -52,6 +52,7 @@ installationsFile.delete(); } + @SuppressWarnings("deprecation") private void initializePreferredJbpmName() { String preferredJbpmName = Plugin.getDefault().getPluginPreferences().getString(Constants.JBPM_NAME); if (preferredJbpmName != null) { Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/PreferencesConstants.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/PreferencesConstants.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/PreferencesConstants.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -0,0 +1,12 @@ +package org.jbpm.gd.jpdl.prefs; + +public interface PreferencesConstants { + + public final String SERVER_NAME = "server name"; + public final String SERVER_PORT = "server port"; + public final String SERVER_DEPLOYER = "server deployer"; + public final String USE_CREDENTIALS = "use credentials"; + public final String USER_NAME = "user name"; + public final String PASSWORD = "password"; + +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/PreferencesConstants.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/ServerDeploymentPage.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/ServerDeploymentPage.java 2010-06-23 16:42:50 UTC (rev 22960) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/ServerDeploymentPage.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -35,10 +35,9 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import org.jbpm.gd.jpdl.Constants; import org.jbpm.gd.jpdl.Plugin; -public class ServerDeploymentPage extends PreferencePage implements IWorkbenchPreferencePage, Constants { +public class ServerDeploymentPage extends PreferencePage implements IWorkbenchPreferencePage, PreferencesConstants { private Text nameText, portText, deployerText, usernameText, passwordText; private Button useCredentialsCheckbox; @@ -142,12 +141,12 @@ } public boolean performOk() { - getPreferenceStore().setValue("server name", nameText.getText()); - getPreferenceStore().setValue("server port", portText.getText()); - getPreferenceStore().setValue("server deployer", deployerText.getText()); - getPreferenceStore().setValue("use credentials", useCredentialsCheckbox.getSelection()); - getPreferenceStore().setValue("user name", useCredentialsCheckbox.getSelection() ? usernameText.getText() : ""); - getPreferenceStore().setValue("password", useCredentialsCheckbox.getSelection() ? passwordText.getText() : ""); + getPreferenceStore().setValue(SERVER_NAME, nameText.getText()); + getPreferenceStore().setValue(SERVER_PORT, portText.getText()); + getPreferenceStore().setValue(SERVER_DEPLOYER, deployerText.getText()); + getPreferenceStore().setValue(USE_CREDENTIALS, useCredentialsCheckbox.getSelection()); + getPreferenceStore().setValue(USER_NAME, useCredentialsCheckbox.getSelection() ? usernameText.getText() : ""); + getPreferenceStore().setValue(PASSWORD, useCredentialsCheckbox.getSelection() ? passwordText.getText() : ""); return true; } @@ -158,12 +157,12 @@ useCredentialsCheckbox.setSelection(false); usernameText.setText(null); passwordText.setText(null); - getPreferenceStore().setValue("server name", "localhost"); - getPreferenceStore().setValue("server port", "8080"); - getPreferenceStore().setValue("server deployer", "/jbpm-console/upload"); - getPreferenceStore().setValue("use credentials", false); - getPreferenceStore().setValue("user name", ""); - getPreferenceStore().setValue("password", ""); + getPreferenceStore().setValue(SERVER_NAME, "localhost"); + getPreferenceStore().setValue(SERVER_PORT, "8080"); + getPreferenceStore().setValue(SERVER_DEPLOYER, "/jbpm-console/upload"); + getPreferenceStore().setValue(USE_CREDENTIALS, false); + getPreferenceStore().setValue(USER_NAME, ""); + getPreferenceStore().setValue(PASSWORD, ""); } } Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/util/ProcessDeployer.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/util/ProcessDeployer.java 2010-06-23 16:42:50 UTC (rev 22960) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/util/ProcessDeployer.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -44,6 +44,7 @@ Shell shell; IFolder processFolder; + IFile processFile; String serverName; String serverPort; String serverDeployer; @@ -62,6 +63,10 @@ this.processFolder = processFolder; } + public void setProcessFile(IFile file) { + this.processFile = file; + } + public void setServerName(String serverName) { this.serverName = serverName; } @@ -362,11 +367,15 @@ } private URL[] getProjectClasspathUrls() throws CoreException, MalformedURLException { + URL[] urls = new URL[0]; IProject project = processFolder.getProject(); IJavaProject javaProject = JavaCore.create(project); + if (javaProject == null) { + return urls; + } String[] pathArray = JavaRuntime .computeDefaultRuntimeClassPath(javaProject); - URL[] urls = new URL[pathArray.length]; + urls = new URL[pathArray.length]; for (int i = 0; i < pathArray.length; i++) { urls[i] = new File(pathArray[i]).toURI().toURL(); } Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/ConfigureRuntimePage.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/ConfigureRuntimePage.java 2010-06-23 16:42:50 UTC (rev 22960) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/ConfigureRuntimePage.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -32,13 +32,11 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.program.Program; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Link; import org.eclipse.swt.widgets.Text; public class ConfigureRuntimePage extends WizardPage { Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizard.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizard.java 2010-06-23 16:42:50 UTC (rev 22960) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizard.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -74,10 +74,9 @@ public boolean performFinish() { try { IFolder folder = page.getProcessFolder(); - folder.create(true, true, null); - IFile processDefinitionFile = folder.getFile("processdefinition.xml"); + IFile processDefinitionFile = folder.getFile(page.getProcessName() + ".jpdl.xml"); processDefinitionFile.create(createInitialProcessDefinition(), true, null); - IFile gpdFile = folder.getFile("gpd.xml"); + IFile gpdFile = folder.getFile("." + page.getProcessName() + ".gpd.xml"); gpdFile.create(createInitialGpdInfo(), true, null); IDE.openEditor(getActivePage(), processDefinitionFile); openPropertiesView(); @@ -108,13 +107,11 @@ } private ByteArrayInputStream createInitialProcessDefinition() throws JavaModelException { - String parName = page.getProcessFolder().getName(); - String processName = parName; //.substring(0, parName.indexOf(".par")); StringBuffer buffer = new StringBuffer(); buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); buffer.append("\n"); buffer.append("\n"); - buffer.append("<process-definition" + getSchemaText() + " name=\"" + processName + "\"></process-definition>"); + buffer.append("<process-definition" + getSchemaText() + " name=\"" + page.getProcessName() + "\"></process-definition>"); return new ByteArrayInputStream(buffer.toString().getBytes()); } Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java 2010-06-23 16:42:50 UTC (rev 22960) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java 2010-06-23 16:55:53 UTC (rev 22961) @@ -24,13 +24,12 @@ import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.jdt.core.JavaCore; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.IStructuredSelection; @@ -55,11 +54,11 @@ public class NewProcessDefinitionWizardPage extends WizardPage { private Text containerText; - private Text processText; + private Text processNameText; private Button browseButton; - + private IWorkspaceRoot workspaceRoot; - private String containerName; + private String containerName; public NewProcessDefinitionWizardPage() { super("Process Definition"); @@ -77,6 +76,12 @@ } else if (IContainer.class.isInstance(object)) { container = (IContainer)object; } + } else { + IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot(); + IProject[] projects = workspaceRoot.getProjects(); + if (projects != null && projects.length != 0) { + container = projects[0]; + } } initContainerName(container); } @@ -84,23 +89,13 @@ public void createControl(Composite parent) { initializeDialogUnits(parent); Composite composite = createClientArea(parent); -// createLabel(composite); + createProcessNameField(composite); createContainerField(composite); - createProcessField(composite); setControl(composite); Dialog.applyDialogFont(composite); - setPageComplete(false); + checkPage(); } -// private void createLabel(Composite composite) { -// Label label= new Label(composite, SWT.WRAP); -// label.setText("Choose a source folder and a process definition name."); -// GridData gd= new GridData(); -// gd.widthHint= convertWidthInCharsToPixels(80); -// gd.horizontalSpan= 3; -// label.setLayoutData(gd); -// } - private Composite createClientArea(Composite parent) { Composite composite= new Composite(parent, SWT.NONE); GridLayout layout= new GridLayout(); @@ -113,12 +108,12 @@ private void createContainerField(Composite parent) { Label label = new Label(parent, SWT.NONE); - label.setText("Source folder : "); + label.setText("Source Folder: "); containerText = new Text(parent, SWT.BORDER); containerText.setText(containerName); containerText.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { - verifyContentsValid(); + checkPage(); } }); GridData gd = new GridData(GridData.FILL_HORIZONTAL); @@ -132,22 +127,41 @@ }); gd = new GridData(); gd.widthHint = convertWidthInCharsToPixels(15); + gd.heightHint = 18; browseButton.setLayoutData(gd); } - private void createProcessField(Composite parent) { + private void createProcessNameField(Composite parent) { Label label = new Label(parent, SWT.NONE); - label.setText("Process name : "); - processText = new Text(parent, SWT.BORDER); - processText.addModifyListener(new ModifyListener() { + label.setText("Process Name: "); + processNameText = new Text(parent, SWT.BORDER); + processNameText.setText(findInitialProcessName()); + processNameText.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { - verifyContentsValid(); + checkPage(); } }); - GridData gd = new GridData(GridData.FILL_HORIZONTAL); - processText.setLayoutData(gd); + processNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + new Label(parent, SWT.NONE); } + private String findInitialProcessName() { + String baseName = "process"; + String result = baseName; + if (processExists(result)) { + int runner = 1; + do { + result = baseName + "-" + runner; + } while (processExists(result)); + } + return result; + } + + private boolean processExists(String name) { + IResource resource = workspaceRoot.findMember(new Path(containerName).append(name + ".jpdl.xml")); + return resource != null && resource.exists(); + } + private void chooseContainer() { WorkbenchContentProvider provider= new WorkbenchContentProvider(); ILabelProvider labelProvider= new WorkbenchLabelProvider(); @@ -164,16 +178,7 @@ private ViewerFilter createViewerFilter() { ViewerFilter filter= new ViewerFilter() { public boolean select(Viewer viewer, Object parent, Object element) { - if (!(element instanceof IContainer)) { - return false; - } - boolean isJavaProjectMember = false; - try { - isJavaProjectMember = ((IContainer)element).getProject().hasNature(JavaCore.NATURE_ID); - } catch (CoreException ce) { - // Ignore - } - return isJavaProjectMember; + return element instanceof IContainer; } }; return filter; @@ -184,54 +189,51 @@ containerName = (elem == null) ? "" : elem.getFullPath().makeRelative().toString(); } - private void verifyContentsValid() { - if (!checkContainerPathValid()) { - setErrorMessage("Source folder is not valid."); + private void checkPage() { + if (!checkProcessNameText()) return; + if (!checkContainerText()) return; + } + + private boolean checkContainerText() { + if ("".equals(containerText.getText())) { + setMessage("Select the source folder or enter its name."); setPageComplete(false); - } else if (isProcessNameEmpty()) { - setErrorMessage("Enter a name for the process."); - setPageComplete(false); - } else if (processExists()){ - setErrorMessage("A process with this name already exists."); - setPageComplete(false); + return false; + } else if (!containerExists()) { + setMessage("The source folder does not exist and will be created."); + setPageComplete(true); + return true; } else { - setErrorMessage(null); + setMessage(null); setPageComplete(true); + return true; } } - private boolean processExists() { - IPath path = new Path(containerText.getText()).append(getProcessName()); - return workspaceRoot.getFolder(path).exists(); + private boolean containerExists() { + IPath path = new Path(containerText.getText()); + IResource resource = workspaceRoot.findMember(path); + return resource != null && resource.exists(); } - private boolean isProcessNameEmpty() { - String str = processText.getText(); - return str == null || "".equals(str); - } - - private boolean checkContainerPathValid() { - if ("".equals(containerText.getText())) { + private boolean checkProcessNameText() { + if ("".equals(processNameText.getText())) { + setMessage("Enter a name for the process."); + setPageComplete(false); return false; + } else { + setMessage(null); + setPageComplete(true); + return true; } - IPath path = new Path(containerText.getText()); - IResource resource = workspaceRoot.findMember(path); - boolean isJavaProject = false; - try { - isJavaProject = resource.getProject().hasNature(JavaCore.NATURE_ID); - } catch (CoreException ce) { - // Ignore - } - return resource.exists() && isJavaProject; } - private String getProcessName() { - return processText.getText(); // + ".par"; + public IFolder getProcessFolder() { + return workspaceRoot.getFolder(new Path(containerText.getText())); } - public IFolder getProcessFolder() { - IPath path = new Path(containerText.getText()).append(getProcessName()); - return workspaceRoot.getFolder(path); + public String getProcessName() { + return processNameText.getText(); } }

15 years, 10 months

1
0
0 / 0

← Newer
1
...
15
16
17
18
19
20
21
...
69
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits June 2010