April 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r21563 - branches/modular_build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-04-20 22:15:52 -0400 (Tue, 20 Apr 2010) New Revision: 21563 Modified: branches/modular_build/genpom.xml Log: name script for use in Ant view Modified: branches/modular_build/genpom.xml =================================================================== --- branches/modular_build/genpom.xml 2010-04-21 02:03:55 UTC (rev 21562) +++ branches/modular_build/genpom.xml 2010-04-21 02:15:52 UTC (rev 21563) @@ -1,4 +1,4 @@ -<project default="run" basedir="."> +<project default="run" basedir="." name="jbosstools genpom.xml">  <property name="projectName" value="org.jboss.tools" /> <property name="pathToParentPom" value="" />

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21562 - branches/modular_build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-04-20 22:03:55 -0400 (Tue, 20 Apr 2010) New Revision: 21562 Modified: branches/modular_build/parent-pom.xml Log: use tycho 0.9, add distributionManagement, add wagons for ssh publishing (not working), fix apache.org repo, formatting Modified: branches/modular_build/parent-pom.xml =================================================================== --- branches/modular_build/parent-pom.xml 2010-04-21 01:24:53 UTC (rev 21561) +++ branches/modular_build/parent-pom.xml 2010-04-21 02:03:55 UTC (rev 21562) @@ -8,7 +8,9 @@ <packaging>pom</packaging> <properties> - <tychoVersion>0.8.0</tychoVersion> + <tychoVersion>0.9.0-SNAPSHOT</tychoVersion> +  + <scmBranch>modular_build</scmBranch> </properties> <build> @@ -56,12 +58,9 @@ </configuration> </plugin> -  +  <plugin> <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId> @@ -89,9 +88,51 @@ <parallel>true</parallel> </configuration> </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.5</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.4.2</version> + <configuration> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + </plugins> +  + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh</artifactId> + <version>1.0-beta-6</version> + </extension> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>1.0-beta-6</version> + </extension> + </extensions> </build> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbosstools/branches/${scmBranch} + </connection> + <developerConnection>scm:svn:http://anonsvn.jboss.org/repos/jbosstools/branches/${scmBranch} + </developerConnection> + <url>http://anonsvn.jboss.org/repos/jbosstools/branches/${scmBranch} + </url> + </scm> + + <issueManagement> + <system>jira</system> + <url>https://jira.jboss.org/jira/secure/</url> + </issueManagement> + <profiles> <profile> <id>helios</id> @@ -169,7 +210,8 @@ </repository> <repository> <id>subversive07</id> - <url>http://download.eclipse.org/technology/subversive/0.7/update-site/</url> + <url>http://download.eclipse.org/technology/subversive/0.7/update-site/ + </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -180,7 +222,8 @@ </repository> <repository> <id>subversive20</id> - <url>http://community.polarion.com/projects/subversive/download/eclipse/2.0/up...</url> + <url>http://community.polarion.com/projects/subversive/download/eclipse/2.0/up... + </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -301,7 +344,7 @@ </pluginRepository> <pluginRepository> <id>maven-snapshots-sonatype</id> - <url>http://repository.apache.org/content/repositories/maven-snapshots-sonatype/ + <url>https://repository.apache.org/content/repositories/maven-snapshots-sonatype/ </url> <snapshots> <enabled>true</enabled> @@ -310,9 +353,9 @@ <enabled>true</enabled> </releases> </pluginRepository> -  + </pluginRepository> </pluginRepositories> + +  + <distributionManagement> +  +  +  +  + +  +  +  +  + </distributionManagement> </project>

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21561 - in branches/modular_build/xulrunner: plugins/org.mozilla.xulrunner.carbon.macosx/META-INF and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-04-20 21:24:53 -0400 (Tue, 20 Apr 2010) New Revision: 21561 Modified: branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx/META-INF/MANIFEST.MF branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/META-INF/MANIFEST.MF branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF Log: trying to get xulrunner to build on RHEL4/Hudson - carbon.macosx not matching platform filter Modified: branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml =================================================================== --- branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2010-04-20 17:33:00 UTC (rev 21560) +++ branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2010-04-21 01:24:53 UTC (rev 21561) @@ -67,7 +67,6 @@ id="org.mozilla.xulrunner.carbon.macosx" os="macosx" ws="carbon" - arch="x86" download-size="0" install-size="0" version="0.0.0" Modified: branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx/META-INF/MANIFEST.MF =================================================================== --- branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx/META-INF/MANIFEST.MF 2010-04-20 17:33:00 UTC (rev 21560) +++ branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx/META-INF/MANIFEST.MF 2010-04-21 01:24:53 UTC (rev 21561) @@ -5,6 +5,5 @@ ue Bundle-Version: 1.9.1.2 Bundle-Vendor: mozilla.org -Eclipse-PlatformFilter: (& (osgi.ws=carbon) (osgi.os=macosx) (|(osgi.a - rch=x86)(osgi.arch=ppc)) ) +Eclipse-PlatformFilter: (& (osgi.ws=carbon)(osgi.os=macosx)) Modified: branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/META-INF/MANIFEST.MF =================================================================== --- branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/META-INF/MANIFEST.MF 2010-04-20 17:33:00 UTC (rev 21560) +++ branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/META-INF/MANIFEST.MF 2010-04-21 01:24:53 UTC (rev 21561) @@ -5,6 +5,5 @@ ue Bundle-Version: 1.9.1.2 Bundle-Vendor: mozilla.org -Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (|(osgi.a - rch=x86)(osgi.arch=ppc)) ) +Eclipse-PlatformFilter: (& (osgi.ws=cocoa)(osgi.os=macosx)) Modified: branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF =================================================================== --- branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF 2010-04-20 17:33:00 UTC (rev 21560) +++ branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF 2010-04-21 01:24:53 UTC (rev 21561) @@ -5,6 +5,5 @@ ue Bundle-Version: 1.9.1.2 Bundle-Vendor: mozilla.org -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x - 86)) +Eclipse-PlatformFilter: (& (osgi.ws=gtk)(osgi.os=linux)(osgi.arch=x86)) Modified: branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF =================================================================== --- branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF 2010-04-20 17:33:00 UTC (rev 21560) +++ branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF 2010-04-21 01:24:53 UTC (rev 21561) @@ -5,6 +5,5 @@ =true Bundle-Version: 1.9.1.2a Bundle-Vendor: mozilla.org -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x - 86_64)) +Eclipse-PlatformFilter: (& (osgi.ws=gtk)(osgi.os=linux)(osgi.arch=x86_64)) Modified: branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF =================================================================== --- branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF 2010-04-20 17:33:00 UTC (rev 21560) +++ branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF 2010-04-21 01:24:53 UTC (rev 21561) @@ -5,6 +5,5 @@ true Bundle-Version: 1.9.1.2 Bundle-Vendor: mozilla.org -Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch= - x86)) +Eclipse-PlatformFilter: (& (osgi.ws=win32)(osgi.os=win32)(osgi.arch=x86))

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21560 - branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-04-20 13:33:00 -0400 (Tue, 20 Apr 2010) New Revision: 21560 Modified: branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml Log: typo in feature.xml Modified: branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml =================================================================== --- branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2010-04-20 15:52:21 UTC (rev 21559) +++ branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2010-04-20 17:33:00 UTC (rev 21560) @@ -66,7 +66,7 @@ <plugin id="org.mozilla.xulrunner.carbon.macosx" os="macosx" - ws="carmon" + ws="carbon" arch="x86" download-size="0" install-size="0"

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21559 - in branches/jbosstools-3.1.x: jsf/plugins/org.jboss.tools.jsf.text.ext.facelets and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2010-04-20 11:52:21 -0400 (Tue, 20 Apr 2010) New Revision: 21559 Added: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/tools/jsf/text/ext/facelets/hyperlink/FaceletsCSSClassHyperlink.java branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/tools/jsf/text/ext/facelets/hyperlink/FaceletsCSSClassHyperlinkPartitioner.java Removed: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesCSSClassHyperlink.java branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesCSSClassHyperlinkPartitioner.java Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/HyperlinkPartitionerDefinition.java branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-5986 Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/HyperlinkPartitionerDefinition.java =================================================================== --- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/HyperlinkPartitionerDefinition.java 2010-04-20 15:19:22 UTC (rev 21558) +++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/HyperlinkPartitionerDefinition.java 2010-04-20 15:52:21 UTC (rev 21559) @@ -376,7 +376,7 @@ return false; } } else { - int currentIndex = path.indexOf(fDelimitedPathElements[i]); + int currentIndex = path.lastIndexOf(fDelimitedPathElements[i]); if(currentIndex>-1 && currentIndex>lastIndex) { lastIndex = currentIndex; if(fDelimitedPathElements[i].startsWith(TAGLIB)) Modified: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml =================================================================== --- branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml 2010-04-20 15:19:22 UTC (rev 21558) +++ branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml 2010-04-20 15:52:21 UTC (rev 21559) @@ -107,6 +107,63 @@ </partitionType> </contentType> </hyperlinkPartitioner> + + <hyperlinkPartitioner + id="org.jboss.tools.jsf.text.ext.facelets.hyperlink.FaceletsCSSClassHyperlinkPartitioner" + class="org.jboss.tools.jsf.text.ext.facelets.hyperlink.FaceletsCSSClassHyperlinkPartitioner"> + + <contentType id="org.eclipse.jst.jsp.core.jspsource"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://java.sun.com/jsf/html]:*/columnClasses/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/footerClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/headerClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/rowClasses/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/captionClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/styleClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/errorClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/fatalClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/infoClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/warnClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/disabledClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/enabledClass/" /> + </partitionType> + </contentType> + <contentType id="org.eclipse.wst.html.core.htmlsource"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://java.sun.com/jsf/html]:*/columnClasses/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/footerClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/headerClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/rowClasses/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/captionClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/styleClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/errorClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/fatalClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/infoClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/warnClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/disabledClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/enabledClass/" /> + </partitionType> + </contentType> + </hyperlinkPartitioner> + + </extension> + + <extension + point="org.jboss.tools.common.text.ext.hyperlink" + id="org.jboss.tools.common.text.ext.jsf.facelets.hyperlink" + name="org.jboss.tools.common.text.ext.jsf.facelets.hyperlink"> + + <hyperlink + class="org.jboss.tools.jsf.text.ext.facelets.hyperlink.FaceletsCSSClassHyperlink" + id="org.jboss.tools.jsf.text.ext.facelets.hyperlink.FaceletsCSSClassHyperlink"> + <contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource"> + <partitiontype id="org.jboss.tools.common.text.ext.FACELETS_CSS_CLASS" /> + </contenttypeidentifier> + <contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource"> + <partitiontype id="org.jboss.tools.common.text.ext.FACELETS_CSS_CLASS" /> + </contenttypeidentifier> + </hyperlink> + </extension> <extension point="org.jboss.tools.jst.web.kb.KbIncludeContext"> Added: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/tools/jsf/text/ext/facelets/hyperlink/FaceletsCSSClassHyperlink.java =================================================================== --- branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/tools/jsf/text/ext/facelets/hyperlink/FaceletsCSSClassHyperlink.java (rev 0) +++ branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/tools/jsf/text/ext/facelets/hyperlink/FaceletsCSSClassHyperlink.java 2010-04-20 15:52:21 UTC (rev 21559) @@ -0,0 +1,37 @@ +/******************************************************************************* + * Copyright (c) 2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.jsf.text.ext.facelets.hyperlink; + +import java.text.MessageFormat; + +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; +import org.jboss.tools.jst.text.ext.hyperlink.CSSClassHyperlink; + +/** + * + * @author Victor Rubezhny + * + */ +public class FaceletsCSSClassHyperlink extends CSSClassHyperlink { + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String styleName = getStyleName(fLastRegion); + if (styleName == null) + return MessageFormat.format(Messages.OpenA, Messages.CSSStyle); + + return MessageFormat.format(Messages.OpenCSSStyle, styleName); + } +} Property changes on: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/tools/jsf/text/ext/facelets/hyperlink/FaceletsCSSClassHyperlink.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/tools/jsf/text/ext/facelets/hyperlink/FaceletsCSSClassHyperlinkPartitioner.java =================================================================== --- branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/tools/jsf/text/ext/facelets/hyperlink/FaceletsCSSClassHyperlinkPartitioner.java (rev 0) +++ branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/tools/jsf/text/ext/facelets/hyperlink/FaceletsCSSClassHyperlinkPartitioner.java 2010-04-20 15:52:21 UTC (rev 21559) @@ -0,0 +1,40 @@ +/******************************************************************************* + * Copyright (c) 2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.jsf.text.ext.facelets.hyperlink; + +import org.eclipse.jface.text.IDocument; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.jst.text.ext.hyperlink.CSSClassHyperlinkPartitioner; + +/** + * + * @author Victor Rubezhny + * + */ +public class FaceletsCSSClassHyperlinkPartitioner extends CSSClassHyperlinkPartitioner { + public static final String FACELETS_CSS_CLASS_PARTITION = "org.jboss.tools.common.text.ext.FACELETS_CSS_CLASS"; //$NON-NLS-1$ + + + @Override + public boolean recognize(IDocument document, IHyperlinkRegion region) { + if (region.getAxis() != null){ + return true; + } + return false; + } + + @Override + protected String getPartitionType(String axis) { + return FACELETS_CSS_CLASS_PARTITION; + } + +} Property changes on: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/tools/jsf/text/ext/facelets/hyperlink/FaceletsCSSClassHyperlinkPartitioner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml =================================================================== --- branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml 2010-04-20 15:19:22 UTC (rev 21558) +++ branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml 2010-04-20 15:52:21 UTC (rev 21559) @@ -315,14 +315,200 @@ </hyperlinkPartitioner> <hyperlinkPartitioner - id="org.jboss.tools.jsf.text.ext.richfaces.hyperlink.RichfacesCSSClassHyperlinkPartitioner" - class="org.jboss.tools.jsf.text.ext.richfaces.hyperlink.RichfacesCSSClassHyperlinkPartitioner"> + id="org.jboss.tools.jsf.text.ext.richfaces.hyperlink.FaceletsCSSClassHyperlinkPartitioner" + class="org.jboss.tools.jsf.text.ext.facelets.hyperlink.FaceletsCSSClassHyperlinkPartitioner"> <contentType id="org.eclipse.jst.jsp.core.jspsource"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://richfaces.org/rich]:*/addButtonClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/activeClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/activeTabClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/buttonClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/buttonDisabledClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/buttonInactiveClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/barClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/bottomControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/bodyClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/columnClasses/" /> + <axis path="*/[http://richfaces.org/rich]:*/controlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/controlsClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/controlHoverClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/controlPressedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/controlPressClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/cleanButtonClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/changedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/changedHoverClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/copyAllControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/copyControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/contentClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/completeClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/dayStyleClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/decreaseClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/decreaseSelectedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/disabledItemClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/disabledControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/downControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/disabledGroupClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/disabledClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/errorClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/errorLabelClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/errorMarkerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/entryClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/footerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/fileEntryClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/fileEntryControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/fatalClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/fatalLabelClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/fatalMarkerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/finishClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/headerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/handleClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/handleSelectedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/hoveredGroupClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/hoveredItemClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/highlightedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/inputClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/inputDisabledClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/inputInactiveClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/itemClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/itemSelectedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/increaseClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/increaseSelectedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/iconClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/infoClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/infoLabelClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/infoMarkerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/initialClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/listClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/labelClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/popupClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/rowClasses/" /> + <axis path="*/[http://richfaces.org/rich]:*/removeAllControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/removeControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/remainClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/styleClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/selectItemClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/stopButtonClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/selectClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/sidebarClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/selectedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/selectValueClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/separatorClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/uploadButtonClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/uploadListClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/upControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/editClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/viewClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/viewHoverClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/tipClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/topControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/topGroupClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/topItemClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/tabClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/markerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/warnClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/warnLabelClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/warnMarkerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/groupClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/disabledTabClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/inactiveTabClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/nodeClass/" /> </partitionType> </contentType> <contentType id="org.eclipse.wst.html.core.htmlsource"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://richfaces.org/rich]:*/addButtonClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/activeClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/activeTabClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/buttonClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/buttonDisabledClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/buttonInactiveClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/barClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/bottomControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/bodyClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/columnClasses/" /> + <axis path="*/[http://richfaces.org/rich]:*/controlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/controlsClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/controlHoverClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/controlPressedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/controlPressClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/cleanButtonClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/changedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/changedHoverClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/copyAllControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/copyControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/contentClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/completeClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/dayStyleClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/decreaseClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/decreaseSelectedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/disabledItemClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/disabledControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/downControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/disabledGroupClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/disabledClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/errorClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/errorLabelClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/errorMarkerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/entryClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/footerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/fileEntryClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/fileEntryControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/fatalClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/fatalLabelClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/fatalMarkerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/finishClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/headerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/handleClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/handleSelectedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/hoveredGroupClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/hoveredItemClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/highlightedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/inputClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/inputDisabledClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/inputInactiveClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/itemClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/itemSelectedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/increaseClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/increaseSelectedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/iconClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/infoClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/infoLabelClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/infoMarkerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/initialClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/listClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/labelClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/popupClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/rowClasses/" /> + <axis path="*/[http://richfaces.org/rich]:*/removeAllControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/removeControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/remainClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/styleClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/selectItemClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/stopButtonClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/selectClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/sidebarClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/selectedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/selectValueClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/separatorClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/uploadButtonClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/uploadListClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/upControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/editClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/viewClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/viewHoverClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/tipClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/topControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/topGroupClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/topItemClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/tabClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/markerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/warnClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/warnLabelClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/warnMarkerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/groupClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/disabledTabClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/inactiveTabClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/nodeClass/" /> </partitionType> </contentType> </hyperlinkPartitioner> @@ -356,16 +542,6 @@ </contenttypeidentifier> </hyperlink> - <hyperlink - class="org.jboss.tools.jsf.text.ext.richfaces.hyperlink.RichfacesCSSClassHyperlink" - id="org.jboss.tools.jsf.text.ext.richfaces.hyperlink.RichfacesCSSClassHyperlink"> - <contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource"> - <partitiontype id="org.jboss.tools.common.text.ext.RICHFACES_CSS_CLASS" /> - </contenttypeidentifier> - <contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource"> - <partitiontype id="org.jboss.tools.common.text.ext.RICHFACES_CSS_CLASS" /> - </contenttypeidentifier> - </hyperlink> </extension> <extension point="org.jboss.tools.jst.web.kb.KbIncludeContext"> Deleted: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesCSSClassHyperlink.java =================================================================== --- branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesCSSClassHyperlink.java 2010-04-20 15:19:22 UTC (rev 21558) +++ branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesCSSClassHyperlink.java 2010-04-20 15:52:21 UTC (rev 21559) @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.jsf.text.ext.richfaces.hyperlink; - -import java.text.MessageFormat; - -import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; -import org.jboss.tools.jst.text.ext.hyperlink.CSSClassHyperlink; - -/** - * - * @author Victor Rubezhny - * - */ -public class RichfacesCSSClassHyperlink extends CSSClassHyperlink { - /* - * (non-Javadoc) - * - * @see IHyperlink#getHyperlinkText() - */ - public String getHyperlinkText() { - String styleName = getStyleName(fLastRegion); - if (styleName == null) - return MessageFormat.format(Messages.OpenA, Messages.CSSStyle); - - return MessageFormat.format(Messages.OpenCSSStyle, styleName); - } -} Deleted: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesCSSClassHyperlinkPartitioner.java =================================================================== --- branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesCSSClassHyperlinkPartitioner.java 2010-04-20 15:19:22 UTC (rev 21558) +++ branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesCSSClassHyperlinkPartitioner.java 2010-04-20 15:52:21 UTC (rev 21559) @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.jsf.text.ext.richfaces.hyperlink; - -import org.eclipse.jface.text.IDocument; -import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; -import org.jboss.tools.jst.text.ext.hyperlink.CSSClassHyperlinkPartitioner; - -/** - * - * @author Victor Rubezhny - * - */ -public class RichfacesCSSClassHyperlinkPartitioner extends CSSClassHyperlinkPartitioner { - public static final String RICHFACES_CSS_CLASS_PARTITION = "org.jboss.tools.common.text.ext.RICHFACES_CSS_CLASS"; //$NON-NLS-1$ - private static final String RICHFACES_CSS_CLASS_TOKEN = "/styleClass/"; //$NON-NLS-1$ - - @Override - public boolean recognize(IDocument document, IHyperlinkRegion region) { - if (region.getAxis() != null - && region.getAxis().endsWith(RICHFACES_CSS_CLASS_TOKEN)) - return true; - return false; - } - - @Override - protected String getPartitionType(String axis) { - return RICHFACES_CSS_CLASS_PARTITION; - } - -}

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21558 - trunk/maven/docs/maven_reference_guide/en-US.

by jbosstools-commits＠lists.jboss.org

Author: smukhina Date: 2010-04-20 11:19:22 -0400 (Tue, 20 Apr 2010) New Revision: 21558 Modified: trunk/maven/docs/maven_reference_guide/en-US/references.xml trunk/maven/docs/maven_reference_guide/en-US/tasks.xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-41 Architypes description Modified: trunk/maven/docs/maven_reference_guide/en-US/references.xml =================================================================== --- trunk/maven/docs/maven_reference_guide/en-US/references.xml 2010-04-20 15:12:10 UTC (rev 21557) +++ trunk/maven/docs/maven_reference_guide/en-US/references.xml 2010-04-20 15:19:22 UTC (rev 21558) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <chapter id="referencies"> <title>References</title> - <section> + <section id="mavenintegrationfacets"> <title>Jboss Maven Integration facet</title> <para><property>Jboss Maven Integration</property> facet is a <property>Project Facet</property> which add <property>Maven</property> capabilities to the target project. This facet adds a <property>Maven</property> nature, builder and classpath container. Also <property>Maven Integration</property> facet can detect <property>EJB</property>, <property>WAR</property> or <property>EAR</property> facet and add corresponding maven plugins for them. Also <property>Maven Integration</property> facet provides the library providers. More about <property>Maven Integration</property> library providers you can read here. <figure> @@ -109,6 +109,65 @@ </table> </section> + <section> + <title>Maven Archetypes compatible with JBoss Tools</title> + <para>Also <property>JBoss Maven Integration Tool</property> contains <property>Maven Archetypes</property> adapted to <property>JBoss Tools</property>. You can <link linkend="maven_archetype">use a provided archetype to get a ready to work project</link> and deploy the generated <property>WAR</property> to the <property>JBoss server</property>. + </para> + <para>For the present situation following archetypes are available to use:</para> + <table> + <title>Available Archetypes with JBoss Tools support</title> + <tgroup cols="2"> + <colspec colnum="1" align="left" colwidth="2*"/> + <colspec colnum="2" colwidth="4*"/> + <thead> + <row> + <entry>Archetype </entry> + <entry>Parameters </entry> + + </row> + </thead> + <tbody> + <row> + <entry><para>JSF 1.2 Basic</para> + </entry> + <entry> + <para>Archetype Group Id: <property>org.jboss.portletbridge.archetypes</property> </para> + <para>Archetype Artifact Id: <property>1.2-basic</property> </para> + <para>Archetype Version: <property>2.0.0.BETA </property> + </para> + <para>Repository URL: <property>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/archetypes</property> </para> + </entry> + </row> + <row> + <entry><para>RichFaces Basic</para></entry> + <entry> + <para>Archetype Group Id: <property>org.jboss.portletbridge.archetypes</property> </para> + <para>Archetype Artifact Id: <property>richfaces-basic</property> </para> + <para>Archetype Version: <property>2.0.0.BETA </property> + </para> + <para>Repository URL: <property>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/archetypes</property> </para> + + </entry> + </row> + <row> + <entry><para>Seam Basic (Modular EAR)</para></entry> + <entry> + <para>Archetype Group Id: <property>org.jboss.portletbridge.archetypes</property> </para> + <para>Archetype Artifact Id: <property>seam-basic</property> </para> + <para>Archetype Version: <property>2.0.1.BETA </property> + </para> + <para>Repository URL: <property>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/archetypes</property> </para> + + </entry> + </row> + </tbody> + </tgroup> + + + + </table> + </section> + </chapter> \ No newline at end of file Modified: trunk/maven/docs/maven_reference_guide/en-US/tasks.xml =================================================================== --- trunk/maven/docs/maven_reference_guide/en-US/tasks.xml 2010-04-20 15:12:10 UTC (rev 21557) +++ trunk/maven/docs/maven_reference_guide/en-US/tasks.xml 2010-04-20 15:19:22 UTC (rev 21558) @@ -231,21 +231,109 @@ </section> <section id="maven_archetype"> <title>Create new Seam Project with Portlets using Archetypes</title> - <para>To create new Maven project with Seam and Portlets from archetype you should have Seam Runtime 2.2 and JBoss AS 5.1.0 Server.</para> - <para>If you have necessary runtimes select File > New > Project From the Navigator or Project Explorer. After that The Select a wizard dialog appears.</para> + + <para>To create new <property>Maven project</property> with <property>Seam</property> and <property>Portlets</property> from archetype you should have <property>Seam Runtime 2.2</property> and <property>JBoss AS 5.1.0 Server</property>.</para> + <para>If you have necessary runtimes select <emphasis><property>File > New > Project</property></emphasis> from the <property>Navigator</property> or <property>Project Explorer</property>. After that <property>The Select a wizard</property> dialog appears.</para> <figure> <title>Select a wizard dialog</title> <mediaobject> <imageobject> - <imagedata fileref="image/create_maven_project_with_archetype/selectWizardDialog.png"/> + <imagedata fileref="images/create_maven_project_with_archetype/selectWizardDialog.png"/> </imageobject> </mediaobject> </figure> - <para>Select Maven > Maven Project and you will see a New Maven Project wizard. + <para>Select <emphasis><property>Maven > Maven Project</property></emphasis> and you will see a <property>New Maven Project</property> wizard. Keep defaults and click <emphasis><property>Next</property></emphasis>. </para> - + <figure> + <title>New Maven Project wizard</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/create_maven_project_with_archetype/newMavenProject.png"/> + </imageobject> + + </mediaobject> + </figure> + <para>On <property>Select an Archetype</property> page click <emphasis><property>Add Archetype</property></emphasis> button.</para> + <figure> + <title>Select an Archetype page</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/create_maven_project_with_archetype/selectArchetypePage.png"/> + </imageobject> + </mediaobject> + </figure> + <para>In <property>Add Archetype</property> dialog you need specify following:</para> + <itemizedlist> + <listitem><para>Archetype Group Id: <property>org.jboss.portletbridge.archetypes</property></para> + </listitem> + <listitem><para>Archetype Artifact Id: <property>seam-basic</property></para> + </listitem> + <listitem><para>Archetype Version: <property>2.0.1.BETA</property> </para> + </listitem> + <listitem><para>Repository URL: <property>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/archetypes</property></para> + </listitem> + </itemizedlist> + <para>Then click <emphasis><property>OK</property></emphasis>.</para> + <figure> + <title>Add Archetype dialog </title> + <mediaobject> + <imageobject> + <imagedata fileref="images/create_maven_project_with_archetype/addArchetypeDialog.png"/> + </imageobject> + </mediaobject> + </figure> + <para>On <property>Select an Archetype</property> page make sure that in <property>Catalog</property> list you select <emphasis><property>Nexus Indexer</property></emphasis> or <emphasis><property>All Catalogs</property></emphasis> option. </para> + <para>After that select the <property>org.jboss.portletbridge.archetypes:seam-basic:2.0.1.BETA</property> archetype and click <emphasis><property>Next</property></emphasis>. + </para> + <note> + <title>Note:</title> + <para>If you choose <property>Default Local</property> in <property>Catalog</property> list you can get a error while creating <property>Maven</property> Project. To avoid this emergency you need to select <property>Nexus Indexer Catalog</property>. + </para> + </note> + <figure> + <title>Select an Archetype page with added PortletBridge Archetype</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/create_maven_project_with_archetype/selectArchetypePageWithSeamBasic.png"/> + </imageobject> + </mediaobject> + </figure> + <para>On the <property>Archetype parameters</property> page you need complete the <property>Group Id</property>, <property>Artifact Id</property>, <property>Version</property> fields and enter the <property>Package Name</property>. Then you should click <emphasis><property>Finish</property></emphasis>. + </para> + <figure> + <title>Archetype parameters page </title> + <mediaobject> + <imageobject> + <imagedata fileref="images/create_maven_project_with_archetype/archetypeParametersPage.png"/> + </imageobject> + + </mediaobject> + </figure> + <para>As a result you will get the mavenized <property>Seam</property> project with <property>Portlets</property> supports. The archetype create also <property>EAR</property> and <property>EJB</property> projects. The <property>WEB</property> projects is project for deployment while seam-basic project is parent for the <property>EAR</property>, <property>EJB</property> and <property>WEB</property> projects. + </para> + <figure> + <title>Created Maven project in Package Explorer</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/create_maven_project_with_archetype/createdMavenProjectWithSeamAndPortlet.png"/> + </imageobject> + + </mediaobject> + </figure> + <para>The created project has a configured <property>Project Facets</property> such as <property>Seam</property>, <property>Maven Integration</property> and <property>JSF</property> facets. Also <property>Seam</property> settings is automatically configured for the project. In generated project the <property>Code Assist</property>, <property>syntax highlighting</property> and <property>incremental deployment</property> are supported too. + </para> + <section id="archetypes_links"> + <title>Relevant Resources Links</title> + <para>You can find screencast from <property>Snjezana Peco</property> on <ulink url="http://screencast.com/t/OGMxMmFk">http://screencast.com/t/OGMxMmFk</ulink> . </para> + <para>General information about <property>Maven Archetypes</property> may be found <ulink url="http://maven.apache.org/guides/introduction/introduction-to-archetypes.html">here</ulink> and details about <property>Portlets Archetypes</property> are located <ulink url="http://www.jboss.org/files/portletbridge/docs/1.0.0.CR2/en/html_single/in...">here</ulink>. + </para> + </section> + + + + </section> <section id="maven_project_import">

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21557 - in trunk/bpel/plugins: org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/pages and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: bbrodt Date: 2010-04-20 11:12:10 -0400 (Tue, 20 Apr 2010) New Revision: 21557 Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors/ODEDeployMultiPageEditor.java trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/pages/ProcessPage.java trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.xml trunk/bpel/plugins/org.eclipse.bpel.model/build.properties trunk/bpel/plugins/org.eclipse.bpel.model/plugin.xml trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResourceSetImpl.java trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.xml trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIConstants.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Builder.java Log: https://jira.jboss.org/jira/browse/JBIDE-6006 Added content type checking to BPEL editor and deployment editor. Also fixed deployment editor crash if BPEL resources are deleted. Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors/ODEDeployMultiPageEditor.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors/ODEDeployMultiPageEditor.java 2010-04-20 14:37:39 UTC (rev 21556) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors/ODEDeployMultiPageEditor.java 2010-04-20 15:12:10 UTC (rev 21557) @@ -22,6 +22,7 @@ import org.eclipse.bpel.apache.ode.deploy.model.dd.util.ddResourceFactoryImpl; import org.eclipse.bpel.apache.ode.deploy.ui.pages.ProcessPage; import org.eclipse.bpel.apache.ode.deploy.ui.util.DeployUtils; +import org.eclipse.bpel.model.BPELFactory; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceVisitor; @@ -52,14 +53,17 @@ * @author Tammo van Lessen (IAAS) * @author Simon Moser (IBM) */ -public class ODEDeployMultiPageEditor extends FormEditor implements IEditingDomainProvider { - - protected TDeployment deployDescriptor = null; - +public class ODEDeployMultiPageEditor extends FormEditor implements + IEditingDomainProvider { + + // Display this in title if no BPEL process files are found in current directory + private final static String NO_PROCESSES_FOUND = " *** No Processes Found *** "; + private boolean readOnly = false; + protected TDeployment deployDescriptor = null; + protected AdapterFactoryEditingDomain editingDomain; protected ComposedAdapterFactory adapterFactory; - /** * Creates a multi-page editor example. */ @@ -67,36 +71,38 @@ super(); initializeEditingDomain(); } - + /** * Saves the deployment descriptor */ public void doSave(IProgressMonitor monitor) { commitPages(true); saveDeploymentDescriptor(); - ((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone(); + ((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone(); firePropertyChange(IEditorPart.PROP_DIRTY); } - + /** * SaveAs is not supported. */ public void doSaveAs() { throw new UnsupportedOperationException("SaveAs is not allowed."); //$NON-NLS-1$ } - + /** - * The implementation of this method checks that the input is an - * instance of <code>IFileEditorInput</code> and creates the data model. + * The implementation of this method checks that the input is an instance of + * <code>IFileEditorInput</code> and creates the data model. */ - public void init(IEditorSite site, IEditorInput editorInput) throws PartInitException { + public void init(IEditorSite site, IEditorInput editorInput) + throws PartInitException { super.init(site, editorInput); setPartName(editorInput.getName()); - + if (!(editorInput instanceof IFileEditorInput)) { - throw new PartInitException("Invalid Input: Must be IFileEditorInput"); //$NON-NLS-1$ + throw new PartInitException( + "Invalid Input: Must be IFileEditorInput"); //$NON-NLS-1$ } - + createModel(); } @@ -105,14 +111,16 @@ } public void saveDeploymentDescriptor() { - try { - deployDescriptor.eResource().save(null); - } - catch (IOException e1) { + try { + // https://jira.jboss.org/jira/browse/JBIDE-6006 + // editor will be "read only" if there are no BPEL resources to process + if (!readOnly) + deployDescriptor.eResource().save(null); + } catch (IOException e1) { e1.printStackTrace(); } } - + protected org.eclipse.bpel.model.Process loadBPEL(IFile bpelFile) { IPath fullProcessPath = bpelFile.getFullPath(); URI uri = URI.createPlatformResourceURI(fullProcessPath.toString(), false); @@ -133,42 +141,43 @@ } @Override - protected void addPages() { + protected void addPages() { try { for (ProcessType pt : deployDescriptor.getProcess()) { addPage(new ProcessPage(this, pt)); } - } - catch (PartInitException e) { + } catch (PartInitException e) { // ~ } } - - public TDeployment getDeploymentModel(){ + + public TDeployment getDeploymentModel() { return deployDescriptor; } protected void initializeEditingDomain() { - adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); + adapterFactory = new ComposedAdapterFactory( + ComposedAdapterFactory.Descriptor.Registry.INSTANCE); - // Create the command stack that will notify this editor as commands are executed. + // Create the command stack that will notify this editor as commands are + // executed. BasicCommandStack commandStack = new BasicCommandStack(); - // Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus. - commandStack.addCommandStackListener - (new CommandStackListener() { - public void commandStackChanged(final EventObject event) { - getContainer().getDisplay().asyncExec - (new Runnable() { - public void run() { - editorDirtyStateChanged(); - } - }); - } - }); + // Add a listener to set the most recent command's affected objects to + // be the selection of the viewer with focus. + commandStack.addCommandStackListener(new CommandStackListener() { + public void commandStackChanged(final EventObject event) { + getContainer().getDisplay().asyncExec(new Runnable() { + public void run() { + editorDirtyStateChanged(); + } + }); + } + }); // Create the editing domain with a special command stack. - editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>()); + editingDomain = new AdapterFactoryEditingDomain(adapterFactory, + commandStack, new HashMap<Resource, Boolean>()); } public EditingDomain getEditingDomain() { @@ -177,16 +186,18 @@ @Override public boolean isDirty() { - return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded(); + return !readOnly + && ((BasicCommandStack) editingDomain.getCommandStack()) + .isSaveNeeded(); } - + @Override public void setFocus() { if (getActivePage() != -1 && getControl(getActivePage()) != null) { getControl(getActivePage()).setFocus(); } } - + protected void createModel() throws PartInitException { URI resourceURI = EditUIUtil.getURI(getEditorInput()); Resource resource = null; @@ -196,43 +207,51 @@ editingDomain.getResourceSet().getResources().add(resource); try { resource.load(Collections.EMPTY_MAP); - + EList<EObject> contents = resource.getContents(); if (!contents.isEmpty() && contents.get(0) instanceof DocumentRoot) { deployDescriptor = ((DocumentRoot) contents.get(0)).getDeploy(); - + populateModel(); - - //TODO: what to do with processtypes in DD without a corresponding BPEL file available? } } catch (CoreException e) { throw new PartInitException(e.getStatus()); } catch (IOException e) { throw new PartInitException(e.getMessage(), e); } + if (deployDescriptor.getProcess().isEmpty()) { + // https://jira.jboss.org/jira/browse/JBIDE-6006 + // add a process stub to DD so the editor doesn't crash + org.eclipse.bpel.model.Process p = BPELFactory.eINSTANCE.createProcess(); + p.setName(NO_PROCESSES_FOUND); + ProcessType pt = DeployUtils.createProcessStub(p); + deployDescriptor.getProcess().add(pt); + // set model + pt.setModel(p); + readOnly = true; // can't save editor + } } public void populateModel() throws CoreException { - ((IFileEditorInput)getEditorInput()).getFile().getProject().accept(new IResourceVisitor() { + ((IFileEditorInput) getEditorInput()).getFile().getProject().accept(new IResourceVisitor() { public boolean visit(IResource bpelfile) throws CoreException { - if (bpelfile.getType() == IResource.FILE - && bpelfile.getFileExtension().equalsIgnoreCase("bpel")) { //$NON-NLS-1$ - org.eclipse.bpel.model.Process p = DeployUtils.loadBPEL((IFile)bpelfile, editingDomain.getResourceSet()); + // https://jira.jboss.org/jira/browse/JBIDE-6006 + if (DeployUtils.isBPELFile(bpelfile)) { + org.eclipse.bpel.model.Process p = DeployUtils.loadBPEL((IFile) bpelfile, editingDomain.getResourceSet()); if (p != null) { - // add process to DD unless it it not already there. - ProcessType pt = DeployUtils.findProcessTypeInDD(p, deployDescriptor); + // add process to DD unless it is not already there. + ProcessType pt = DeployUtils.findProcessTypeInDD(p, deployDescriptor); if (pt == null) { pt = DeployUtils.createProcessStub(p); deployDescriptor.getProcess().add(pt); } // set model pt.setModel(p); - + } - } + } return true; } }); } - } Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/pages/ProcessPage.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/pages/ProcessPage.java 2010-04-20 14:37:39 UTC (rev 21556) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/pages/ProcessPage.java 2010-04-20 15:12:10 UTC (rev 21557) @@ -34,6 +34,7 @@ import org.eclipse.bpel.apache.ode.deploy.ui.Activator; import org.eclipse.bpel.apache.ode.deploy.ui.editors.ODEDeployMultiPageEditor; import org.eclipse.bpel.apache.ode.deploy.ui.util.DeployUtils; +import org.eclipse.bpel.model.BPELFactory; import org.eclipse.bpel.model.PartnerLink; import org.eclipse.bpel.model.PartnerLinks; import org.eclipse.bpel.model.Process; @@ -55,6 +56,8 @@ import org.eclipse.emf.common.command.CompoundCommand; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.edit.command.AddCommand; import org.eclipse.emf.edit.command.RemoveCommand; @@ -714,56 +717,62 @@ public Object[] getElements(Object inputElement) { - if (inputElement instanceof ProcessType){ - ProcessType type = (ProcessType) inputElement; - if (forInbound){ - EList<TProvide> provide = type.getProvide(); - - if (provide.isEmpty()){ - Process process = type.getModel(); - PartnerLinks pls = process.getPartnerLinks(); - EList<PartnerLink> plList = pls.getChildren(); - for (Iterator<PartnerLink> iterator = plList.iterator(); iterator.hasNext();) { - PartnerLink current = (PartnerLink) iterator.next(); - if (current.getMyRole() != null){ - TProvide currentProvide = ddFactory.eINSTANCE.createTProvide(); - currentProvide.setPartnerLink(current.getName()); - provide.add(currentProvide); - } + try + { + if (inputElement instanceof ProcessType){ + ProcessType type = (ProcessType) inputElement; + if (forInbound){ + EList<TProvide> provide = type.getProvide(); + + if (provide.isEmpty()){ + Process process = type.getModel(); + PartnerLinks pls = process.getPartnerLinks(); + EList<PartnerLink> plList = pls.getChildren(); + for (Iterator<PartnerLink> iterator = plList.iterator(); iterator.hasNext();) { + PartnerLink current = (PartnerLink) iterator.next(); + if (current.getMyRole() != null){ + TProvide currentProvide = ddFactory.eINSTANCE.createTProvide(); + currentProvide.setPartnerLink(current.getName()); + provide.add(currentProvide); + } + } } + + return provide.toArray(); } - - return provide.toArray(); - } - else { - EList<TInvoke> invoke = type.getInvoke(); - - if (invoke.isEmpty()){ - Process process = type.getModel(); - PartnerLinks pls = process.getPartnerLinks(); - if (pls != null) { - EList<PartnerLink> plList = pls.getChildren(); - for (Iterator<PartnerLink> iterator = plList.iterator(); iterator - .hasNext();) { - PartnerLink current = (PartnerLink) iterator - .next(); - if (current.getPartnerRole() != null) { - TInvoke currentInvoke = ddFactory.eINSTANCE - .createTInvoke(); - currentInvoke.setPartnerLink(current - .getName()); - invoke.add(currentInvoke); + else { + EList<TInvoke> invoke = type.getInvoke(); + + if (invoke.isEmpty()){ + Process process = type.getModel(); + PartnerLinks pls = process.getPartnerLinks(); + if (pls != null) { + EList<PartnerLink> plList = pls.getChildren(); + for (Iterator<PartnerLink> iterator = plList.iterator(); iterator + .hasNext();) { + PartnerLink current = (PartnerLink) iterator + .next(); + if (current.getPartnerRole() != null) { + TInvoke currentInvoke = ddFactory.eINSTANCE + .createTInvoke(); + currentInvoke.setPartnerLink(current + .getName()); + invoke.add(currentInvoke); + } } } } + + return invoke.toArray(); } - - return invoke.toArray(); } } - else { - return new String[1]; + catch(NullPointerException ex) + { } + // https://jira.jboss.org/jira/browse/JBIDE-6006 + // create a stub invoke so the editor doesn't crash + return new TInvoke[] { ddFactory.eINSTANCE.createTInvoke() }; } public void dispose() { @@ -812,7 +821,8 @@ IResourceDeltaVisitor rdv = new IResourceDeltaVisitor() { public boolean visit(IResourceDelta delta) { IResource res = delta.getResource(); - if ("bpel".equalsIgnoreCase(res.getFileExtension())) { //$NON-NLS-1$ + // https://jira.jboss.org/jira/browse/JBIDE-6006 + if (DeployUtils.isBPELFile(res)) { Display.getDefault().syncExec(new Runnable() { public void run() { mainform.setMessage("Associated BPEL and/or WSDL has been changed, click to update!", IMessageProvider.WARNING); Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2010-04-20 14:37:39 UTC (rev 21556) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2010-04-20 15:12:10 UTC (rev 21557) @@ -32,6 +32,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.content.IContentDescription; +import org.eclipse.core.runtime.content.IContentType; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; @@ -56,7 +58,8 @@ public static final String URL_PREFIX_PLATFORM = "platform"; //$NON-NLS-1$ public static final String URL_PREFIX_RESOURCE = "resource"; //$NON-NLS-1$ public static final String NONE_STRING = "-- none -- "; //$NON-NLS-1$ - + public static final String BPEL_CONTENT_TYPE = "org.eclipse.bpel.contenttype"; //$NON-NLS-1$ + public static ProcessType findProcessTypeInDD( org.eclipse.bpel.model.Process process, TDeployment dd) { for (ProcessType pt : dd.getProcess()) { @@ -210,8 +213,9 @@ for (IFile file : allFiles) { - if (file.getFileExtension().equalsIgnoreCase("bpel")) { //$NON-NLS-1$ - // load it + // https://jira.jboss.org/jira/browse/JBIDE-6006 + if (DeployUtils.isBPELFile(file)) { + // load it Process currentProcess = loadBPEL(file, resourceSet); // stuff it in bpelFiles bpelFiles.add(currentProcess); @@ -316,4 +320,28 @@ return file; } + // https://jira.jboss.org/jira/browse/JBIDE-6006 + public static boolean isBPELFile(IResource res) + { + try + { + if (res.getType() == IResource.FILE) { + // check if file was recognized by eclipse BPEL editor + IContentDescription desc = ((IFile) res).getContentDescription(); + if (desc != null) { + IContentType type = desc.getContentType(); + if (type.getId().equals(BPEL_CONTENT_TYPE)) + return true; + } + // maybe the eclipse BPEL editor is not installed? + // fall back to using '.bpel' file extension + if ("bpel".equals(((IFile)res).getFileExtension())) + return true; + } + } + catch(Exception ex) + { + } + return false; + } } Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.xml 2010-04-20 14:37:39 UTC (rev 21556) +++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.xml 2010-04-20 15:12:10 UTC (rev 21557) @@ -44,15 +44,4 @@ name="org.eclipse.bpel.common.ui.lineNumInObject"> </attribute> </extension> - <extension - point="org.eclipse.core.runtime.contentTypes"> - <content-type - base-type="org.eclipse.core.runtime.xml" - default-charset="UTF-8" - file-extensions="bpel,bpel2" - id="org.eclipse.bpel.common.ui.bpel.content-type" - name="BPEL Process" - priority="normal"/> - </extension> - </plugin> Modified: trunk/bpel/plugins/org.eclipse.bpel.model/build.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.model/build.properties 2010-04-20 14:37:39 UTC (rev 21556) +++ trunk/bpel/plugins/org.eclipse.bpel.model/build.properties 2010-04-20 15:12:10 UTC (rev 21557) @@ -10,8 +10,7 @@ # JBoss by Red Hat - subsequent contributions and maintenance ############################################################################### bin.includes = META-INF/,\ - plugin.*,\ - . + plugin.* src.includes = .classpath,\ .cvsignore,\ .project,\ @@ -19,4 +18,3 @@ src/,\ META-INF/,\ plugin.* -source.. = src/ Modified: trunk/bpel/plugins/org.eclipse.bpel.model/plugin.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.model/plugin.xml 2010-04-20 14:37:39 UTC (rev 21556) +++ trunk/bpel/plugins/org.eclipse.bpel.model/plugin.xml 2010-04-20 15:12:10 UTC (rev 21557) @@ -78,6 +78,12 @@ <provider class="org.eclipse.bpel.model.resource.ResourceSetProvider"/> </extension> - +  + <extension point="org.eclipse.emf.ecore.content_parser"> + <parser + class="org.eclipse.bpel.model.resource.BPELResourceFactoryImpl" + contentTypeIdentifier="org.eclipse.bpel.contenttype"> + </parser> + </extension> </plugin> Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResourceSetImpl.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResourceSetImpl.java 2010-04-20 14:37:39 UTC (rev 21556) +++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResourceSetImpl.java 2010-04-20 15:12:10 UTC (rev 21557) @@ -21,6 +21,8 @@ import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.content.IContentDescription; +import org.eclipse.core.runtime.content.IContentType; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.URIConverter; @@ -39,6 +41,8 @@ public class BPELResourceSetImpl extends ResourceSetImpl implements IResourceChangeListener { + public static final String BPEL_CONTENT_TYPE = "org.eclipse.bpel.contenttype"; //$NON-NLS-1$ + public BPELResourceSetImpl() { super(); // FIX ME: This should not have dependency on running eclipse. @@ -243,7 +247,8 @@ // TODO: Temporary hack // Actually we should remove all resources from the resourceSet, // but for some reasons bpel files can't be removed now - if ("bpel".equals(((IFile) resource).getFileExtension())){ + // https://jira.jboss.org/jira/browse/JBIDE-6006 + if (isBPELFile(resource)){ continue; } @@ -286,4 +291,22 @@ } } + public static boolean isBPELFile(IResource res) + { + try + { + if (res.getType() == IResource.FILE) { + IContentDescription desc = ((IFile) res).getContentDescription(); + if (desc != null) { + IContentType type = desc.getContentType(); + if (type.getId().equals(BPEL_CONTENT_TYPE)) + return true; + } + } + } + catch(Exception ex) + { + } + return false; + } } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.xml 2010-04-20 14:37:39 UTC (rev 21556) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.xml 2010-04-20 15:12:10 UTC (rev 21557) @@ -6,7 +6,7 @@ <extension-point id="expressionEditors" name="Expression Language Editors" schema="schemas/expressionEditors.exsd"/> <extension-point id="actions" name="Actions" schema="schemas/actions.exsd"/> <extension-point id="modelListener" name="Model Listener" schema="schemas/modelListener.exsd"/> - <extension-point id="uiObjectFactories" name="UIObjectFactories" schema="schema/uiObjectFactories.exsd"/> + <extension-point id="uiObjectFactories" name="UIObjectFactories" schema="schemas/uiObjectFactories.exsd"/> <extension @@ -15,10 +15,12 @@ class="org.eclipse.bpel.ui.BPELMultipageEditorPart" contributorClass="org.eclipse.bpel.ui.BPELMultiPageEditorActionBarContributor" default="true" - extensions="bpel" - icon="icons/obj16/bpel.gif" id="org.eclipse.bpel.ui.bpeleditor" name="%BPEL_EDITOR_NAME"> +  + <contentTypeBinding + contentTypeId="org.eclipse.bpel.contenttype"> + </contentTypeBinding> </editor> </extension> <extension @@ -640,4 +642,50 @@ uri="platform:/plugin/org.eclipse.bpel.ui/templates/fn.xml"> </registry> </extension> + +  + <extension + point="org.eclipse.core.contenttype.contentTypes"> + <content-type + base-type="org.eclipse.core.runtime.xml" + id="org.eclipse.bpel.contenttype" + name="BPEL Editor File" + file-extensions="bpel,bpel2,xml" + priority="normal"> + <describer + class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber2"> + <parameter + name="element" + value="{http://docs.oasis-open.org/wsbpel/2.0/process/executable}process"/> + </describer> + </content-type> + </extension> + <extension + point="org.eclipse.ui.decorators"> + <decorator + adaptable="true" + icon="icons/obj16/bpel.gif" + id="org.eclipse.bpel.ui.icondecorator" + label="BPEL Resource Decorator" + lightweight="true" + location="TOP_LEFT" + state="true"> + <enablement> + <and> + <objectClass + name="org.eclipse.core.resources.IFile"> + </objectClass> + <objectState + name="contentTypeId" + value="org.eclipse.bpel.contenttype"> + </objectState> + </and> + </enablement> + </decorator> + </extension> </plugin> Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIConstants.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIConstants.java 2010-04-20 14:37:39 UTC (rev 21556) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIConstants.java 2010-04-20 15:12:10 UTC (rev 21557) @@ -17,6 +17,7 @@ public interface IBPELUIConstants { // File extensions + @Deprecated // use content type instead of bpel file extensions public final String EXTENSION_BPEL = "bpel"; //$NON-NLS-1$ public final String EXTENSION_WSDL = "wsdl"; //$NON-NLS-1$ public final String EXTENSION_WSIL = "wsil"; //$NON-NLS-1$ Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java 2010-04-20 14:37:39 UTC (rev 21556) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java 2010-04-20 15:12:10 UTC (rev 21557) @@ -55,6 +55,7 @@ static final String DEFAULT_ENCODING = "UTF-8"; //$NON-NLS-1$ /** the main bpel file has this extension */ + @Deprecated // use content type instead of bpel file extensions static final String BPEL_FILE_EXTENSION = ".bpel"; //$NON-NLS-1$ /** Entries which are directories of the bundle */ Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Builder.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Builder.java 2010-04-20 14:37:39 UTC (rev 21556) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Builder.java 2010-04-20 15:12:10 UTC (rev 21557) @@ -34,6 +34,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.content.IContentDescription; +import org.eclipse.core.runtime.content.IContentType; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.wst.wsdl.WSDLElement; @@ -52,6 +54,10 @@ @SuppressWarnings("nls") public class Builder extends IncrementalProjectBuilder { + // https://jira.jboss.org/jira/browse/JBIDE-6006 + // Content Type ID for org.eclipse.bpel editor files + public static final String BPEL_CONTENT_TYPE = "org.eclipse.bpel.contenttype"; //$NON-NLS-1$ + Date created = new Date(); boolean bDebug = false; @@ -196,9 +202,9 @@ IFile file = (IFile) resource; p("File Resource : " + file.getName() ); - - // TODO: This should be a better check - if ( file.getName().endsWith(".bpel") || file.getName().endsWith(".wsdl")) { + // https://jira.jboss.org/jira/browse/JBIDE-6006 + // use content type to check for BPEL files + if ( isBPELFile(file) || file.getName().endsWith(".wsdl")) { IProject project = file.getProject(); validate(project, monitor); // file.deleteMarkers(IBPELMarker.ID, true, IResource.DEPTH_INFINITE); @@ -227,7 +233,8 @@ public boolean visit(IResource resource) throws CoreException { if( resource.getType() == IResource.FILE){ - if("bpel".equals(resource.getFileExtension())){ + // https://jira.jboss.org/jira/browse/JBIDE-6006 + if(isBPELFile(resource)){ bpelFolders.add((IFile)resource); return false; } @@ -375,5 +382,24 @@ } } + // https://jira.jboss.org/jira/browse/JBIDE-6006 + public static boolean isBPELFile(IResource res) + { + try + { + if (res.getType() == IResource.FILE) { + IContentDescription desc = ((IFile) res).getContentDescription(); + if (desc != null) { + IContentType type = desc.getContentType(); + if (type.getId().equals(BPEL_CONTENT_TYPE)) + return true; + } + } + } + catch(Exception ex) + { + } + return false; + } }

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21556 - branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2010-04-20 10:37:39 -0400 (Tue, 20 Apr 2010) New Revision: 21556 Modified: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/LinkEditPart.java Log: https://jira.jboss.org/jira/browse/JBIDE-6088 Modified: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/LinkEditPart.java =================================================================== --- branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/LinkEditPart.java 2010-04-20 14:17:30 UTC (rev 21555) +++ branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/LinkEditPart.java 2010-04-20 14:37:39 UTC (rev 21556) @@ -131,7 +131,7 @@ conn.add(pathLabel, pathLocator); String text = ""; //$NON-NLS-1$ - if (getLink().getJSFModel().getOptions().showShortcutPath()) + if (getLink().getJSFModel().getOptions().showShortcutPath() && getLink().getToGroup() != null) text = getLink().getToGroup().getVisiblePath(); shortcutLabel = new GEFLabel(text, FigureFactory.normalColor); if (getLink().getJSFModel().getOptions().showShortcutIcon()) @@ -220,7 +220,7 @@ public void linkChange(ILink source) { pathLabel.setText(getLink().getLinkName()); - if (getLinkModel().getJSFModel().getOptions().showShortcutPath()) + if (getLinkModel().getJSFModel().getOptions().showShortcutPath() && getLink().getToGroup() != null) shortcutLabel.setText(getLink().getToGroup().getVisiblePath()); else shortcutLabel.setText(""); //$NON-NLS-1$

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21555 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-04-20 10:17:30 -0400 (Tue, 20 Apr 2010) New Revision: 21555 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java Log: https://jira.jboss.org/jira/browse/JBIDE-6176 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java 2010-04-20 14:14:44 UTC (rev 21554) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java 2010-04-20 14:17:30 UTC (rev 21555) @@ -170,7 +170,7 @@ List<BijectedAttributeType> types = new ArrayList<BijectedAttributeType>(); for (AnnotatedASTNode<MethodDeclaration> n: annotatedMethods) { - Annotation main = getBijectedType(n, as, types); + getBijectedType(n, as, types); if(as.isEmpty()) continue; boolean isDataModelSelectionType = !types.get(0).isUsingMemberName(); @@ -186,7 +186,7 @@ addLocation(att, out, OUT_ANNOTATION_TYPE); addLocation(att, data, DATA_MODEL_ANNOTATION_TYPE); - ValueInfo name = ValueInfo.getValueInfo(main, null); + ValueInfo name = findValueInfo(as, null); att.setValue(name); if(name == null || isDataModelSelectionType || name.getValue() == null || name.getValue().length() == 0) { @@ -203,7 +203,7 @@ att.setName(name); - ValueInfo scope = ValueInfo.getValueInfo(main, "scope"); //$NON-NLS-1$ + ValueInfo scope = findValueInfo(as, "scope"); //$NON-NLS-1$ if(scope != null) att.setScope(scope); IMethod im = findMethod(m); @@ -212,7 +212,7 @@ } for (AnnotatedASTNode<FieldDeclaration> n: annotatedFields) { - Annotation main = getBijectedType(n, as, types); + getBijectedType(n, as, types); if(as.isEmpty()) continue; boolean isDataModelSelectionType = !types.get(0).isUsingMemberName(); @@ -225,7 +225,7 @@ addLocation(att, as.get(BijectedAttributeType.OUT), OUT_ANNOTATION_TYPE); addLocation(att, as.get(BijectedAttributeType.DATA_BINDER), DATA_MODEL_ANNOTATION_TYPE); - ValueInfo name = ValueInfo.getValueInfo(main, null); + ValueInfo name = findValueInfo(as, null); att.setValue(name); if(name == null || isDataModelSelectionType || name.getValue() == null || name.getValue().length() == 0) { @@ -237,7 +237,7 @@ att.setName(name); - ValueInfo scope = ValueInfo.getValueInfo(main, "scope"); //$NON-NLS-1$ + ValueInfo scope = findValueInfo(as, "scope"); //$NON-NLS-1$ if(scope != null) att.setScope(scope); IField f = findField(m); @@ -245,21 +245,27 @@ att.setId(f); } } - private Annotation getBijectedType(AnnotatedASTNode<?> n, + private void getBijectedType(AnnotatedASTNode<?> n, Map<BijectedAttributeType, Annotation> as, List<BijectedAttributeType> types) { as.clear(); types.clear(); - Annotation main = null; for (int i = 0; i < BijectedAttributeType.values().length; i++) { Annotation a = findAnnotation(n, BijectedAttributeType.values()[i].getAnnotationType()); if(a != null) { as.put(BijectedAttributeType.values()[i], a); - if(main == null) main = a; types.add(BijectedAttributeType.values()[i]); } } - return main; } + private ValueInfo findValueInfo(Map<BijectedAttributeType, Annotation> as, String name) { + for (BijectedAttributeType t: BijectedAttributeType.values()) { + Annotation a = as.get(t); + if(a == null) continue; + ValueInfo result = ValueInfo.getValueInfo(a, name); + if(result != null && result.getValue() != null && result.getValue().length() > 0) return result; + } + return null; + } private BijectedAttribute createBijectedAttribute(List<BijectedAttributeType> types) { boolean isDataModelSelectionType = !types.get(0).isUsingMemberName(); BijectedAttribute att = (!isDataModelSelectionType)

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r21554 - branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-04-20 10:14:44 -0400 (Tue, 20 Apr 2010) New Revision: 21554 Modified: branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/DropTargetManager.java Log: https://jira.jboss.org/jira/browse/JBIDE-6029 Modified: branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/DropTargetManager.java =================================================================== --- branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/DropTargetManager.java 2010-04-20 14:06:33 UTC (rev 21553) +++ branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/DropTargetManager.java 2010-04-20 14:14:44 UTC (rev 21554) @@ -120,7 +120,7 @@ DnDUtil.copy(fo, null); o = getModelObject(event.x, event.y); } - } else if(event.currentDataType.type != ModelTransfer.MODEL_ID) { + } else if(!ModelTransfer.getInstance().isSupportedType(event.currentDataType)) { o = null; } else { o = getModelObject(event.x, event.y);

14 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits April 2010