[jbosstools-commits] JBoss Tools SVN: r17510 - in trunk/maven/plugins/org.jboss.tools.maven.core: poms and 1 other directories.

Author: snjeza Date: 2009-09-09 20:28:19 -0400 (Wed, 09 Sep 2009) New Revision: 17510 Added: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml trunk/maven/plugins/org.jboss.tools.maven.core/poms/portlet-template10.xml trunk/maven/plugins/org.jboss.tools.maven.core/poms/portlet-template20.xml trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200alpha.xml trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200alphadep.xml Removed: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperationConfig.java Log: https://jira.jboss.org/jira/browse/JBIDE-4690 Add Maven Portlet library provider Deleted: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2009-09-10 00:27:18 UTC (rev 17509) +++ trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2009-09-10 00:28:19 UTC (rev 17510) @@ -1,122 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.4"?> -<plugin> - - <extension point="org.eclipse.wst.common.project.facet.core.facets"> - - <project-facet id="jboss.m2"> - <label>JBoss Maven Integration</label> - <description> - Adds support for Maven. - </description> - <default-version version="1.0"/> - </project-facet> - - <project-facet-version facet="jboss.m2" version="1.0"> - <constraint> - <or> - <requires facet="jst.ear" version="[5.0"/> - <requires facet="jst.ejb" version="[3.0"/> - <requires facet="jst.web" version="[2.5"/> - <requires facet="jst.utility" version="[1.0"/> - <requires facet="jst.appclient" version="[1.2"/> - <requires facet="jst.connector" version="[1.0"/> - </or> - </constraint> - </project-facet-version> - - <action id="jboss.m2.install" facet="jboss.m2" type="INSTALL" version="1.0"> - <delegate class="org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDelegate"/> - <config-factory class="org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider"/> - </action> - - </extension> - - <extension point="org.eclipse.wst.common.project.facet.core.runtimes"> - <supported> - <runtime-component any="true"/> - <facet id="jboss.m2" version="1.0"/> - </supported> - </extension> - - <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> - <provider id="maven-library-provider" abstract="true"> - <label>Maven library provider</label> - <priority>500</priority> - <action type="INSTALL"> - <config class="org.jboss.tools.maven.core.libprov.MavenLibraryProviderInstallOperationConfig"/> - <operation class="org.jboss.tools.maven.core.libprov.MavenLibraryProviderInstallOperation"/> - </action> - - <action type="UNINSTALL"> - <operation class="org.jboss.tools.maven.core.libprov.MavenLibraryProviderUninstallOperation"/> - </action> - - </provider> - </extension> - - <extension point="org.eclipse.core.expressions.propertyTesters"> - <propertyTester - namespace="org.jboss.tools.maven.core" - properties="projectFacets" - type="java.util.Collection" - class="org.jboss.tools.maven.core.ProjectFacetsFactoryTester" - id="org.jboss.tools.maven.core.ProjectFacetsFactoryTester"> - </propertyTester> - </extension> - - <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> - <provider id="jsf12-maven-library-provider" extends="maven-library-provider"> - <label>Maven JSF 1.2 Libraries</label> - <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/jsf-template12.xml"/> - <enablement> - <and> - <with variable="projectFacets"> - <test property="org.jboss.tools.maven.core.projectFacets" value="jst.jsf,jboss.m2" forcePluginActivation="true"/> - </with> - <with variable="requestingProjectFacet"> - <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.jsf:1.2" forcePluginActivation="true"/> - </with> - </and> - </enablement> - </provider> - </extension> - - <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> - <provider id="jsf11-maven-library-provider" extends="maven-library-provider"> - <label>Maven JSF 1.1 Libraries</label> - <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/jsf-template11.xml"/> - <enablement> - <and> - <with variable="projectFacets"> - <test property="org.jboss.tools.maven.core.projectFacets" value="jst.jsf,jboss.m2" forcePluginActivation="true"/> - </with> - <with variable="requestingProjectFacet"> - <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.jsf:1.1" forcePluginActivation="true"/> - </with> - </and> - </enablement> - </provider> - </extension> - - <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> - <provider id="hibernate332-maven-library-provider" extends="maven-library-provider"> - <label>Hibernate 3.3.2 Libraries</label> - <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/hibernate332-template.xml"/> - <enablement> - <and> - <with variable="projectFacets"> - <test property="org.jboss.tools.maven.core.projectFacets" value="jpt.jpa,jboss.m2" forcePluginActivation="true"/> - </with> - <with variable="requestingProjectFacet"> - <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jpt.jpa:1.0" forcePluginActivation="true"/> - </with> - <with variable="jpaPlatform"> - <equals value="hibernate"/> - </with> - </and> - </enablement> - </provider> - </extension> - -</plugin> Added: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2009-09-10 00:28:19 UTC (rev 17510) @@ -0,0 +1,188 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> + + <extension point="org.eclipse.wst.common.project.facet.core.facets"> + + <project-facet id="jboss.m2"> + <label>JBoss Maven Integration</label> + <description> + Adds support for Maven. + </description> + <default-version version="1.0"/> + </project-facet> + + <project-facet-version facet="jboss.m2" version="1.0"> + <constraint> + <or> + <requires facet="jst.ear" version="[5.0"/> + <requires facet="jst.ejb" version="[3.0"/> + <requires facet="jst.web" version="[2.5"/> + <requires facet="jst.utility" version="[1.0"/> + <requires facet="jst.appclient" version="[1.2"/> + <requires facet="jst.connector" version="[1.0"/> + </or> + </constraint> + </project-facet-version> + + <action id="jboss.m2.install" facet="jboss.m2" type="INSTALL" version="1.0"> + <delegate class="org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDelegate"/> + <config-factory class="org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider"/> + </action> + + </extension> + + <extension point="org.eclipse.wst.common.project.facet.core.runtimes"> + <supported> + <runtime-component any="true"/> + <facet id="jboss.m2" version="1.0"/> + </supported> + </extension> + + <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> + <provider id="maven-library-provider" abstract="true"> + <label>Maven library provider</label> + <priority>500</priority> + <action type="INSTALL"> + <config class="org.jboss.tools.maven.core.libprov.MavenLibraryProviderInstallOperationConfig"/> + <operation class="org.jboss.tools.maven.core.libprov.MavenLibraryProviderInstallOperation"/> + </action> + + <action type="UNINSTALL"> + <operation class="org.jboss.tools.maven.core.libprov.MavenLibraryProviderUninstallOperation"/> + </action> + + </provider> + </extension> + + <extension point="org.eclipse.core.expressions.propertyTesters"> + <propertyTester + namespace="org.jboss.tools.maven.core" + properties="projectFacets" + type="java.util.Collection" + class="org.jboss.tools.maven.core.ProjectFacetsFactoryTester" + id="org.jboss.tools.maven.core.ProjectFacetsFactoryTester"> + </propertyTester> + </extension> + + <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> + <provider id="jsf12-maven-library-provider" extends="maven-library-provider"> + <label>Maven JSF 1.2 Libraries</label> + <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/jsf-template12.xml"/> + <enablement> + <and> + <with variable="projectFacets"> + <test property="org.jboss.tools.maven.core.projectFacets" value="jst.jsf,jboss.m2" forcePluginActivation="true"/> + </with> + <with variable="requestingProjectFacet"> + <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.jsf:1.2" forcePluginActivation="true"/> + </with> + </and> + </enablement> + </provider> + </extension> + + <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> + <provider id="jsf11-maven-library-provider" extends="maven-library-provider"> + <label>Maven JSF 1.1 Libraries</label> + <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/jsf-template11.xml"/> + <enablement> + <and> + <with variable="projectFacets"> + <test property="org.jboss.tools.maven.core.projectFacets" value="jst.jsf,jboss.m2" forcePluginActivation="true"/> + </with> + <with variable="requestingProjectFacet"> + <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.jsf:1.1" forcePluginActivation="true"/> + </with> + </and> + </enablement> + </provider> + </extension> + + <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> + <provider id="hibernate332-maven-library-provider" extends="maven-library-provider"> + <label>Hibernate 3.3.2 Libraries</label> + <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/hibernate332-template.xml"/> + <enablement> + <and> + <with variable="projectFacets"> + <test property="org.jboss.tools.maven.core.projectFacets" value="jpt.jpa,jboss.m2" forcePluginActivation="true"/> + </with> + <with variable="requestingProjectFacet"> + <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jpt.jpa:1.0" forcePluginActivation="true"/> + </with> + <with variable="jpaPlatform"> + <equals value="hibernate"/> + </with> + </and> + </enablement> + </provider> + </extension> + + <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> + <provider id="portlet10-maven-library-provider" extends="maven-library-provider"> + <label>Maven Portlet 1.0 Libraries</label> + <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/portlet-template10.xml"/> + <enablement> + <and> + <with variable="projectFacets"> + <test property="org.jboss.tools.maven.core.projectFacets" value="jboss.portlet,jboss.m2" forcePluginActivation="true"/> + </with> + <with variable="requestingProjectFacet"> + <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jboss.portlet:1.0" forcePluginActivation="true"/> + </with> + </and> + </enablement> + </provider> + </extension> + + <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> + <provider id="portlet20-maven-library-provider" extends="maven-library-provider"> + <label>Maven Portlet 2.0 Libraries</label> + <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/portlet-template20.xml"/> + <enablement> + <and> + <with variable="projectFacets"> + <test property="org.jboss.tools.maven.core.projectFacets" value="jboss.portlet,jboss.m2" forcePluginActivation="true"/> + </with> + <with variable="requestingProjectFacet"> + <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jboss.portlet:2.0" forcePluginActivation="true"/> + </with> + </and> + </enablement> + </provider> + </extension> + + <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> + <provider id="portletbridge200alpha-maven-library-provider" extends="maven-library-provider"> + <label>Maven Portletbridge 2.0.0 ALPHA Libraries</label> + <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/portletbridge-template200alpha.xml"/> + <enablement> + <and> + <with variable="projectFacets"> + <test property="org.jboss.tools.maven.core.projectFacets" value="jboss.jsfportlet,jboss.m2" forcePluginActivation="true"/> + </with> + <with variable="requestingProjectFacet"> + <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jboss.jsfportlet:1.0" forcePluginActivation="true"/> + </with> + </and> + </enablement> + </provider> + </extension> + <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> + <provider id="portletbridge200alphadep-maven-library-provider" extends="maven-library-provider"> + <label>Maven Portletbridge 2.0.0 ALPHA Libraries with Dependencies</label> + <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/portletbridge-template200alphadep.xml"/> + <enablement> + <and> + <with variable="projectFacets"> + <test property="org.jboss.tools.maven.core.projectFacets" value="jboss.jsfportlet,jboss.m2" forcePluginActivation="true"/> + </with> + <with variable="requestingProjectFacet"> + <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jboss.jsfportlet:1.0" forcePluginActivation="true"/> + </with> + </and> + </enablement> + </provider> + </extension> +</plugin> Added: trunk/maven/plugins/org.jboss.tools.maven.core/poms/portlet-template10.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/poms/portlet-template10.xml (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.core/poms/portlet-template10.xml 2009-09-10 00:28:19 UTC (rev 17510) @@ -0,0 +1,19 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>template</groupId> + <artifactId>template</artifactId> + <packaging>pom</packaging> + <version>0.0.1-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + </dependencies> + +</project> \ No newline at end of file Added: trunk/maven/plugins/org.jboss.tools.maven.core/poms/portlet-template20.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/poms/portlet-template20.xml (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.core/poms/portlet-template20.xml 2009-09-10 00:28:19 UTC (rev 17510) @@ -0,0 +1,19 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>template</groupId> + <artifactId>template</artifactId> + <packaging>pom</packaging> + <version>0.0.1-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + </dependencies> + +</project> \ No newline at end of file Added: trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200alpha.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200alpha.xml (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200alpha.xml 2009-09-10 00:28:19 UTC (rev 17510) @@ -0,0 +1,52 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>template</groupId> + <artifactId>template</artifactId> + <packaging>pom</packaging> + <version>0.0.1-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.jboss.portletbridge</groupId> + <artifactId>portletbridge-api</artifactId> + <version>2.0.0.ALPHA</version> + <exclusions> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + </exclusion> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.portletbridge</groupId> + <artifactId>portletbridge-impl</artifactId> + <version>2.0.0.ALPHA</version> + <exclusions> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + </exclusion> + + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + + </dependencies> +</project> \ No newline at end of file Added: trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200alphadep.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200alphadep.xml (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200alphadep.xml 2009-09-10 00:28:19 UTC (rev 17510) @@ -0,0 +1,117 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>template</groupId> + <artifactId>template</artifactId> + <packaging>pom</packaging> + <version>0.0.1-SNAPSHOT</version> + + <dependencies> + + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + + + <dependency> + <groupId>org.jboss.portletbridge</groupId> + <artifactId>portletbridge-api</artifactId> + <version>2.0.0.ALPHA</version> + <exclusions> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + </exclusion> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.portletbridge</groupId> + <artifactId>portletbridge-impl</artifactId> + <version>2.0.0.ALPHA</version> + <exclusions> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + </exclusion> + + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>3.3.1.GA</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>3.3.1.GA</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </exclusion> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>3.3.1.GA</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.15.B1</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperationConfig.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperationConfig.java 2009-09-10 00:27:18 UTC (rev 17509) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperationConfig.java 2009-09-10 00:28:19 UTC (rev 17510) @@ -1,9 +1,7 @@ package org.jboss.tools.maven.core.libprov; -import org.eclipse.emf.ecore.resource.URIConverter.WriteableOutputStream; import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderInstallOperationConfig; import org.maven.ide.components.pom.Model; -import org.maven.ide.components.pom.util.PomResourceImpl; public class MavenLibraryProviderInstallOperationConfig extends LibraryProviderInstallOperationConfig {