[jbosstools-commits] JBoss Tools SVN: r33628 - in trunk/maven: features/org.jboss.tools.maven.jaxrs.feature and 16 other directories.

Author: fbricon Date: 2011-08-05 07:45:41 -0400 (Fri, 05 Aug 2011) New Revision: 33628 Added: trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/ trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/.project trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/build.properties trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/feature.properties trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/license.html trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/pom.xml trunk/maven/plugins/org.jboss.tools.maven.jaxrs/ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.classpath trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.project trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.settings/ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.settings/org.eclipse.jdt.core.prefs trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.settings/org.eclipse.m2e.core.prefs trunk/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.jaxrs/about.html trunk/maven/plugins/org.jboss.tools.maven.jaxrs/about.ini trunk/maven/plugins/org.jboss.tools.maven.jaxrs/about.mappings trunk/maven/plugins/org.jboss.tools.maven.jaxrs/about.properties trunk/maven/plugins/org.jboss.tools.maven.jaxrs/build.properties trunk/maven/plugins/org.jboss.tools.maven.jaxrs/jboss_about.png trunk/maven/plugins/org.jboss.tools.maven.jaxrs/lifecycle-mapping-metadata.xml trunk/maven/plugins/org.jboss.tools.maven.jaxrs/plugin.properties trunk/maven/plugins/org.jboss.tools.maven.jaxrs/plugin.xml trunk/maven/plugins/org.jboss.tools.maven.jaxrs/pom.xml trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/JaxrsLifecycleMapping.java trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/MavenJaxrsActivator.java trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/Messages.java trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/configurators/ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/configurators/JaxrsProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/configurators/MavenJaxRsConstants.java trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/messages.properties Modified: trunk/maven/features/pom.xml trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencePage.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencesInitializer.java trunk/maven/plugins/pom.xml trunk/maven/site/site.xml Log: JBIDE-9290 : Added JAXRS maven configurator Added: trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/.project =================================================================== --- trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/.project (rev 0) +++ trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/.project 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.maven.jaxrs.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + </natures> +</projectDescription> Added: trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/build.properties =================================================================== --- trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/build.properties (rev 0) +++ trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/build.properties 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,3 @@ +bin.includes = feature.xml,\ + license.html,\ + feature.properties Added: trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/feature.properties =================================================================== --- trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/feature.properties (rev 0) +++ trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/feature.properties 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,53 @@ +############################################################################### +# Copyright (c) 2010-2011 Red Hat, Inc. and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# JBoss by Red Hat - Initial implementation. +############################################################################## +# feature.properties +# contains externalized strings for feature.xml +# "%foo" in feature.xml corresponds to the key "foo" in this file +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file should be translated. + +# "featureName" property - name of the feature +featureName=JBoss Maven JAX-RS Configurator + +# "providerName" property - name of the company that provides the feature +providerName=JBoss by Red Hat + +# "updateSiteName" property - label for the update site +updateSiteName=JBossTools Update Site + +# "description" property - description of the feature +description=JBoss Maven JAX-RS Integration + +# "copyright" property - text of the "Feature Update Copyright" +copyright=Copyright (c) 2010-2011 Red Hat, Inc. and others.\n\ +All rights reserved. This program and the accompanying materials\n\ +are made available under the terms of the Eclipse Public License v1.0\n\ +which accompanies this distribution, and is available at\n\ +http\://www.eclipse.org/legal/epl-v10.html\n\nContributors\:\n\ +JBoss by Red Hat - Initial implementation. + ############### end of copyright property #################################### + +# "licenseURL" property - URL of the "Feature License" +# do not translate value - just change to point to a locale-specific HTML page +licenseURL=license.html + +# START NON-TRANSLATABLE +# "license" property - text of the "Feature Update License" +# should be plain text version of license agreement pointed to be "licenseURL" +license=Red Hat, Inc. licenses these features and plugins to you under \ +certain open source licenses (or aggregations of such licenses), which \ +in a particular case may include the Eclipse Public License, the GNU \ +Lesser General Public License, and/or certain other open source \ +licenses. For precise licensing details, consult the corresponding \ +source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \ +Raleigh NC 27606 USA. +# END NON-TRANSLATABLE +########### end of license property ########################################## Added: trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/feature.xml (rev 0) +++ trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/feature.xml 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.maven.jaxrs.feature" + label="%featureName" + version="1.3.0.qualifier" + provider-name="%providerName" + plugin="org.jboss.tools.maven.jaxrs"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <requires> + <import feature="org.eclipse.m2e.feature" version="1.0" match="greaterOrEqual"/> + <import feature="org.maven.ide.eclipse.wtp.feature" version="0.13.0" match="greaterOrEqual"/> + </requires> + + <plugin + id="org.jboss.tools.maven.jaxrs" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Added: trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/license.html =================================================================== --- trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/license.html (rev 0) +++ trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/license.html 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<html> + +<body> +<p>Red Hat, Inc. licenses these features and plugins to you under +certain open source licenses (or aggregations of such licenses), which +in a particular case may include the Eclipse Public License, the GNU +Lesser General Public License, and/or certain other open source +licenses. For precise licensing details, consult the corresponding +source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, +Raleigh NC 27606 USA. +</p> +</body> +</html> \ No newline at end of file Added: trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/pom.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/pom.xml (rev 0) +++ trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/pom.xml 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools.maven</groupId> + <artifactId>features</artifactId> + <version>1.3.0-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.maven.features</groupId> + <artifactId>org.jboss.tools.maven.jaxrs.feature</artifactId> + <packaging>eclipse-feature</packaging> +</project> \ No newline at end of file Modified: trunk/maven/features/pom.xml =================================================================== --- trunk/maven/features/pom.xml 2011-08-05 11:23:35 UTC (rev 33627) +++ trunk/maven/features/pom.xml 2011-08-05 11:45:41 UTC (rev 33628) @@ -21,6 +21,7 @@ <module>org.jboss.tools.maven.portlet.feature</module> <module>org.jboss.tools.maven.project.examples.feature</module> <module>org.jboss.tools.maven.tests.feature</module> + <module>org.jboss.tools.maven.jaxrs.feature</module> </modules> </project> Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.classpath =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.classpath (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.classpath 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.project =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.project (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.project 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.maven.jaxrs</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.settings/org.eclipse.jdt.core.prefs 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,8 @@ +#Sun Jul 04 21:54:37 CEST 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.settings/org.eclipse.m2e.core.prefs =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.settings/org.eclipse.m2e.core.prefs (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.settings/org.eclipse.m2e.core.prefs 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,5 @@ +#Mon Jul 11 20:38:10 CEST 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/MANIFEST.MF (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/MANIFEST.MF 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,19 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name +Bundle-SymbolicName: org.jboss.tools.maven.jaxrs;singleton:=true +Bundle-Version: 1.3.0.qualifier +Bundle-Activator: org.jboss.tools.maven.jaxrs.MavenJaxrsActivator +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.jboss.tools.maven.core, + org.jboss.tools.maven.ui, + org.jboss.tools.common.model, + org.eclipse.jst.j2ee.core, + org.eclipse.jst.j2ee, + org.eclipse.wst.common.emfworkbench.integration, + org.eclipse.jst.ws.jaxrs.core +Bundle-Localization: plugin +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Vendor: %Bundle-Vendor Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/about.html =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/about.html (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/about.html 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> +<title>JBoss Maven JAX-RS Configurator</title> +<style type="text/css" media="screen"> +<!-- + body { + font-family: Sans-serif, Arial, Helvetica; + } + +--> +</style> +</head> +<body> +<h1>JBoss Maven JAX-RS Configurator</h1> + +<p> +This plugin is part of the JBoss Tools developed by the <a href="http://www.jboss.com">JBoss Inc.</a> +</p> + +<p>Information about this plugin is available at <a href="http://www.jboss.org/tools">JBoss Tools project page</a></p> + +<p> +This software is distributed under the terms of the Eclipse Public License - v 1.0 +(see <a href="www.eclipse.org/legal/epl-v10.html">Eclipse Public License - Version 1.0</a>). +</p> +</body> +</html> \ No newline at end of file Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/about.ini =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/about.ini (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/about.ini 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,27 @@ +# about.ini +# contains information about a feature +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# "%key" are externalized strings defined in about.properties +# This file does not need to be translated. +# test +# Property "aboutText" contains blurb for "About" dialog (translated) +aboutText=%blurb + +# Property "windowImage" contains path to window icon (16x16) +# needed for primary features only + +# Property "featureImage" contains path to feature image (32x32) +featureImage=jboss_about.png + +# Property "aboutImage" contains path to product image (500x330 or 115x164) +# needed for primary features only + +# Property "appName" contains name of the application (not translated) +# needed for primary features only + +# Property "welcomePerspective" contains the id of the perspective in which the +# welcome page is to be opened. +# optional + + + Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/about.mappings =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/about.mappings (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/about.mappings 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,5 @@ +# about.mappings +# contains fill-ins for about.properties +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file does not need to be translated. + Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/about.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/about.properties (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/about.properties 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,2 @@ +blurb=JBoss Maven JAX-RS Configurator\n\nVersion\: {featureVersion}\n\n(c) Copyright JBoss by Red Hat, contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools + Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/build.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/build.properties (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/build.properties 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,12 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml,\ + plugin.properties,\ + about.html,\ + about.ini,\ + about.mappings,\ + about.properties,\ + jboss_about.png,\ + lifecycle-mapping-metadata.xml Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/jboss_about.png =================================================================== (Binary files differ) Property changes on: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/jboss_about.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/lifecycle-mapping-metadata.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/lifecycle-mapping-metadata.xml (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/lifecycle-mapping-metadata.xml 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<lifecycleMappingMetadata> + + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <versionRange>[1.0,)</versionRange> + <goals> + <goal>war</goal> + </goals> + </pluginExecutionFilter> + <action> + <configurator> + <id>org.jboss.tools.maven.jaxrs.configurator</id> + </configurator> + </action> + </pluginExecution> + </pluginExecutions> + +</lifecycleMappingMetadata> \ No newline at end of file Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/plugin.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/plugin.properties (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/plugin.properties 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,5 @@ +Bundle-Vendor = JBoss by Red Hat +Bundle-Name = JBoss Maven JAX-RS Configurator +JAXRS_Project_configurator=JAX-RS +Maven_Configuration_Problem=Maven Configuration Problem +Maven_Configuration_Problems=Maven Configuration Problems \ No newline at end of file Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/plugin.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/plugin.xml (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/plugin.xml 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> + + <extension + point="org.eclipse.m2e.core.lifecycleMappingMetadataSource"> + </extension> + + <extension + point="org.eclipse.m2e.core.lifecycleMappings"> + <lifecycleMapping + class="org.jboss.tools.maven.jaxrs.JaxrsLifecycleMapping" + id="org.jboss.tools.maven.jaxrs.JaxrsLifecycleMapping" + name="JAX-RS Lifecycle mapping"> + </lifecycleMapping> + </extension> + + <extension point="org.eclipse.m2e.core.projectConfigurators"> + <configurator + id="org.jboss.tools.maven.jaxrs.configurator" + class="org.jboss.tools.maven.jaxrs.configurators.JaxrsProjectConfigurator" + name="%JAXRS_Project_configurator" + secondaryTo="org.maven.ide.eclipse.configuration.wtp.configurator"/> + </extension> + + <extension point="org.eclipse.core.resources.markers" + id="org.jbosstools.maven.configuration.jaxrs" + name="%Maven_Configuration_Problem"> + <super type="org.eclipse.m2e.core.maven2Problem.configuration"/> + <persistent value="true"/> + </extension> + + <extension + point="org.eclipse.ui.ide.markerSupport"> + <markerTypeCategory + name="%Maven_Configuration_Problems"> + <markerTypeReference + id="org.jbosstools.maven.configuration.jaxrs"> + </markerTypeReference> + </markerTypeCategory> + </extension> +</plugin> Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/pom.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/pom.xml (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/pom.xml 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools.maven</groupId> + <artifactId>plugins</artifactId> + <version>1.3.0-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.maven.plugins</groupId> + <artifactId>org.jboss.tools.maven.jaxrs</artifactId> + <packaging>eclipse-plugin</packaging> +</project> \ No newline at end of file Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/JaxrsLifecycleMapping.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/JaxrsLifecycleMapping.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/JaxrsLifecycleMapping.java 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,20 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.maven.jaxrs; + +import org.eclipse.m2e.core.project.configurator.AbstractCustomizableLifecycleMapping; + +/** + * @author Fred Bricon + */ +public class JaxrsLifecycleMapping extends AbstractCustomizableLifecycleMapping { + +} Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/MavenJaxrsActivator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/MavenJaxrsActivator.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/MavenJaxrsActivator.java 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,81 @@ +/************************************************************************************* + * Copyright (c) 2008-2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.maven.jaxrs; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class MavenJaxrsActivator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.maven.jaxrs"; //$NON-NLS-1$ + + // The shared instance + private static MavenJaxrsActivator plugin; + + /** + * The constructor + */ + public MavenJaxrsActivator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static MavenJaxrsActivator getDefault() { + return plugin; + } + + public static void log(Throwable e) { + IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, e + .getLocalizedMessage(), e); + getDefault().getLog().log(status); + } + + public static void log(String message) { + IStatus status = new Status(IStatus.WARNING, PLUGIN_ID, message, null); + getDefault().getLog().log(status); + } + + public IDataModel createJaxrsDataModel(IFacetedProject fproj, IProjectFacetVersion facetVersion) { + IDataModel config = null; + return config; + } + +} Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/Messages.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/Messages.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/Messages.java 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,30 @@ +/************************************************************************************* + * Copyright (c) 2008-2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.maven.jaxrs; + +import org.eclipse.osgi.util.NLS; + +/** + * + * @author snjeza + * + */ +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.maven.jaxrs.messages"; //$NON-NLS-1$ + public static String JaxrsProjectConfigurator_The_project_does_not_contain_required_facets; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/configurators/JaxrsProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/configurators/JaxrsProjectConfigurator.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/configurators/JaxrsProjectConfigurator.java 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,214 @@ +/************************************************************************************* + * Copyright (c) 2008-2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.maven.jaxrs.configurators; + +import org.apache.maven.project.MavenProject; +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider; +import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate; +import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderFramework; +import org.eclipse.jst.ws.jaxrs.core.internal.IJAXRSCoreConstants; +import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.IJAXRSFacetInstallDataModelProperties; +import org.eclipse.jst.ws.jaxrs.core.internal.project.facet.JAXRSFacetInstallDataModelProvider; +import org.eclipse.m2e.core.project.IMavenProjectFacade; +import org.eclipse.m2e.core.project.MavenProjectChangedEvent; +import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator; +import org.eclipse.m2e.core.project.configurator.ProjectConfigurationRequest; +import org.eclipse.wst.common.componentcore.ModuleCoreNature; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IProjectFacet; +import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.jboss.tools.common.util.EclipseJavaUtil; +import org.jboss.tools.maven.core.IJBossMavenConstants; +import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider; +import org.jboss.tools.maven.ui.Activator; +import org.maven.ide.eclipse.wtp.WarPluginConfiguration; + +/** + * JAX-RS maven project configurator. + * <br/> + * This configurator adds the JAX-RS facet to a project if it has a dependency on the JAX-RS API. + * + * @author Fred Bricon + * + */ +public class JaxrsProjectConfigurator extends AbstractProjectConfigurator { + + protected static final IProjectFacet dynamicWebFacet; + public static final IProjectFacet JAX_RS_FACET; + public static final IProjectFacetVersion JAX_RS_FACET_1_0; + public static final IProjectFacetVersion JAX_RS_FACET_1_1; + + protected static final IProjectFacet m2Facet; + protected static final IProjectFacetVersion m2Version; + + static { + dynamicWebFacet = ProjectFacetsManager.getProjectFacet("jst.web"); //$NON-NLS-1$ + JAX_RS_FACET = ProjectFacetsManager.getProjectFacet(IJAXRSCoreConstants.JAXRS_FACET_ID); + JAX_RS_FACET_1_0 = JAX_RS_FACET.getVersion(IJAXRSCoreConstants.JAXRS_VERSION_1_0); + JAX_RS_FACET_1_1 = JAX_RS_FACET.getVersion(IJAXRSCoreConstants.JAXRS_VERSION_1_1); + m2Facet = ProjectFacetsManager.getProjectFacet("jboss.m2"); //$NON-NLS-1$ + m2Version = m2Facet.getVersion("1.0"); //$NON-NLS-1$ + } + + @Override + public void configure(ProjectConfigurationRequest request, + IProgressMonitor monitor) throws CoreException { + MavenProject mavenProject = request.getMavenProject(); + IProject project = request.getProject(); + configureInternal(mavenProject,project, monitor); + } + + private void configureInternal(MavenProject mavenProject,IProject project, + IProgressMonitor monitor) throws CoreException { + + if(!"war".equals(mavenProject.getPackaging())) { //$NON-NLS-1$ + return; + } + + IPreferenceStore store = Activator.getDefault().getPreferenceStore(); + boolean configureJaxRs = store.getBoolean(Activator.CONFIGURE_JAXRS); + if (!configureJaxRs) { + return; + } + + final IFacetedProject fproj = ProjectFacetsManager.create(project); + if (fproj == null) { + return; + } + + if (fproj.hasProjectFacet(JAX_RS_FACET) && fproj.hasProjectFacet(m2Facet)) { + //everything already installed. Since there's no support for version update -yet- we bail + return; + } + + IProjectFacetVersion jaxRsVersion = getJaxRsVersion(mavenProject, project); + if (jaxRsVersion != null) { + installFacets(fproj, jaxRsVersion, mavenProject, monitor); + } + + } + + private void installFacets(IFacetedProject fproj, IProjectFacetVersion facetVersion, + MavenProject mavenProject, IProgressMonitor monitor) throws CoreException { + if (!fproj.hasProjectFacet(dynamicWebFacet)) { + Activator.log("The_project_does_not_contain_the_Web_Module_facet"); + } else { + installJaxRsFacet(fproj, facetVersion, mavenProject, monitor); + } + installM2Facet(fproj, monitor); + } + + private void installJaxRsFacet(IFacetedProject fproj, IProjectFacetVersion facetVersion, + MavenProject mavenProject, IProgressMonitor monitor) throws CoreException { + + if (facetVersion != null) { + IStatus status = facetVersion.getConstraint().check(fproj.getProjectFacets()); + if (status.isOK()) { + IDataModel model = createJaxRsDataModel(fproj,facetVersion); + WarPluginConfiguration config = new WarPluginConfiguration(mavenProject, fproj.getProject()); + String warSourceDirectory = config.getWarSourceDirectory(); + model.setProperty(IJAXRSFacetInstallDataModelProperties.WEBCONTENT_DIR, warSourceDirectory); + model.setProperty(IJAXRSFacetInstallDataModelProperties.UPDATEDD, false); + fproj.installProjectFacet(facetVersion, model, monitor); + } else { + addErrorMarker(fproj.getProject(), facetVersion + " can not be installed : "+ status.getMessage()); + for (IStatus st : status.getChildren()) { + addErrorMarker(fproj.getProject(), st.getMessage()); + } + } + } + } + + private IDataModel createJaxRsDataModel(IFacetedProject fproj, + IProjectFacetVersion facetVersion) { + IDataModel config = (IDataModel) new JAXRSFacetInstallDataModelProvider().create(); + LibraryInstallDelegate libraryDelegate = new LibraryInstallDelegate(fproj, facetVersion); + ILibraryProvider provider = LibraryProviderFramework.getProvider(IJAXRSCoreConstants.NO_OP_LIBRARY_ID); + libraryDelegate.setLibraryProvider(provider); + config.setProperty(IJAXRSFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE, libraryDelegate); + return config; + } + + private IProjectFacetVersion getJaxRsVersion(MavenProject mavenProject, IProject project) { + IJavaProject javaProject = JavaCore.create(project); + if (javaProject != null) { + IType type = null; + try { + type = EclipseJavaUtil.findType(javaProject, "javax.ws.rs.ApplicationPath");//$NON-NLS-1$ + if (type != null) { + return JAX_RS_FACET_1_1; + } + + type = EclipseJavaUtil.findType(javaProject, "javax.ws.rs.Path");//$NON-NLS-1$ + if (type != null) { + return JAX_RS_FACET_1_0; + } + } catch (JavaModelException e) { + e.printStackTrace(); + } + } + return null; + } + + private void addErrorMarker(IProject project, String message) { + markerManager.addMarker(project, + MavenJaxRsConstants.JAXRS_CONFIGURATION_ERROR_MARKER_ID, + message + ,-1, IMarker.SEVERITY_ERROR); + + } + + @Override + public void mavenProjectChanged(MavenProjectChangedEvent event, + IProgressMonitor monitor) throws CoreException { + IMavenProjectFacade facade = event.getMavenProject(); + if(facade != null) { + IProject project = facade.getProject(); + if(isWTPProject(project) ) { + MavenProject mavenProject = facade.getMavenProject(monitor); + IMavenProjectFacade oldFacade = event.getOldMavenProject(); + if (oldFacade != null) { + MavenProject oldProject = oldFacade.getMavenProject(monitor); + if (oldProject != null && oldProject.getArtifacts().equals(mavenProject.getArtifacts())) { + //Nothing changed since last build, no need to lookup for new JSF facets + return; + } + } + configureInternal(mavenProject, project, monitor); + } + } + } + + private boolean isWTPProject(IProject project) { + return ModuleCoreNature.getModuleCoreNature(project) != null; + } + + private void installM2Facet(IFacetedProject fproj, IProgressMonitor monitor) throws CoreException { + if (!fproj.hasProjectFacet(m2Facet)) { + IDataModel config = (IDataModel) new MavenFacetInstallDataModelProvider().create(); + config.setBooleanProperty(IJBossMavenConstants.MAVEN_PROJECT_EXISTS, true); + fproj.installProjectFacet(m2Version, config, monitor); + } + } + +} Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/configurators/MavenJaxRsConstants.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/configurators/MavenJaxRsConstants.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/configurators/MavenJaxRsConstants.java 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1,25 @@ +/************************************************************************************* + * Copyright (c) 2008-2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.maven.jaxrs.configurators; + +/** + * + * @author Fred Bricon + * + */ +public class MavenJaxRsConstants { + + public static final String JAXRS_CONFIGURATION_ERROR_MARKER_ID = "org.jbosstools.maven.configuration.jaxrs"; + /** + * Private constructor to prevent instanciation. + */ + private MavenJaxRsConstants() {}; +} Added: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/messages.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/messages.properties (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/messages.properties 2011-08-05 11:45:41 UTC (rev 33628) @@ -0,0 +1 @@ +JaxrsProjectConfigurator_The_project_does_not_contain_required_facets=The {0} project does not contain the Dynamic Web Module facet or the EJB Module facet. Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2011-08-05 11:23:35 UTC (rev 33627) +++ trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2011-08-05 11:45:41 UTC (rev 33628) @@ -100,6 +100,11 @@ private void configureInternal(MavenProject mavenProject,IProject project, IProgressMonitor monitor) throws CoreException { + + if ("war".equals(mavenProject.getPackaging())) {//$NON-NLS-1$ + return; + } + IPreferenceStore store = Activator.getDefault().getPreferenceStore(); boolean configureJSF = store.getBoolean(Activator.CONFIGURE_JSF); if (!configureJSF) { @@ -112,9 +117,8 @@ return; } - String packaging = mavenProject.getPackaging(); String jsfVersion = getJSFVersion(mavenProject, project); - if (fproj != null && jsfVersion != null && "war".equals(packaging)) { //$NON-NLS-1$ + if (fproj != null && jsfVersion != null) { installWarFacets(fproj, jsfVersion, mavenProject, monitor); } } Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2011-08-05 11:23:35 UTC (rev 33627) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2011-08-05 11:45:41 UTC (rev 33628) @@ -45,6 +45,7 @@ import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities; +import org.eclipse.jst.jsf.core.internal.project.facet.IJSFFacetInstallDataModelProperties; import org.eclipse.m2e.core.internal.IMavenConstants; import org.eclipse.m2e.core.internal.MavenPluginActivator; import org.eclipse.m2e.core.internal.project.registry.MavenProjectManager; @@ -351,6 +352,8 @@ throws CoreException { if (!fproj.hasProjectFacet(jsfFacet)) { IDataModel model = MavenJSFActivator.getDefault().createJSFDataModel(fproj,jsfVersion); + //Fix for JBIDE-9454, to prevent complete overwrite of web.xml + model.setBooleanProperty(IJSFFacetInstallDataModelProperties.CONFIGURE_SERVLET,false); fproj.installProjectFacet(jsfVersion, model, monitor); } } Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java 2011-08-05 11:23:35 UTC (rev 33627) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java 2011-08-05 11:45:41 UTC (rev 33628) @@ -79,6 +79,9 @@ public static final boolean CONFIGURE_HIBERNATE_VALUE = true; + public static final String CONFIGURE_JAXRS = "configureJAX-RS"; + + public static final boolean CONFIGURE_JAXRS_VALUE = true; // The shared instance private static Activator plugin; Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java 2011-08-05 11:23:35 UTC (rev 33627) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java 2011-08-05 11:45:41 UTC (rev 33628) @@ -44,6 +44,7 @@ public static String MavenUserLibraryProviderInstallPanel_Scope; public static String MavenUserLibraryProviderInstallPanel_Type; public static String MavenUserLibraryProviderInstallPanel_Version; + public static String ConfiguratorPreferencePage_Configure_JAX_RS_facet; public static String ConfiguratorPreferencePage_Configure_JBoss_JSF_Portlet_facet; public static String ConfiguratorPreferencePage_Configure_JBoss_Portlet_Core_facet; public static String ConfiguratorPreferencePage_Configure_JBoss_Seam_Portlet_facet; Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2011-08-05 11:23:35 UTC (rev 33627) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2011-08-05 11:45:41 UTC (rev 33628) @@ -22,11 +22,12 @@ MavenUserLibraryProviderInstallPanel_Scope=Scope MavenUserLibraryProviderInstallPanel_Type=Type MavenUserLibraryProviderInstallPanel_Version=Version +ConfiguratorPreferencePage_Configure_JAX_RS_facet=JAX-RS facet ConfiguratorPreferencePage_Configure_JBoss_JSF_Portlet_facet=JBoss JSF Portlet facet ConfiguratorPreferencePage_Configure_JBoss_Portlet_Core_facet=JBoss Portlet Core facet ConfiguratorPreferencePage_Configure_JBoss_Seam_Portlet_facet=JBoss Seam Portlet facet ConfiguratorPreferencePage_Configure_JSF_facet=JSF facet -ConfiguratorPreferencePage_Configure_Webxml_JSF20=web.xml for JSF facet +ConfiguratorPreferencePage_Configure_Webxml_JSF20=web.xml for JSF 2 facet ConfiguratorPreferencePage_Configure_CDI_facet=CDI facet ConfiguratorPreferencePage_Configure_Hibernate=Hibernate ConfiguratorPreferencePage_Configure_Seam_Artifacts=Seam Artifacts (view folder, model source folder, package ...) Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencePage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencePage.java 2011-08-05 11:23:35 UTC (rev 33627) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencePage.java 2011-08-05 11:45:41 UTC (rev 33628) @@ -41,6 +41,7 @@ private static final String ORG_JBOSS_TOOLS_MAVEN_CDI = "org.jboss.tools.maven.cdi"; //$NON-NLS-1$ private static final String ORG_JBOSS_TOOLS_MAVEN_HIBERNATE = "org.jboss.tools.maven.hibernate"; //$NON-NLS-1$ private static final String ORG_JBOSS_TOOLS_MAVEN_SEAM = "org.jboss.tools.maven.seam"; //$NON-NLS-1$ + private static final String ORG_JBOSS_TOOLS_MAVEN_JAXRS = "org.jboss.tools.maven.jaxrs"; //$NON-NLS-1$ private Button configureSeamButton; private Button configureSeamRuntimeButton; @@ -52,6 +53,7 @@ private Button configureSeamPortletButton; private Button configureCDIButton; private Button configureHibernateButton; + private Button configureJaxRsButton; @Override protected Control createContents(Composite parent) { @@ -138,6 +140,13 @@ configureHibernateButton.setSelection(configureHibernate); } + if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_JAXRS)) { + configureJaxRsButton = new Button(composite,SWT.CHECK); + configureJaxRsButton.setText(Messages.ConfiguratorPreferencePage_Configure_JAX_RS_facet); + boolean configureJaxRs = store.getBoolean(Activator.CONFIGURE_JAXRS); + configureJaxRsButton.setSelection(configureJaxRs); + } + return composite; } @@ -175,6 +184,10 @@ configureHibernateButton.setSelection(Activator.CONFIGURE_HIBERNATE_VALUE); } + if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_JAXRS)) { + configureJaxRsButton.setSelection(Activator.CONFIGURE_JAXRS_VALUE); + } + IPreferenceStore store = Activator.getDefault().getPreferenceStore(); if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_JSF)) { @@ -202,6 +215,10 @@ if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_HIBERNATE)) { store.setValue(Activator.CONFIGURE_HIBERNATE, Activator.CONFIGURE_HIBERNATE_VALUE); } + + if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_JAXRS)) { + store.setValue(Activator.CONFIGURE_JAXRS, Activator.CONFIGURE_JAXRS_VALUE); + } super.performDefaults(); } @@ -233,7 +250,11 @@ if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_HIBERNATE)) { store.setValue(Activator.CONFIGURE_HIBERNATE, configureHibernateButton.getSelection()); } - + + if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_JAXRS)) { + store.setValue(Activator.CONFIGURE_JAXRS, configureJaxRsButton.getSelection()); + } + return super.performOk(); } Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencesInitializer.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencesInitializer.java 2011-08-05 11:23:35 UTC (rev 33627) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencesInitializer.java 2011-08-05 11:45:41 UTC (rev 33628) @@ -57,6 +57,9 @@ node.putBoolean( Activator.CONFIGURE_HIBERNATE, Activator.CONFIGURE_HIBERNATE_VALUE); + node.putBoolean( + Activator.CONFIGURE_JAXRS, + Activator.CONFIGURE_JAXRS_VALUE); } } Modified: trunk/maven/plugins/pom.xml =================================================================== --- trunk/maven/plugins/pom.xml 2011-08-05 11:23:35 UTC (rev 33627) +++ trunk/maven/plugins/pom.xml 2011-08-05 11:45:41 UTC (rev 33628) @@ -21,6 +21,7 @@ <module>org.jboss.tools.maven.hibernate</module> <module>org.jboss.tools.maven.portlet</module> <module>org.jboss.tools.maven.project.examples</module> + <module>org.jboss.tools.maven.jaxrs</module> </modules> </project> Modified: trunk/maven/site/site.xml =================================================================== --- trunk/maven/site/site.xml 2011-08-05 11:23:35 UTC (rev 33627) +++ trunk/maven/site/site.xml 2011-08-05 11:45:41 UTC (rev 33628) @@ -26,6 +26,9 @@ <feature url="features/org.jboss.tools.maven.project.examples.feature_0.0.0.jar" id="org.jboss.tools.maven.project.examples.feature" version="0.0.0"> <category name="JBoss Tools maven Nightly Build Update Site"/> </feature> + <feature url="features/org.jboss.tools.maven.jaxrs.feature_0.0.0.jar" id="org.jboss.tools.maven.jaxrs.feature" version="0.0.0"> + <category name="JBoss Tools maven Nightly Build Update Site"/> + </feature> <feature url="features/org.jboss.tools.maven.tests.feature_0.0.0.jar" id="org.jboss.tools.maven.tests.feature" version="0.0.0"> <category name="JBoss Tools maven Nightly Build Update Site"/> </feature>