JBoss Tools SVN: r23335 - trunk/portlet/plugins/org.jboss.tools.portlet.core.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-07-08 20:08:58 -0400 (Thu, 08 Jul 2010)
New Revision: 23335
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/plugin.xml
Log:
https://jira.jboss.org/browse/JBIDE-6477 JBDS 3.0.1, EPP 5 and the Seam Portlet Configuration
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/plugin.xml
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/plugin.xml 2010-07-08 23:58:52 UTC (rev 23334)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/plugin.xml 2010-07-09 00:08:58 UTC (rev 23335)
@@ -245,6 +245,20 @@
</static-preset>
</extension>
+ <extension
+ point="org.eclipse.wst.common.project.facet.core.presets">
+ <static-preset id="preset.jboss.seamportlet.v22">
+ <label>JBoss Seam Portlet Project v2.2</label>
+ <facet id="jst.java" version="5.0" />
+ <facet id="jst.web" version="2.5"/>
+ <facet id="jst.jsf" version="1.2"/>
+ <facet id="jboss.portlet" version="2.0" />
+ <facet id="jboss.jsfportlet" version="1.0" />
+ <facet id="jboss.seamportlet" version="1.0" />
+ <facet id="jst.seam" version="2.2" />
+ <description>JBoss Seam Portlet Project v2.2</description>
+ </static-preset>
+ </extension>
<!--
<extension
point="org.eclipse.wst.common.project.facet.core.presets">
15 years, 9 months
JBoss Tools SVN: r23334 - in branches/jbosstools-3.2.0.M1/maven/plugins: org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-07-08 19:58:52 -0400 (Thu, 08 Jul 2010)
New Revision: 23334
Modified:
branches/jbosstools-3.2.0.M1/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
branches/jbosstools-3.2.0.M1/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
branches/jbosstools-3.2.0.M1/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/ParentAdder.java
Log:
https://jira.jboss.org/browse/JBIDE-6587 Source directories aren't configured correctly when creating mavenized Seam WAR Web Project
Modified: branches/jbosstools-3.2.0.M1/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
===================================================================
--- branches/jbosstools-3.2.0.M1/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2010-07-08 23:54:39 UTC (rev 23333)
+++ branches/jbosstools-3.2.0.M1/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2010-07-08 23:58:52 UTC (rev 23334)
@@ -68,7 +68,7 @@
*/
public class MavenCoreActivator extends Plugin {
- private static final String SEPARATOR = "/"; //$NON-NLS-1$
+ public static final String SEPARATOR = "/"; //$NON-NLS-1$
// The plug-in ID
public static final String PLUGIN_ID = "org.jboss.tools.maven.core"; //$NON-NLS-1$
Modified: branches/jbosstools-3.2.0.M1/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
===================================================================
--- branches/jbosstools-3.2.0.M1/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-07-08 23:54:39 UTC (rev 23333)
+++ branches/jbosstools-3.2.0.M1/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-07-08 23:58:52 UTC (rev 23334)
@@ -5,7 +5,9 @@
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import org.apache.maven.model.Build;
@@ -23,7 +25,10 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.xmi.XMIResource;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
@@ -46,22 +51,27 @@
import org.jboss.tools.seam.core.project.facet.SeamVersion;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
import org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate;
+import org.maven.ide.components.pom.Configuration;
+import org.maven.ide.components.pom.Plugin;
+import org.maven.ide.components.pom.PluginExecution;
+import org.maven.ide.components.pom.PomFactory;
+import org.maven.ide.components.pom.util.PomResourceImpl;
import org.maven.ide.eclipse.MavenPlugin;
import org.maven.ide.eclipse.core.IMavenConstants;
import org.maven.ide.eclipse.embedder.MavenModelManager;
+import org.maven.ide.eclipse.embedder.ProjectUpdater;
import org.maven.ide.eclipse.project.MavenProjectManager;
import org.maven.ide.eclipse.project.ResolverConfiguration;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.w3c.dom.Node;
/**
* The activator class controls the plug-in life cycle
*/
public class MavenSeamActivator extends AbstractUIPlugin {
- private static final String WAR_ARCHIVE_SUFFIX = ".war"; //$NON-NLS-1$
-
- private static final String EJB_ARCHIVE_SUFFIX = ".jar"; //$NON-NLS-1$
+ private static final String ORG_CODEHAUS_MOJO = "org.codehaus.mojo"; //$NON-NLS-1$
private static final String TEST_SUFFIX = "-test"; //$NON-NLS-1$
@@ -298,10 +308,7 @@
if (project == null || !project.exists()) {
return;
}
- IVirtualComponent component = ComponentCore.createComponent(webProject);
- IVirtualFolder rootFolder = component.getRootFolder();
- IContainer root = rootFolder.getUnderlyingFolder();
- String webContent = root.getProjectRelativePath().toString();
+ String webContent = getRootComponent(webProject);
resource.setDirectory(MavenCoreActivator.BASEDIR + "/../" + webProjectName + "/" + webContent); //$NON-NLS-1$ //$NON-NLS-2$
excludes = new ArrayList<String>();
excludes.add("**/*.java"); //$NON-NLS-1$
@@ -567,7 +574,13 @@
String artifactId = parentProjectName;
String groupId = m2FacetModel.getStringProperty(IJBossMavenConstants.GROUP_ID);
String version = m2FacetModel.getStringProperty(IJBossMavenConstants.VERSION);
- modelManager.updateProject(pomFile, new ParentAdder(groupId, artifactId, version));
+ String relativePath = null;
+ if (SeamFacetAbstractInstallDelegate
+ .isWarConfiguration(seamFacetModel)) {
+ relativePath = "../" + parentProjectName; //$NON-NLS-1$
+ }
+ ParentAdder parentAdder = new ParentAdder(groupId, artifactId, version, relativePath);
+ modelManager.updateProject(pomFile, parentAdder);
Dependency dependency = getHibernateValidator();
//dependency.setScope("provided");
@@ -697,6 +710,7 @@
dependency.setGroupId("commons-digester"); //$NON-NLS-1$
dependency.setArtifactId("commons-digester"); //$NON-NLS-1$
modelManager.addDependency(pomFile,dependency);
+ modelManager.updateProject(pomFile, new WarProjectUpdater(webProject));
}
// ejb project
@@ -711,12 +725,44 @@
dependency.setScope("provided"); //$NON-NLS-1$
modelManager.addDependency(pomFile,dependency);
}
+
+ modelManager.updateProject(pomFile, new WarProjectUpdater(webProject));
removeWTPContainers(m2FacetModel, webProject);
} catch (Exception e) {
MavenSeamActivator.log(e);
}
}
+
+
+ private static String getRootComponent(IProject webProject) {
+ IVirtualComponent component = ComponentCore.createComponent(webProject);
+ IVirtualFolder rootFolder = component.getRootFolder();
+ IContainer root = rootFolder.getUnderlyingFolder();
+ String webContentRoot = root.getProjectRelativePath().toString();
+ return webContentRoot;
+ }
+
+ private static Plugin getPlugin(org.maven.ide.components.pom.Build build,
+ String groupId, String artifactId) {
+ EList<Plugin> plugins = build.getPlugins();
+ for (Plugin plugin : plugins) {
+ String group = plugin.getGroupId();
+ if (group == null) {
+ group = ORG_CODEHAUS_MOJO;
+ }
+ String artifact = plugin.getArtifactId();
+ if (group.equals(groupId) && artifactId.equals(artifact)) {
+ return plugin;
+ }
+ }
+ Plugin newPlugin = PomFactory.eINSTANCE.createPlugin();
+ newPlugin.setGroupId(groupId);
+ newPlugin.setArtifactId(artifactId);
+ build.getPlugins().add(newPlugin);
+ return newPlugin;
+ }
+
private void removeWTPContainers(IDataModel m2FacetModel,
IProject webProject) throws JavaModelException {
if (m2FacetModel.getBooleanProperty(IJBossMavenConstants.REMOVE_WTP_CLASSPATH_CONTAINERS)) {
@@ -941,4 +987,168 @@
getDefault().getLog().log(status);
}
+ public static class WarProjectUpdater extends ProjectUpdater {
+
+ private static final String WAR_SOURCE_DIRECTORY = "warSourceDirectory"; //$NON-NLS-1$
+ private static final String WAR_SOURCE_EXCLUDES = "warSourceExcludes"; //$NON-NLS-1$
+ private IProject webProject;
+
+ public WarProjectUpdater(IProject project) {
+ webProject = project;
+ }
+
+ public void update(org.maven.ide.components.pom.Model projectModel) {
+ org.maven.ide.components.pom.Build build = projectModel.getBuild();
+ if (build == null) {
+ // FIXME
+ return;
+ }
+ IJavaProject javaProject = JavaCore.create(webProject);
+ if (javaProject == null) {
+ return;
+ }
+ if (!javaProject.isOpen()) {
+ try {
+ javaProject.open(new NullProgressMonitor());
+ } catch (JavaModelException e) {
+ MavenSeamActivator.log(e);
+ return;
+ }
+ }
+ IPath projectOutput;
+ IClasspathEntry[] entries;
+ try {
+ projectOutput = javaProject.getOutputLocation();
+ entries = javaProject.getRawClasspath();
+ } catch (JavaModelException e) {
+ MavenSeamActivator.log(e);
+ return;
+ }
+ List<IPath> sources = new ArrayList<IPath>();
+ List<IPath> outputs = new ArrayList<IPath>();
+ for (int i = 0; i < entries.length; i++) {
+ if (entries[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
+ IPath path = entries[i].getPath();
+ sources.add(path);
+ IPath output = entries[i].getOutputLocation();
+ if (output != null && !output.equals(projectOutput)) {
+ outputs.add(output);
+ }
+ }
+ }
+ int indexSource = 0;
+ for (IPath source:sources) {
+ if (source != null && source.toString().contains("main")) { //$NON-NLS-1$
+ indexSource = sources.indexOf(source);
+ }
+ }
+ if (sources.size() > 0) {
+
+ IPath path = sources.get(indexSource);
+ path = path.makeRelativeTo(javaProject.getPath());
+ String value = path.toString();
+ if (value.startsWith(MavenCoreActivator.SEPARATOR)) {
+ value = MavenCoreActivator.BASEDIR + value;
+ } else {
+ value = MavenCoreActivator.BASEDIR + MavenCoreActivator.SEPARATOR + value;
+ }
+ build.setSourceDirectory(value);
+ }
+
+ if (projectOutput != null) {
+ String value = projectOutput.toString();
+ if (value.startsWith(MavenCoreActivator.SEPARATOR)) {
+ value = MavenCoreActivator.BASEDIR + value;
+ } else {
+ value = MavenCoreActivator.BASEDIR + MavenCoreActivator.SEPARATOR + value;
+ }
+ build.setOutputDirectory(value);
+ }
+
+ EList<org.maven.ide.components.pom.Resource> resources = build.getResources();
+ resources.clear();
+ for (IPath source:sources) {
+ org.maven.ide.components.pom.Resource resource = PomFactory.eINSTANCE.createResource();
+ String value = source.makeRelativeTo(javaProject.getPath()).toString();
+ if (value.startsWith(MavenCoreActivator.SEPARATOR)) {
+ value = MavenCoreActivator.BASEDIR + value;
+ } else {
+ value = MavenCoreActivator.BASEDIR + MavenCoreActivator.SEPARATOR + value;
+ }
+ resource.setDirectory(value);
+ resource.getExcludes().add("**/*.java"); //$NON-NLS-1$
+ resources.add(resource);
+ }
+
+ if (outputs.size() > 0) {
+ Plugin plugin = getPlugin(build, ORG_CODEHAUS_MOJO, "maven-war-plugin"); //$NON-NLS-1$
+ Configuration configuration = plugin.getConfiguration();
+
+ if (configuration == null) {
+ configuration = PomFactory.eINSTANCE.createConfiguration();
+ plugin.setConfiguration(configuration);
+ configuration.createNode(WAR_SOURCE_DIRECTORY);
+ String value = getRootComponent(webProject);
+ if (value.startsWith(MavenCoreActivator.SEPARATOR)) {
+ value = MavenCoreActivator.BASEDIR + value;
+ } else {
+ value = MavenCoreActivator.BASEDIR + MavenCoreActivator.SEPARATOR + value;
+ }
+ configuration.setStringValue(WAR_SOURCE_DIRECTORY, value);
+ }
+ StringBuffer buffer = new StringBuffer();
+ boolean first = true;
+ for (IPath output:outputs) {
+ if (first) {
+ first = false;
+ } else {
+ buffer.append(","); //$NON-NLS-1$
+ }
+ String root = getRootComponent(webProject);
+ output=output.makeRelativeTo(javaProject.getPath());
+ String outputString = output.toString();
+ if (outputString.startsWith(root)) {
+ outputString = outputString.substring(root.length());
+ }
+ outputString = outputString.trim();
+ buffer.append(outputString);
+ buffer.append("/**"); //$NON-NLS-1$
+
+ }
+ String excludeString = buffer.toString().trim();
+ if (excludeString.startsWith(MavenCoreActivator.SEPARATOR)) {
+ excludeString = excludeString.substring(1);
+ }
+ configuration.setStringValue(WAR_SOURCE_EXCLUDES, excludeString);
+ }
+ sources.remove(indexSource);
+ if (sources.size() > 0) {
+
+ Plugin plugin = getPlugin(build, ORG_CODEHAUS_MOJO , "build-helper-maven-plugin"); //$NON-NLS-1$
+ plugin.setVersion("1.5"); //$NON-NLS-1$
+ plugin.getExecutions().clear();
+
+ PluginExecution execution = PomFactory.eINSTANCE.createPluginExecution();
+ execution.setId("add-source"); //$NON-NLS-1$
+ execution.setPhase("generate-sources"); //$NON-NLS-1$
+ execution.getGoals().add("add-source"); //$NON-NLS-1$
+ plugin.getExecutions().add(execution);
+ Configuration configuration = PomFactory.eINSTANCE.createConfiguration();
+ execution.setConfiguration(configuration);
+ Node n = configuration.createNode("sources"); //$NON-NLS-1$
+ for (IPath source:sources) {
+ Node node = n.getOwnerDocument().createElement("source"); //$NON-NLS-1$
+ n.appendChild(node);
+ source = source.makeRelativeTo(javaProject.getPath());
+ String value = source.toString();
+ if (value.startsWith(MavenCoreActivator.SEPARATOR)) {
+ value = MavenCoreActivator.BASEDIR + value;
+ } else {
+ value = MavenCoreActivator.BASEDIR + MavenCoreActivator.SEPARATOR + value;
+ }
+ node.appendChild(node.getOwnerDocument().createTextNode(value));
+ }
+ }
+ }
+ }
}
Modified: branches/jbosstools-3.2.0.M1/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/ParentAdder.java
===================================================================
--- branches/jbosstools-3.2.0.M1/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/ParentAdder.java 2010-07-08 23:54:39 UTC (rev 23333)
+++ branches/jbosstools-3.2.0.M1/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/ParentAdder.java 2010-07-08 23:58:52 UTC (rev 23334)
@@ -11,11 +11,13 @@
private final String groupId;
private final String artifactId;
private final String version;
+ private String relativePath;
- public ParentAdder(String groupId, String artifactId, String version) {
+ public ParentAdder(String groupId, String artifactId, String version, String relativePath) {
this.groupId = groupId;
this.artifactId = artifactId;
this.version = version;
+ this.relativePath = relativePath;
}
public void update(Model model) {
@@ -25,6 +27,9 @@
parent.setArtifactId(artifactId);
parent.setGroupId(groupId);
parent.setVersion(version);
+ if (relativePath != null) {
+ parent.setRelativePath(relativePath);
+ }
model.setParent(parent);
}
}
15 years, 9 months
JBoss Tools SVN: r23333 - in trunk/maven/plugins: org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-07-08 19:54:39 -0400 (Thu, 08 Jul 2010)
New Revision: 23333
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/ParentAdder.java
Log:
https://jira.jboss.org/browse/JBIDE-6587 Source directories aren't configured correctly when creating mavenized Seam WAR Web Project
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2010-07-08 22:22:44 UTC (rev 23332)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2010-07-08 23:54:39 UTC (rev 23333)
@@ -68,7 +68,7 @@
*/
public class MavenCoreActivator extends Plugin {
- private static final String SEPARATOR = "/"; //$NON-NLS-1$
+ public static final String SEPARATOR = "/"; //$NON-NLS-1$
// The plug-in ID
public static final String PLUGIN_ID = "org.jboss.tools.maven.core"; //$NON-NLS-1$
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-07-08 22:22:44 UTC (rev 23332)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-07-08 23:54:39 UTC (rev 23333)
@@ -5,7 +5,9 @@
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import org.apache.maven.model.Build;
@@ -23,7 +25,10 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.xmi.XMIResource;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
@@ -46,22 +51,27 @@
import org.jboss.tools.seam.core.project.facet.SeamVersion;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
import org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate;
+import org.maven.ide.components.pom.Configuration;
+import org.maven.ide.components.pom.Plugin;
+import org.maven.ide.components.pom.PluginExecution;
+import org.maven.ide.components.pom.PomFactory;
+import org.maven.ide.components.pom.util.PomResourceImpl;
import org.maven.ide.eclipse.MavenPlugin;
import org.maven.ide.eclipse.core.IMavenConstants;
import org.maven.ide.eclipse.embedder.MavenModelManager;
+import org.maven.ide.eclipse.embedder.ProjectUpdater;
import org.maven.ide.eclipse.project.MavenProjectManager;
import org.maven.ide.eclipse.project.ResolverConfiguration;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.w3c.dom.Node;
/**
* The activator class controls the plug-in life cycle
*/
public class MavenSeamActivator extends AbstractUIPlugin {
- private static final String WAR_ARCHIVE_SUFFIX = ".war"; //$NON-NLS-1$
-
- private static final String EJB_ARCHIVE_SUFFIX = ".jar"; //$NON-NLS-1$
+ private static final String ORG_CODEHAUS_MOJO = "org.codehaus.mojo"; //$NON-NLS-1$
private static final String TEST_SUFFIX = "-test"; //$NON-NLS-1$
@@ -298,10 +308,7 @@
if (project == null || !project.exists()) {
return;
}
- IVirtualComponent component = ComponentCore.createComponent(webProject);
- IVirtualFolder rootFolder = component.getRootFolder();
- IContainer root = rootFolder.getUnderlyingFolder();
- String webContent = root.getProjectRelativePath().toString();
+ String webContent = getRootComponent(webProject);
resource.setDirectory(MavenCoreActivator.BASEDIR + "/../" + webProjectName + "/" + webContent); //$NON-NLS-1$ //$NON-NLS-2$
excludes = new ArrayList<String>();
excludes.add("**/*.java"); //$NON-NLS-1$
@@ -567,7 +574,13 @@
String artifactId = parentProjectName;
String groupId = m2FacetModel.getStringProperty(IJBossMavenConstants.GROUP_ID);
String version = m2FacetModel.getStringProperty(IJBossMavenConstants.VERSION);
- modelManager.updateProject(pomFile, new ParentAdder(groupId, artifactId, version));
+ String relativePath = null;
+ if (SeamFacetAbstractInstallDelegate
+ .isWarConfiguration(seamFacetModel)) {
+ relativePath = "../" + parentProjectName; //$NON-NLS-1$
+ }
+ ParentAdder parentAdder = new ParentAdder(groupId, artifactId, version, relativePath);
+ modelManager.updateProject(pomFile, parentAdder);
Dependency dependency = getHibernateValidator();
//dependency.setScope("provided");
@@ -697,6 +710,7 @@
dependency.setGroupId("commons-digester"); //$NON-NLS-1$
dependency.setArtifactId("commons-digester"); //$NON-NLS-1$
modelManager.addDependency(pomFile,dependency);
+ modelManager.updateProject(pomFile, new WarProjectUpdater(webProject));
}
// ejb project
@@ -711,12 +725,44 @@
dependency.setScope("provided"); //$NON-NLS-1$
modelManager.addDependency(pomFile,dependency);
}
+
+ modelManager.updateProject(pomFile, new WarProjectUpdater(webProject));
removeWTPContainers(m2FacetModel, webProject);
} catch (Exception e) {
MavenSeamActivator.log(e);
}
}
+
+
+ private static String getRootComponent(IProject webProject) {
+ IVirtualComponent component = ComponentCore.createComponent(webProject);
+ IVirtualFolder rootFolder = component.getRootFolder();
+ IContainer root = rootFolder.getUnderlyingFolder();
+ String webContentRoot = root.getProjectRelativePath().toString();
+ return webContentRoot;
+ }
+
+ private static Plugin getPlugin(org.maven.ide.components.pom.Build build,
+ String groupId, String artifactId) {
+ EList<Plugin> plugins = build.getPlugins();
+ for (Plugin plugin : plugins) {
+ String group = plugin.getGroupId();
+ if (group == null) {
+ group = ORG_CODEHAUS_MOJO;
+ }
+ String artifact = plugin.getArtifactId();
+ if (group.equals(groupId) && artifactId.equals(artifact)) {
+ return plugin;
+ }
+ }
+ Plugin newPlugin = PomFactory.eINSTANCE.createPlugin();
+ newPlugin.setGroupId(groupId);
+ newPlugin.setArtifactId(artifactId);
+ build.getPlugins().add(newPlugin);
+ return newPlugin;
+ }
+
private void removeWTPContainers(IDataModel m2FacetModel,
IProject webProject) throws JavaModelException {
if (m2FacetModel.getBooleanProperty(IJBossMavenConstants.REMOVE_WTP_CLASSPATH_CONTAINERS)) {
@@ -941,4 +987,168 @@
getDefault().getLog().log(status);
}
+ public static class WarProjectUpdater extends ProjectUpdater {
+
+ private static final String WAR_SOURCE_DIRECTORY = "warSourceDirectory"; //$NON-NLS-1$
+ private static final String WAR_SOURCE_EXCLUDES = "warSourceExcludes"; //$NON-NLS-1$
+ private IProject webProject;
+
+ public WarProjectUpdater(IProject project) {
+ webProject = project;
+ }
+
+ public void update(org.maven.ide.components.pom.Model projectModel) {
+ org.maven.ide.components.pom.Build build = projectModel.getBuild();
+ if (build == null) {
+ // FIXME
+ return;
+ }
+ IJavaProject javaProject = JavaCore.create(webProject);
+ if (javaProject == null) {
+ return;
+ }
+ if (!javaProject.isOpen()) {
+ try {
+ javaProject.open(new NullProgressMonitor());
+ } catch (JavaModelException e) {
+ MavenSeamActivator.log(e);
+ return;
+ }
+ }
+ IPath projectOutput;
+ IClasspathEntry[] entries;
+ try {
+ projectOutput = javaProject.getOutputLocation();
+ entries = javaProject.getRawClasspath();
+ } catch (JavaModelException e) {
+ MavenSeamActivator.log(e);
+ return;
+ }
+ List<IPath> sources = new ArrayList<IPath>();
+ List<IPath> outputs = new ArrayList<IPath>();
+ for (int i = 0; i < entries.length; i++) {
+ if (entries[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
+ IPath path = entries[i].getPath();
+ sources.add(path);
+ IPath output = entries[i].getOutputLocation();
+ if (output != null && !output.equals(projectOutput)) {
+ outputs.add(output);
+ }
+ }
+ }
+ int indexSource = 0;
+ for (IPath source:sources) {
+ if (source != null && source.toString().contains("main")) { //$NON-NLS-1$
+ indexSource = sources.indexOf(source);
+ }
+ }
+ if (sources.size() > 0) {
+
+ IPath path = sources.get(indexSource);
+ path = path.makeRelativeTo(javaProject.getPath());
+ String value = path.toString();
+ if (value.startsWith(MavenCoreActivator.SEPARATOR)) {
+ value = MavenCoreActivator.BASEDIR + value;
+ } else {
+ value = MavenCoreActivator.BASEDIR + MavenCoreActivator.SEPARATOR + value;
+ }
+ build.setSourceDirectory(value);
+ }
+
+ if (projectOutput != null) {
+ String value = projectOutput.toString();
+ if (value.startsWith(MavenCoreActivator.SEPARATOR)) {
+ value = MavenCoreActivator.BASEDIR + value;
+ } else {
+ value = MavenCoreActivator.BASEDIR + MavenCoreActivator.SEPARATOR + value;
+ }
+ build.setOutputDirectory(value);
+ }
+
+ EList<org.maven.ide.components.pom.Resource> resources = build.getResources();
+ resources.clear();
+ for (IPath source:sources) {
+ org.maven.ide.components.pom.Resource resource = PomFactory.eINSTANCE.createResource();
+ String value = source.makeRelativeTo(javaProject.getPath()).toString();
+ if (value.startsWith(MavenCoreActivator.SEPARATOR)) {
+ value = MavenCoreActivator.BASEDIR + value;
+ } else {
+ value = MavenCoreActivator.BASEDIR + MavenCoreActivator.SEPARATOR + value;
+ }
+ resource.setDirectory(value);
+ resource.getExcludes().add("**/*.java"); //$NON-NLS-1$
+ resources.add(resource);
+ }
+
+ if (outputs.size() > 0) {
+ Plugin plugin = getPlugin(build, ORG_CODEHAUS_MOJO, "maven-war-plugin"); //$NON-NLS-1$
+ Configuration configuration = plugin.getConfiguration();
+
+ if (configuration == null) {
+ configuration = PomFactory.eINSTANCE.createConfiguration();
+ plugin.setConfiguration(configuration);
+ configuration.createNode(WAR_SOURCE_DIRECTORY);
+ String value = getRootComponent(webProject);
+ if (value.startsWith(MavenCoreActivator.SEPARATOR)) {
+ value = MavenCoreActivator.BASEDIR + value;
+ } else {
+ value = MavenCoreActivator.BASEDIR + MavenCoreActivator.SEPARATOR + value;
+ }
+ configuration.setStringValue(WAR_SOURCE_DIRECTORY, value);
+ }
+ StringBuffer buffer = new StringBuffer();
+ boolean first = true;
+ for (IPath output:outputs) {
+ if (first) {
+ first = false;
+ } else {
+ buffer.append(","); //$NON-NLS-1$
+ }
+ String root = getRootComponent(webProject);
+ output=output.makeRelativeTo(javaProject.getPath());
+ String outputString = output.toString();
+ if (outputString.startsWith(root)) {
+ outputString = outputString.substring(root.length());
+ }
+ outputString = outputString.trim();
+ buffer.append(outputString);
+ buffer.append("/**"); //$NON-NLS-1$
+
+ }
+ String excludeString = buffer.toString().trim();
+ if (excludeString.startsWith(MavenCoreActivator.SEPARATOR)) {
+ excludeString = excludeString.substring(1);
+ }
+ configuration.setStringValue(WAR_SOURCE_EXCLUDES, excludeString);
+ }
+ sources.remove(indexSource);
+ if (sources.size() > 0) {
+
+ Plugin plugin = getPlugin(build, ORG_CODEHAUS_MOJO , "build-helper-maven-plugin"); //$NON-NLS-1$
+ plugin.setVersion("1.5"); //$NON-NLS-1$
+ plugin.getExecutions().clear();
+
+ PluginExecution execution = PomFactory.eINSTANCE.createPluginExecution();
+ execution.setId("add-source"); //$NON-NLS-1$
+ execution.setPhase("generate-sources"); //$NON-NLS-1$
+ execution.getGoals().add("add-source"); //$NON-NLS-1$
+ plugin.getExecutions().add(execution);
+ Configuration configuration = PomFactory.eINSTANCE.createConfiguration();
+ execution.setConfiguration(configuration);
+ Node n = configuration.createNode("sources"); //$NON-NLS-1$
+ for (IPath source:sources) {
+ Node node = n.getOwnerDocument().createElement("source"); //$NON-NLS-1$
+ n.appendChild(node);
+ source = source.makeRelativeTo(javaProject.getPath());
+ String value = source.toString();
+ if (value.startsWith(MavenCoreActivator.SEPARATOR)) {
+ value = MavenCoreActivator.BASEDIR + value;
+ } else {
+ value = MavenCoreActivator.BASEDIR + MavenCoreActivator.SEPARATOR + value;
+ }
+ node.appendChild(node.getOwnerDocument().createTextNode(value));
+ }
+ }
+ }
+ }
}
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/ParentAdder.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/ParentAdder.java 2010-07-08 22:22:44 UTC (rev 23332)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/ParentAdder.java 2010-07-08 23:54:39 UTC (rev 23333)
@@ -11,11 +11,13 @@
private final String groupId;
private final String artifactId;
private final String version;
+ private String relativePath;
- public ParentAdder(String groupId, String artifactId, String version) {
+ public ParentAdder(String groupId, String artifactId, String version, String relativePath) {
this.groupId = groupId;
this.artifactId = artifactId;
this.version = version;
+ this.relativePath = relativePath;
}
public void update(Model model) {
@@ -25,6 +27,9 @@
parent.setArtifactId(artifactId);
parent.setGroupId(groupId);
parent.setVersion(version);
+ if (relativePath != null) {
+ parent.setRelativePath(relativePath);
+ }
model.setParent(parent);
}
}
15 years, 9 months
JBoss Tools SVN: r23332 - trunk/bpel/releng.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-08 18:22:44 -0400 (Thu, 08 Jul 2010)
New Revision: 23332
Modified:
trunk/bpel/releng/build.properties
Log:
bump up to helios requirements; simplify requirements (conflicts between IUs)
Modified: trunk/bpel/releng/build.properties
===================================================================
--- trunk/bpel/releng/build.properties 2010-07-08 22:16:49 UTC (rev 23331)
+++ trunk/bpel/releng/build.properties 2010-07-08 22:22:44 UTC (rev 23332)
@@ -26,7 +26,7 @@
http://download.eclipse.org/eclipse/updates/3.6.x
# required if building bpel.compare.ui: org.eclipse.gmf.runtime.diagram.ui+org.eclipse.emf.compare.match+org.eclipse.emf.compare.diff+org.eclipse.emf.compare.ui+\
-IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+org.eclipse.core.net+org.eclipse.equinox.common+org.eclipse.core.runtime+org.eclipse.debug.core+org.eclipse.rcp.feature.group+\
+IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.core.net+org.eclipse.equinox.common+org.eclipse.core.runtime+org.eclipse.debug.core+org.eclipse.rcp.feature.group+\
org.eclipse.jst.server.generic.core+\
org.eclipse.wst.ws_core.feature.feature.group+org.eclipse.wst.web_ui.feature.feature.group+org.eclipse.wst.ws_wsdl15.feature.feature.group+\
org.eclipse.wst.xml_ui.feature.feature.group+org.eclipse.wst.common_ui.feature.feature.group+org.eclipse.wst.common_core.feature.feature.group+\
15 years, 9 months
JBoss Tools SVN: r23330 - branches/jbosstools-3.2.0.M1.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-08 18:16:43 -0400 (Thu, 08 Jul 2010)
New Revision: 23330
Modified:
branches/jbosstools-3.2.0.M1/parent-pom.xml
Log:
merge changes to trunk into branch; fix spacing
Modified: branches/jbosstools-3.2.0.M1/parent-pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M1/parent-pom.xml 2010-07-08 22:14:21 UTC (rev 23329)
+++ branches/jbosstools-3.2.0.M1/parent-pom.xml 2010-07-08 22:16:43 UTC (rev 23330)
@@ -85,8 +85,8 @@
<version>${tychoVersion}</version>
<configuration>
<!-- timeout in seconds -->
- <surefire.timeout>900</surefire.timeout>
- <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds>
+ <surefire.timeout>1200</surefire.timeout>
+ <forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds>
<useUIHarness>true</useUIHarness>
<useUIThread>true</useUIThread>
<argLine>${memoryOptions1} ${memoryOptions2} ${systemProperties}
@@ -176,6 +176,9 @@
-->
<profile>
<id>helios-no-target</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
<repositories>
<repository>
<id>helios</id>
@@ -271,9 +274,6 @@
</repository>
</repositories>
</profile>
-
- <!-- TODO: verify that this profile overrides the default profile if BUILD_NUMBER
- is set (by a Hudson job) -->
<profile>
<id>hudson</id>
<activation>
@@ -615,7 +615,6 @@
</build>
</profile>
</profiles>
-
<pluginRepositories>
<pluginRepository>
<id>sonatype-maven-central</id>
15 years, 9 months
JBoss Tools SVN: r23329 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-08 18:14:21 -0400 (Thu, 08 Jul 2010)
New Revision: 23329
Modified:
trunk/build/publish.sh
Log:
fix check for aggregate update site zip
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-07-08 22:14:16 UTC (rev 23328)
+++ trunk/build/publish.sh 2010-07-08 22:14:21 UTC (rev 23329)
@@ -11,13 +11,23 @@
# cleanup from last time
rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME}
-siteZip=${WORKSPACE}/sources/site/target/site_assembly.zip
-if [[ ! -f ${WORKSPACE}/sources/site/target/site_assembly.zip ]]; then
- siteZip=${WORKSPACE}/sources/site/target/site.zip
+# check for aggregate zip or overall zip
+z=""
+if [[ -d ${WORKSPACE}/sources/aggregate/site/target ]]; then
+ siteZip=${WORKSPACE}/sources/aggregate/site/target/site_assembly.zip
+ if [[ ! -f ${WORKSPACE}/sources/aggregate/site/target/site_assembly.zip ]]; then
+ siteZip=${WORKSPACE}/sources/aggregate/site/target/site.zip
+ fi
+ z=$siteZip
+elif [[ -d ${WORKSPACE}/sources/site/target ]]; then
+ siteZip=${WORKSPACE}/sources/site/target/site_assembly.zip
+ if [[ ! -f ${WORKSPACE}/sources/site/target/site_assembly.zip ]]; then
+ siteZip=${WORKSPACE}/sources/site/target/site.zip
+ fi
+ z=$siteZip
fi
-z=$siteZip
-if [[ -f $z ]]; then
+if [[ $z != "" ]] && [[ -f $z ]] ; then
#echo "$z ..."
# note the job name, build number, and build ID of the latest snapshot zip
echo "JOB_NAME = ${JOB_NAME}" > ${WORKSPACE}/site/${JOB_NAME}/JOB_NAME.txt
@@ -30,6 +40,7 @@
# copy into workspace for access by bucky aggregator (same name every time)
rsync -aq $z ${WORKSPACE}/site/${SNAPNAME}
fi
+z=""
# if component zips exist, copy them too; first site.zip, then site_assembly.zip
for z in $(find ${WORKSPACE}/sources/*/site/target -type f -name "site*.zip" | sort -r); do
15 years, 9 months
JBoss Tools SVN: r23328 - branches/jbosstools-3.2.0.M1/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-08 18:14:16 -0400 (Thu, 08 Jul 2010)
New Revision: 23328
Modified:
branches/jbosstools-3.2.0.M1/build/publish.sh
Log:
fix check for aggregate update site zip
Modified: branches/jbosstools-3.2.0.M1/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.0.M1/build/publish.sh 2010-07-08 21:58:55 UTC (rev 23327)
+++ branches/jbosstools-3.2.0.M1/build/publish.sh 2010-07-08 22:14:16 UTC (rev 23328)
@@ -11,13 +11,23 @@
# cleanup from last time
rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME}
-siteZip=${WORKSPACE}/sources/site/target/site_assembly.zip
-if [[ ! -f ${WORKSPACE}/sources/site/target/site_assembly.zip ]]; then
- siteZip=${WORKSPACE}/sources/site/target/site.zip
+# check for aggregate zip or overall zip
+z=""
+if [[ -d ${WORKSPACE}/sources/aggregate/site/target ]]; then
+ siteZip=${WORKSPACE}/sources/aggregate/site/target/site_assembly.zip
+ if [[ ! -f ${WORKSPACE}/sources/aggregate/site/target/site_assembly.zip ]]; then
+ siteZip=${WORKSPACE}/sources/aggregate/site/target/site.zip
+ fi
+ z=$siteZip
+elif [[ -d ${WORKSPACE}/sources/site/target ]]; then
+ siteZip=${WORKSPACE}/sources/site/target/site_assembly.zip
+ if [[ ! -f ${WORKSPACE}/sources/site/target/site_assembly.zip ]]; then
+ siteZip=${WORKSPACE}/sources/site/target/site.zip
+ fi
+ z=$siteZip
fi
-z=$siteZip
-if [[ -f $z ]]; then
+if [[ $z != "" ]] && [[ -f $z ]] ; then
#echo "$z ..."
# note the job name, build number, and build ID of the latest snapshot zip
echo "JOB_NAME = ${JOB_NAME}" > ${WORKSPACE}/site/${JOB_NAME}/JOB_NAME.txt
@@ -30,6 +40,7 @@
# copy into workspace for access by bucky aggregator (same name every time)
rsync -aq $z ${WORKSPACE}/site/${SNAPNAME}
fi
+z=""
# if component zips exist, copy them too; first site.zip, then site_assembly.zip
for z in $(find ${WORKSPACE}/sources/*/site/target -type f -name "site*.zip" | sort -r); do
@@ -69,10 +80,14 @@
if [[ $ec != "0" ]]; then
echo "" >> ${el}; echo -n "ERR" >> ${el}; echo "ORS FOUND: "$ec >> ${el};
fi
+
+date
rsync -arzq ${WORKSPACE}/site/${JOB_NAME}/*LOG.txt $DESTINATION/${JOB_NAME}/
+date
# publish to download.jboss.org, unless errors found - avoid destroying last-good update site
if [[ $ec == "0" ]] && [[ $fc == "0" ]]; then
+date
if [[ -d ${WORKSPACE}/site/${JOB_NAME} ]]; then
rsync -arzq --delete ${WORKSPACE}/site/${JOB_NAME} $DESTINATION/
fi
@@ -81,4 +96,4 @@
rsync -arzq --delete ${WORKSPACE}/site/${SNAPNAME} $DESTINATION/
fi
fi
-
+date
15 years, 9 months
JBoss Tools SVN: r23327 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-08 17:58:55 -0400 (Thu, 08 Jul 2010)
New Revision: 23327
Modified:
trunk/parent-pom.xml
Log:
remove comments; set activebydefault values
Modified: trunk/parent-pom.xml
===================================================================
--- trunk/parent-pom.xml 2010-07-08 20:46:23 UTC (rev 23326)
+++ trunk/parent-pom.xml 2010-07-08 21:58:55 UTC (rev 23327)
@@ -85,8 +85,8 @@
<version>${tychoVersion}</version>
<configuration>
<!-- timeout in seconds -->
- <surefire.timeout>900</surefire.timeout>
- <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds>
+ <surefire.timeout>1200</surefire.timeout>
+ <forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds>
<useUIHarness>true</useUIHarness>
<useUIThread>true</useUIThread>
<argLine>${memoryOptions1} ${memoryOptions2} ${systemProperties}
@@ -129,10 +129,10 @@
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/jbosstools/${scmBranch}
</connection>
- <developerConnection>scm:svn:http://anonsvn.jboss.org/repos/jbosstools/${scmBranch}
- </developerConnection>
- <url>http://anonsvn.jboss.org/repos/jbosstools/${scmBranch}
- </url>
+ <developerConnection>scm:svn:http://anonsvn.jboss.org/repos/jbosstools/${scmBranch}
+ </developerConnection>
+ <url>http://anonsvn.jboss.org/repos/jbosstools/${scmBranch}
+</url>
</scm>
<issueManagement>
@@ -176,6 +176,9 @@
-->
<profile>
<id>helios-no-target</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
<repositories>
<repository>
<id>helios</id>
@@ -271,9 +274,6 @@
</repository>
</repositories>
</profile>
-
- <!-- TODO: verify that this profile overrides the default profile if BUILD_NUMBER
- is set (by a Hudson job) -->
<profile>
<id>hudson</id>
<activation>
@@ -440,6 +440,7 @@
</repository>
</repositories>
</profile>
+
<profile>
<id>coverage</id>
<activation>
@@ -615,7 +616,6 @@
</build>
</profile>
</profiles>
-
<pluginRepositories>
<pluginRepository>
<id>sonatype-maven-central</id>
@@ -661,4 +661,5 @@
</releases>
</pluginRepository>
</pluginRepositories>
+
</project>
15 years, 9 months
JBoss Tools SVN: r23326 - in trunk/documentation/whatsnew/ws: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2010-07-08 16:46:23 -0400 (Thu, 08 Jul 2010)
New Revision: 23326
Added:
trunk/documentation/whatsnew/ws/.project
trunk/documentation/whatsnew/ws/images/
trunk/documentation/whatsnew/ws/images/ws_tester_google_search.jpg
trunk/documentation/whatsnew/ws/ws-news-1.2.0.M1.html
Log:
Delivering what's new for WS for JBT 3.2.0 M1 milestone
Added: trunk/documentation/whatsnew/ws/.project
===================================================================
--- trunk/documentation/whatsnew/ws/.project (rev 0)
+++ trunk/documentation/whatsnew/ws/.project 2010-07-08 20:46:23 UTC (rev 23326)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ws</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Property changes on: trunk/documentation/whatsnew/ws/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/whatsnew/ws/images/ws_tester_google_search.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/ws/images/ws_tester_google_search.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/ws/ws-news-1.2.0.M1.html
===================================================================
--- trunk/documentation/whatsnew/ws/ws-news-1.2.0.M1.html (rev 0)
+++ trunk/documentation/whatsnew/ws/ws-news-1.2.0.M1.html 2010-07-08 20:46:23 UTC (rev 23326)
@@ -0,0 +1,66 @@
+<?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-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>WS tools 3.2.0 M1 What's New</title>
+</head>
+<body>
+<h1>WS tools 3.2.0 M1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Views</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>New Web Service Tester Available</b></td>
+ <td valign="top">
+ <p>A new Web Service Tester is available as a view in JBoss Tools. The tester, though still maturing a bit, provides the following functionality: </p>
+ <ul><li>Tests JAX-WS and JAX-RS services</li>
+ <li>Get the information necessary to test a web service operation from an incoming WSDL (JAX-WS only)</li>
+ <li>Show the HTTP header details for each invoke</li>
+ <li>Integrate with the TCP/IP Monitor to provide additional details about each invoke</li></ul>
+ <img src="./images/ws_tester_google_search.jpg" style="height : 374px; width : 657px;"/>
+ <p>We've also been hard at work fixing issues as we find them, such as:</p>
+ <ul><li>Handling nested WSDls and schemas imported into WSDLs. (<a href="https://jira.jboss.org/browse/JBIDE-6558">JBIDE-6558</a>)</li>
+ <li>Fixing minor issues (<a href="https://jira.jboss.org/browse/JBIDE-6544">JBIDE-6544</a>)</li>
+ <li>Using JAX-WS APIs instead of Axis APIs (<a href="https://jira.jboss.org/browse/JBIDE-6322">JBIDE-6322</a>)</li>
+ </ul>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Fixes when Generating WS Projects from WSDL or Java Class Sources</b></td>
+ <td valign="top">
+ <p>We've also addressed a few issues in the Web Service wizard:</p>
+ <ol><li>Adding '--show-traces' to executables used to produce web service artifacts for additional help when debugging (<a href="https://jira.jboss.org/browse/JBIDE-6499">JBIDE-6499</a>)</li>
+ <li>Enabling generating WS source for multi-port WSDLs (<a href="https://jira.jboss.org/browse/JBIDE-6250">JBIDE-6250</a>)</li>
+
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
+
+
Property changes on: trunk/documentation/whatsnew/ws/ws-news-1.2.0.M1.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 9 months