JBoss Tools SVN: r11648 - in trunk/esb/plugins/org.jboss.tools.esb.project.core: src/org/jboss/tools/esb/core/runtime and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-11-11 00:13:42 -0500 (Tue, 11 Nov 2008)
New Revision: 11648
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java
Log:
JBIDE-3152:apply the patch for the issue: ESB classpath container should allow modification for source and JavaDoc locations
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF 2008-11-10 21:48:54 UTC (rev 11647)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF 2008-11-11 05:13:42 UTC (rev 11648)
@@ -22,9 +22,10 @@
org.eclipse.jdt.launching,
org.eclipse.jst.j2ee,
org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.common.frameworks;bundle-version="1.1.200",
+ org.eclipse.jst.common.frameworks,
org.eclipse.wst.server.core,
- org.eclipse.jst.common.project.facet.core;bundle-version="1.3.0"
+ org.eclipse.jst.common.project.facet.core,
+ org.jboss.ide.eclipse.as.classpath.core
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Export-Package: org.jboss.tools.esb.core,
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java 2008-11-10 21:48:54 UTC (rev 11647)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java 2008-11-11 05:13:42 UTC (rev 11648)
@@ -1,167 +1,202 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.esb.core.runtime;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-import org.jboss.tools.esb.core.ESBProjectCorePlugin;
-import org.jboss.tools.esb.core.StatusUtils;
-import org.jboss.tools.esb.core.messages.JBossFacetCoreMessages;
-
-/**
- * @author Denny Xu
- */
-public class JBossRuntimeClassPathInitializer extends
- ClasspathContainerInitializer {
-
- public final static String JBOSS_ESB_RUNTIME_CLASSPATH_CONTAINER_ID = "org.jboss.esb.runtime.classpath";
- public final static String JBOSS_ESB_RUNTIME_CLASSPATH_SERVER_SUPPLIED = "server.supplied";
- public JBossRuntimeClassPathInitializer() {
- }
-
- private String segment;
- private boolean isServerSupplied = false;
- private IJavaProject javaProject;
-
- @Override
- public void initialize(IPath containerPath, IJavaProject project)
- throws CoreException {
- this.javaProject = project;
- if (containerPath.segment(0).equals(
- JBOSS_ESB_RUNTIME_CLASSPATH_CONTAINER_ID)) {
- if(containerPath.segmentCount() == 3
- && containerPath.segment(1).equals(JBOSS_ESB_RUNTIME_CLASSPATH_SERVER_SUPPLIED)){
- segment = containerPath.segment(2);
- isServerSupplied = true;
- }else{
- segment = containerPath.segment(1);
- isServerSupplied = false;
- }
-
- JBossRuntimeClasspathContainer container = new JBossRuntimeClasspathContainer(
- containerPath, project, isServerSupplied);
- JavaCore.setClasspathContainer(containerPath,
- new IJavaProject[] { project },
- new IClasspathContainer[] { container }, null);
- }
- }
-
- public IClasspathEntry[] getEntries(IPath path) {
- return new JBossRuntimeClasspathContainer(path, javaProject, isServerSupplied).getClasspathEntries();
- }
-
- public class JBossRuntimeClasspathContainer implements
- IClasspathContainer {
- private IPath path;
- private boolean isFromServer = false;
- private IClasspathEntry[] entries = null;
- private IJavaProject jproject;
- private List<String> jars;
-
- public JBossRuntimeClasspathContainer(IPath path, IJavaProject project, boolean isFromServer) {
- this.path = path;
- this.isFromServer = isFromServer;
- this.jproject = project;
- }
-
- public String getDescription() {
- return JBossFacetCoreMessages.JBoss_Runtime;
- }
-
- public int getKind() {
- return IClasspathContainer.K_APPLICATION;
- }
-
- public IPath getPath() {
- return path;
- }
-
- public IClasspathEntry[] getClasspathEntries() {
- if (entries == null) {
- ArrayList<IClasspathEntry> entryList = new ArrayList<IClasspathEntry>();
- if (isFromServer) {
- IRuntime serverRuntime = ServerCore.findRuntime(segment);
-
- if(serverRuntime == null){
- IStatus status = StatusUtils.errorStatus("Can not find the runtime: "+ segment);
- ESBProjectCorePlugin.getDefault().getLog().log(status);
- }
- String runtimeLocation = serverRuntime.getLocation().toOSString();
- jars = JBossRuntimeManager.getInstance().getAllRuntimeJars(runtimeLocation);
-
- } else {
-
- JBossRuntime jbws = JBossRuntimeManager.getInstance()
- .findRuntimeByName(segment);
- if (jbws != null) {
- jars = JBossRuntimeManager.getInstance()
- .getAllRuntimeJars(jbws);
- }
- }
-
- if(jars == null) return new IClasspathEntry[0];
-
- for (String jar : jars) {
- entryList.add(getEntry(new Path(jar)));
- }
- entries = entryList.toArray(new IClasspathEntry[entryList
- .size()]);
- if (entries == null)
- return new IClasspathEntry[0];
- }
- return entries;
- }
-
- protected IClasspathEntry getEntry(IPath path) {
- return JavaRuntime.newArchiveRuntimeClasspathEntry(path)
- .getClasspathEntry();
- }
-
- public void removeEntry(String jarName) {
- if (entries == null) {
- return;
- }
- IClasspathEntry[] newEntries = new IClasspathEntry[entries.length - 1];
- int i = 0;
- for (IClasspathEntry entry : entries) {
- if (!entry.toString().contains(jarName)) {
- newEntries[i++] = entry;
- }
- }
- entries = newEntries;
- }
-
- }
-
- public boolean filterJars(String jarName, ArrayList<IClasspathEntry> list) {
- for (IClasspathEntry entry : list) {
- if (entry.getPath().lastSegment().equals(jarName)) {
- return false;
- }
- }
- return true;
- }
-
-}
+/*******************************************************************************
+ * Copyright (c) 2008 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.esb.core.runtime;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IAccessRule;
+import org.eclipse.jdt.core.IClasspathAttribute;
+import org.eclipse.jdt.core.IClasspathContainer;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.ServerCore;
+import org.jboss.ide.eclipse.as.classpath.core.jee.AbstractClasspathContainer;
+import org.jboss.ide.eclipse.as.classpath.core.jee.AbstractClasspathContainerInitializer;
+import org.jboss.ide.eclipse.as.classpath.core.xpl.ClasspathDecorations;
+import org.jboss.tools.esb.core.ESBProjectCorePlugin;
+import org.jboss.tools.esb.core.StatusUtils;
+import org.jboss.tools.esb.core.messages.JBossFacetCoreMessages;
+
+/**
+ * @author Denny Xu
+ */
+public class JBossRuntimeClassPathInitializer extends
+ AbstractClasspathContainerInitializer {
+
+ public final static String JBOSS_ESB_RUNTIME_CLASSPATH_CONTAINER_ID = "org.jboss.esb.runtime.classpath";
+ public final static String JBOSS_ESB_RUNTIME_CLASSPATH_SERVER_SUPPLIED = "server.supplied";
+
+ public JBossRuntimeClassPathInitializer() {
+ }
+
+ private String segment;
+ private boolean isServerSupplied = false;
+ private IJavaProject javaProject;
+
+ @Override
+ public void initialize(IPath containerPath, IJavaProject project)
+ throws CoreException {
+ this.javaProject = project;
+ if (containerPath.segment(0).equals(
+ JBOSS_ESB_RUNTIME_CLASSPATH_CONTAINER_ID)) {
+ if (containerPath.segmentCount() == 3
+ && containerPath.segment(1).equals(
+ JBOSS_ESB_RUNTIME_CLASSPATH_SERVER_SUPPLIED)) {
+ segment = containerPath.segment(2);
+ isServerSupplied = true;
+ } else {
+ segment = containerPath.segment(1);
+ isServerSupplied = false;
+ }
+
+ JBossRuntimeClasspathContainer container = new JBossRuntimeClasspathContainer(
+ containerPath, project, isServerSupplied);
+ JavaCore.setClasspathContainer(containerPath,
+ new IJavaProject[] { project },
+ new IClasspathContainer[] { container }, null);
+ }
+ }
+
+ public IClasspathEntry[] getEntries(IPath path) {
+ return new JBossRuntimeClasspathContainer(path, javaProject,
+ isServerSupplied).getClasspathEntries();
+ }
+
+ public class JBossRuntimeClasspathContainer extends
+ AbstractClasspathContainer {
+ private IPath path;
+ private boolean isFromServer = false;
+ private IClasspathEntry[] entries = null;
+ private IJavaProject jproject;
+ private List<String> jars;
+
+ public JBossRuntimeClasspathContainer(IPath path, IJavaProject project,
+ boolean isFromServer) {
+ super(path, JBossFacetCoreMessages.JBoss_Runtime, null);
+ this.path = path;
+ this.isFromServer = isFromServer;
+ this.jproject = project;
+ }
+
+ public String getDescription() {
+ return JBossFacetCoreMessages.JBoss_Runtime;
+ }
+
+ public int getKind() {
+ return IClasspathContainer.K_APPLICATION;
+ }
+
+ public IPath getPath() {
+ return path;
+ }
+
+ public IClasspathEntry[] computeEntries() {
+ ArrayList<IClasspathEntry> entryList = new ArrayList<IClasspathEntry>();
+ if (isFromServer) {
+ IRuntime serverRuntime = ServerCore.findRuntime(segment);
+
+ if (serverRuntime == null) {
+ IStatus status = StatusUtils
+ .errorStatus("Can not find the runtime: " + segment);
+ ESBProjectCorePlugin.getDefault().getLog().log(status);
+ }
+ String runtimeLocation = serverRuntime.getLocation()
+ .toOSString();
+ jars = JBossRuntimeManager.getInstance().getAllRuntimeJars(
+ runtimeLocation);
+
+ } else {
+
+ JBossRuntime jbws = JBossRuntimeManager.getInstance()
+ .findRuntimeByName(segment);
+ if (jbws != null) {
+ jars = JBossRuntimeManager.getInstance().getAllRuntimeJars(
+ jbws);
+ }
+ }
+
+ if (jars == null)
+ return new IClasspathEntry[0];
+
+ for (String jar : jars) {
+
+ IPath entryPath = new Path(jar);
+
+ IPath sourceAttachementPath = null;
+ IPath sourceAttachementRootPath = null;
+
+ final ClasspathDecorations dec = decorations.getDecorations(
+ getDecorationManagerKey(getPath().toString()),
+ entryPath.toString());
+
+ IClasspathAttribute[] attrs = {};
+ if (dec != null) {
+ sourceAttachementPath = dec.getSourceAttachmentPath();
+ sourceAttachementRootPath = dec
+ .getSourceAttachmentRootPath();
+ attrs = dec.getExtraAttributes();
+ }
+
+ IAccessRule[] access = {};
+ IClasspathEntry entry = JavaCore.newLibraryEntry(entryPath,
+ sourceAttachementPath, sourceAttachementRootPath,
+ access, attrs, false);
+ entryList.add(entry);
+ }
+ entries = entryList.toArray(new IClasspathEntry[entryList.size()]);
+ return entries;
+ }
+
+ public void removeEntry(String jarName) {
+ if (entries == null) {
+ return;
+ }
+ IClasspathEntry[] newEntries = new IClasspathEntry[entries.length - 1];
+ int i = 0;
+ for (IClasspathEntry entry : entries) {
+ if (!entry.toString().contains(jarName)) {
+ newEntries[i++] = entry;
+ }
+ }
+ entries = newEntries;
+ }
+
+ }
+
+ public boolean filterJars(String jarName, ArrayList<IClasspathEntry> list) {
+ for (IClasspathEntry entry : list) {
+ if (entry.getPath().lastSegment().equals(jarName)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ @Override
+ protected AbstractClasspathContainer createClasspathContainer(IPath path) {
+ return new JBossRuntimeClasspathContainer(path, javaProject,
+ isServerSupplied);
+ }
+
+ @Override
+ protected String getClasspathContainerID() {
+ return JBOSS_ESB_RUNTIME_CLASSPATH_CONTAINER_ID;
+ }
+
+}
17 years, 5 months
JBoss Tools SVN: r11647 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-10 16:48:54 -0500 (Mon, 10 Nov 2008)
New Revision: 11647
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java
Log:
JBIDE-3063 Make the project examples support download of one zip for multiple projects
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java 2008-11-10 21:48:49 UTC (rev 11646)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java 2008-11-10 21:48:54 UTC (rev 11647)
@@ -170,7 +170,7 @@
}
project.setSize(size);
}
- if (nodeName.equals("includedProjects")) {
+ if (nodeName.equals("included-projects")) {
String includedProjects = getContent(child);
if (includedProjects != null) {
includedProjects = includedProjects.trim();
17 years, 5 months
JBoss Tools SVN: r11646 - workspace/examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-10 16:48:49 -0500 (Mon, 10 Nov 2008)
New Revision: 11646
Modified:
workspace/examples/projectExamples.xml
Log:
JBIDE-3063 Make the project examples support download of one zip for multiple projects
Modified: workspace/examples/projectExamples.xml
===================================================================
--- workspace/examples/projectExamples.xml 2008-11-10 19:07:46 UTC (rev 11645)
+++ workspace/examples/projectExamples.xml 2008-11-10 21:48:49 UTC (rev 11646)
@@ -3,9 +3,9 @@
<project>
<category>Seam</category>
<name>dvdstoreall</name>
- <includedProjects>
+ <included-projects>
dvdstore,dvdstore-ear,dvdstore-ejb
- </includedProjects>
+ </included-projects>
<shortDescription>Seam DVD Store Example - EAR</shortDescription>
<description>This example demonstrates the use of Seam with jBPM pageflow and business process management. It includes the dvdstore,dvdstore-ear and dvdstore-ejb projects.
</description>
@@ -18,9 +18,9 @@
<project>
<category>Seam</category>
<name>booking</name>
- <includedProjects>
+ <included-projects>
booking,booking-ear,booking-ejb
- </includedProjects>
+ </included-projects>
<shortDescription>Seam Booking Example - EAR</shortDescription>
<description>This example demonstrates the use of Seam in a Java EE 5 environment.
Transaction and persistence context management is handled by the EJB container.
17 years, 5 months
JBoss Tools SVN: r11645 - workspace/snjeza/seam-examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-10 14:07:46 -0500 (Mon, 10 Nov 2008)
New Revision: 11645
Added:
workspace/snjeza/seam-examples/bookingall.zip
workspace/snjeza/seam-examples/dvdstoreall.zip
Log:
JBIDE-3063 Make the project examples support download of one zip for multiple projects
Added: workspace/snjeza/seam-examples/bookingall.zip
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/seam-examples/bookingall.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/seam-examples/dvdstoreall.zip
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/seam-examples/dvdstoreall.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 5 months
JBoss Tools SVN: r11644 - in trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples: dialog and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-10 13:44:11 -0500 (Mon, 10 Nov 2008)
New Revision: 11644
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java
Log:
JBIDE-3063 Make the project examples support download of one zip for multiple projects
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2008-11-10 18:43:00 UTC (rev 11643)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2008-11-10 18:44:11 UTC (rev 11644)
@@ -40,7 +40,7 @@
private static ProjectExamplesActivator plugin;
private static BundleContext context;
-
+
public static Job waitForBuildAndValidation = new Job("Waiting...") {
@Override
@@ -113,14 +113,15 @@
public static List<IMarker> getMarkers(List<Project> projects) {
List<IMarker> markers = new ArrayList<IMarker>();
- for(Project project:projects) {
+ for (Project project : projects) {
try {
- String projectName = project.getName();
- IProject eclipseProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- IMarker[] projectMarkers = eclipseProject.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);
- for (int i = 0; i < projectMarkers.length; i++) {
- if (projectMarkers[i].getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR) == IMarker.SEVERITY_ERROR) {
- markers.add(projectMarkers[i]);
+ if (project.getIncludedProjects() == null) {
+ String projectName = project.getName();
+ getMarkers(markers, projectName);
+ } else {
+ List<String> includedProjects = project.getIncludedProjects();
+ for (String projectName:includedProjects) {
+ getMarkers(markers, projectName);
}
}
} catch (CoreException e) {
@@ -129,4 +130,19 @@
}
return markers;
}
+
+ private static List<IMarker> getMarkers(List<IMarker> markers,
+ String projectName) throws CoreException {
+ IProject eclipseProject = ResourcesPlugin.getWorkspace()
+ .getRoot().getProject(projectName);
+ IMarker[] projectMarkers = eclipseProject.findMarkers(
+ IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);
+ for (int i = 0; i < projectMarkers.length; i++) {
+ if (projectMarkers[i].getAttribute(IMarker.SEVERITY,
+ IMarker.SEVERITY_ERROR) == IMarker.SEVERITY_ERROR) {
+ markers.add(projectMarkers[i]);
+ }
+ }
+ return markers;
+ }
}
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java 2008-11-10 18:43:00 UTC (rev 11643)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java 2008-11-10 18:44:11 UTC (rev 11644)
@@ -24,6 +24,7 @@
import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -70,9 +71,9 @@
import org.jboss.tools.project.examples.model.Project;
/**
-* @author snjeza
-*
-*/
+ * @author snjeza
+ *
+ */
public class MarkerDialog extends TitleAreaDialog {
private static final String QUICK_FIX = "Quick Fix";
@@ -83,7 +84,7 @@
private Button finishButton;
private TableViewer tableViewer;
private IResourceChangeListener resourceChangeListener;
-
+
private class QuickFixWizardDialog extends WizardDialog {
/**
@@ -93,12 +94,11 @@
public QuickFixWizardDialog(Shell parentShell, IWizard newWizard) {
super(parentShell, newWizard);
setShellStyle(SWT.CLOSE | SWT.MAX | SWT.TITLE | SWT.BORDER
- | SWT.MODELESS | SWT.RESIZE | getDefaultOrientation());
+ | SWT.MODELESS | SWT.RESIZE | getDefaultOrientation());
}
}
-
public MarkerDialog(Shell parentShell, List<Project> projects) {
super(parentShell);
this.projects = projects;
@@ -126,8 +126,8 @@
Label markersLabel = new Label(contents, SWT.NULL);
markersLabel.setText("Markers:");
- tableViewer = new TableViewer(contents, SWT.H_SCROLL
- | SWT.V_SCROLL | SWT.BORDER | SWT.SINGLE);
+ tableViewer = new TableViewer(contents, SWT.H_SCROLL | SWT.V_SCROLL
+ | SWT.BORDER | SWT.SINGLE);
Table table = tableViewer.getTable();
gd = new GridData(GridData.FILL_BOTH);
table.setLayoutData(gd);
@@ -165,15 +165,16 @@
Display.getDefault().asyncExec(new Runnable() {
public void run() {
- if (tableViewer != null && !tableViewer.getTable().isDisposed()) {
+ if (tableViewer != null
+ && !tableViewer.getTable().isDisposed()) {
refreshTableViewer();
}
}
-
+
});
}
-
+
};
ResourcesPlugin.getWorkspace().addResourceChangeListener(
resourceChangeListener);
@@ -186,7 +187,8 @@
_dlgTitleImage.dispose();
}
if (resourceChangeListener != null) {
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+ ResourcesPlugin.getWorkspace().removeResourceChangeListener(
+ resourceChangeListener);
resourceChangeListener = null;
}
return super.close();
@@ -219,13 +221,18 @@
try {
quickFixButton.setSelection(false);
openQuickFixWizard(selected);
- for (Project project:projects) {
- IProject eclipseProject = ResourcesPlugin.getWorkspace().getRoot().getProject(project.getName());
- if (eclipseProject != null && eclipseProject.isOpen()) {
- eclipseProject.build(IncrementalProjectBuilder.CLEAN_BUILD, null);
+ for (Project project : projects) {
+ if (project.getIncludedProjects() == null) {
+ buildProject(project.getName());
+ } else {
+ List<String> includedProjects = project.getIncludedProjects();
+ for (String projectName:includedProjects) {
+ buildProject(projectName);
+ }
}
}
- ProjectExamplesActivator.waitForBuildAndValidation.schedule();
+ ProjectExamplesActivator.waitForBuildAndValidation
+ .schedule();
ProjectExamplesActivator.waitForBuildAndValidation.join();
} catch (Exception e) {
ProjectExamplesActivator.log(e);
@@ -236,6 +243,16 @@
}
}
+ private void buildProject(String projectName) throws CoreException {
+ IProject eclipseProject = ResourcesPlugin
+ .getWorkspace().getRoot().getProject(projectName);
+ if (eclipseProject != null
+ && eclipseProject.isOpen()) {
+ eclipseProject.build(
+ IncrementalProjectBuilder.CLEAN_BUILD,
+ null);
+ }
+ }
private void refreshTableViewer() {
tableViewer.setInput(projects);
@@ -248,9 +265,10 @@
}
}
- private void openQuickFixWizard(final IMarker selected) throws ExecutionException {
+ private void openQuickFixWizard(final IMarker selected)
+ throws ExecutionException {
final Map resolutions = new LinkedHashMap();
-
+
IRunnableWithProgress resolutionsRunnable = new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) {
monitor
@@ -258,7 +276,8 @@
MarkerMessages.resolveMarkerAction_computationManyAction,
100);
- IMarker[] allMarkers = (IMarker[]) ProjectExamplesActivator.getMarkers(projects).toArray(new IMarker[0]);
+ IMarker[] allMarkers = (IMarker[]) ProjectExamplesActivator
+ .getMarkers(projects).toArray(new IMarker[0]);
monitor.worked(20);
IMarkerResolution[] found = IDE.getMarkerHelpRegistry()
.getResolutions(selected);
@@ -289,8 +308,8 @@
Object service = null;
- IRunnableContext context = new ProgressMonitorDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getShell());
+ IRunnableContext context = new ProgressMonitorDialog(PlatformUI
+ .getWorkbench().getActiveWorkbenchWindow().getShell());
try {
if (service == null) {
@@ -330,22 +349,23 @@
markerDescription);
Wizard wizard = new QuickFixWizard(description, resolutions);
- wizard.setWindowTitle(MarkerMessages.resolveMarkerAction_dialogTitle);
- WizardDialog dialog = new QuickFixWizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard);
+ wizard
+ .setWindowTitle(MarkerMessages.resolveMarkerAction_dialogTitle);
+ WizardDialog dialog = new QuickFixWizardDialog(PlatformUI
+ .getWorkbench().getActiveWorkbenchWindow().getShell(),
+ wizard);
dialog.open();
}
}
private IMarkerResolution[] getMarkerResolutions(ISelection source) {
IStructuredSelection selection = (IStructuredSelection) source;
- IMarker marker = (IMarker) selection
- .getFirstElement();
+ IMarker marker = (IMarker) selection.getFirstElement();
if (marker == null) {
return EMPTY_ARRAY;
}
- IMarkerResolution[] resolutions = IDE
- .getMarkerHelpRegistry().getResolutions(
- marker);
+ IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
+ .getResolutions(marker);
return resolutions;
}
}
\ No newline at end of file
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java 2008-11-10 18:43:00 UTC (rev 11643)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java 2008-11-10 18:44:11 UTC (rev 11644)
@@ -11,6 +11,7 @@
package org.jboss.tools.project.examples.model;
import java.math.BigDecimal;
+import java.util.List;
/**
* @author snjeza
@@ -24,6 +25,7 @@
private String url;
private long size;
private Category category;
+ private List<String> includedProjects;
public Project() {
name="";
@@ -95,4 +97,12 @@
}
return sizeString;
}
+
+ public List<String> getIncludedProjects() {
+ return includedProjects;
+ }
+
+ public void setIncludedProjects(List<String> includedProjects) {
+ this.includedProjects = includedProjects;
+ }
}
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java 2008-11-10 18:43:00 UTC (rev 11643)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java 2008-11-10 18:44:11 UTC (rev 11644)
@@ -20,6 +20,7 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+import java.util.StringTokenizer;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -169,6 +170,18 @@
}
project.setSize(size);
}
+ if (nodeName.equals("includedProjects")) {
+ String includedProjects = getContent(child);
+ if (includedProjects != null) {
+ includedProjects = includedProjects.trim();
+ StringTokenizer tokenizer = new StringTokenizer(includedProjects,",");
+ List<String> projectList = new ArrayList<String>();
+ while (tokenizer.hasMoreTokens()) {
+ projectList.add(tokenizer.nextToken());
+ }
+ project.setIncludedProjects(projectList);
+ }
+ }
}
}
}
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2008-11-10 18:43:00 UTC (rev 11643)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2008-11-10 18:44:11 UTC (rev 11644)
@@ -15,9 +15,14 @@
*
*/
import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
+import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
import java.util.zip.ZipFile;
import org.eclipse.core.resources.IMarker;
@@ -28,11 +33,9 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.IJobChangeListener;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
@@ -45,9 +48,10 @@
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.IOverwriteQuery;
+import org.eclipse.ui.internal.services.SourceProviderService;
+import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
import org.eclipse.ui.wizards.datatransfer.ImportOperation;
import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
-import org.eclipse.wst.validation.internal.operations.ValidationBuilder;
import org.jboss.tools.project.examples.ProjectExamplesActivator;
import org.jboss.tools.project.examples.dialog.MarkerDialog;
import org.jboss.tools.project.examples.model.Project;
@@ -159,8 +163,10 @@
public void done(IJobChangeEvent event) {
try {
- ProjectExamplesActivator.waitForBuildAndValidation.schedule();
- ProjectExamplesActivator.waitForBuildAndValidation.join();
+ ProjectExamplesActivator.waitForBuildAndValidation
+ .schedule();
+ ProjectExamplesActivator.waitForBuildAndValidation
+ .join();
} catch (InterruptedException e) {
return;
@@ -208,6 +214,60 @@
private void importProject(Project projectDescription, File file,
IProgressMonitor monitor) throws Exception {
+ if (projectDescription.getIncludedProjects() == null) {
+ importSingleProject(projectDescription, file, monitor);
+ } else {
+ List<String> projects = projectDescription.getIncludedProjects();
+ for (final String projectName : projects) {
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IProject project = workspace.getRoot().getProject(projectName);
+ if (project.exists()) {
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ overwrite = MessageDialog.openQuestion(getShell(),
+ "Question", "Overwrite project '"
+ + projectName + "'");
+ }
+
+ });
+ if (!overwrite) {
+ return;
+ }
+ project.delete(true, true, monitor);
+ }
+ project.create(monitor);
+ project.open(monitor);
+ ZipFile sourceFile = new ZipFile(file);
+ ZipFileStructureProvider structureProvider = new ZipFileStructureProvider(
+ sourceFile);
+
+ Enumeration<? extends ZipEntry> entries = sourceFile.entries();
+ ZipEntry entry = null;
+ List<ZipEntry> filesToImport = new ArrayList<ZipEntry>();
+ String prefix = projectName + "/";
+ while (entries.hasMoreElements()) {
+ entry = entries.nextElement();
+ if (entry.getName().startsWith(prefix)) {
+ filesToImport.add(entry);
+ }
+ }
+ //ZipEntry entry = sourceFile.getEntry(projectName);
+
+ //List filesToImport = prepareFileList(structureProvider, entry, null);
+
+ ImportOperation operation = new ImportOperation(workspace
+ .getRoot().getFullPath(), structureProvider.getRoot(),
+ structureProvider, OVERWRITE_ALL_QUERY, filesToImport);
+ operation.setContext(getShell());
+ operation.run(monitor);
+ }
+ }
+ }
+
+ private void importSingleProject(Project projectDescription, File file,
+ IProgressMonitor monitor) throws CoreException, ZipException,
+ IOException, InvocationTargetException, InterruptedException {
final String projectName = projectDescription.getName();
IWorkspace workspace = ResourcesPlugin.getWorkspace();
IProject project = workspace.getRoot().getProject(projectName);
@@ -237,7 +297,6 @@
OVERWRITE_ALL_QUERY);
operation.setContext(getShell());
operation.run(monitor);
-
}
public void init(IWorkbench workbench, IStructuredSelection selection) {
@@ -260,4 +319,25 @@
addPage(page);
}
+ private static List prepareFileList(IImportStructureProvider structure,
+ ZipEntry entry, List list) {
+ if (structure == null || entry == null)
+ return null;
+ if (list == null) {
+ list = new ArrayList();
+ }
+ List son = structure.getChildren(entry);
+ if (son == null)
+ return list;
+ Iterator it = son.iterator();
+ while (it.hasNext()) {
+ ZipEntry temp = (ZipEntry) it.next();
+ if (temp.isDirectory()) {
+ prepareFileList(structure, temp, list);
+ } else {
+ list.add(temp);
+ }
+ }
+ return list;
+ }
}
17 years, 5 months
JBoss Tools SVN: r11643 - workspace/examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-10 13:43:00 -0500 (Mon, 10 Nov 2008)
New Revision: 11643
Modified:
workspace/examples/projectExamples.xml
Log:
JBIDE-3063 Make the project examples support download of one zip for multiple projects
Modified: workspace/examples/projectExamples.xml
===================================================================
--- workspace/examples/projectExamples.xml 2008-11-10 17:08:03 UTC (rev 11642)
+++ workspace/examples/projectExamples.xml 2008-11-10 18:43:00 UTC (rev 11643)
@@ -1,100 +1,53 @@
<projects>
- <project>
+
+ <project>
<category>Seam</category>
- <name>dvdstore</name>
- <shortDescription>Seam DVD Store Example - WAR</shortDescription>
- <description>This example demonstrates the use of Seam with jBPM pageflow and business process management. It requires the dvdstore-ear and dvdstore-ejb projects.
- </description>
- <size>962000</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
- </url>
- </project>
-
- <project>
- <category>Seam</category>
- <name>dvdstore-ejb</name>
- <shortDescription>Seam DVD Store Example - EJB</shortDescription>
- <description>This example demonstrates the use of Seam with jBPM pageflow and business process management. It requires the dvdstore and dvdstore-ear projects.
- </description>
- <size>589000</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
- </url>
- </project>
-
- <project>
- <category>Seam</category>
- <name>dvdstore-ear</name>
+ <name>dvdstoreall</name>
+ <includedProjects>
+ dvdstore,dvdstore-ear,dvdstore-ejb
+ </includedProjects>
<shortDescription>Seam DVD Store Example - EAR</shortDescription>
- <description>This example demonstrates the use of Seam with jBPM pageflow and business process management. It requires the dvdstore and dvdstore-ejb projects.
+ <description>This example demonstrates the use of Seam with jBPM pageflow and business process management. It includes the dvdstore,dvdstore-ear and dvdstore-ejb projects.
</description>
- <size>5700000</size>
+ <size>7071000</size>
<url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
</url>
</project>
<project>
<category>Seam</category>
- <name>jboss-seam-jpa</name>
- <shortDescription>Seam Booking Example - WAR Standalone</shortDescription>
- <description>This example demonstrates the use of Seam in a Java EE 5 environment.
-Transaction and persistence context management is handled by the EJB container.
-This example can also run in Tomcat with JBoss Embedded.
-</description>
- <size>5491000</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
- </url>
- </project>
-
- <project>
- <category>Seam</category>
<name>booking</name>
- <shortDescription>Seam Booking Example - WAR</shortDescription>
+ <includedProjects>
+ booking,booking-ear,booking-ejb
+ </includedProjects>
+ <shortDescription>Seam Booking Example - EAR</shortDescription>
<description>This example demonstrates the use of Seam in a Java EE 5 environment.
Transaction and persistence context management is handled by the EJB container.
This example can also run in Tomcat with JBoss Embedded.
-It requires the booking-ejb and booking-ear projects.
+It includes the booking, booking-ear and booking-ejb projects.
</description>
- <size>2900000</size>
+ <size>8127000</size>
<url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
</url>
</project>
<project>
<category>Seam</category>
- <name>booking-ejb</name>
- <shortDescription>Seam Booking Example - EJB</shortDescription>
+ <name>jboss-seam-jpa</name>
+ <shortDescription>Seam Booking Example - WAR Standalone</shortDescription>
<description>This example demonstrates the use of Seam in a Java EE 5 environment.
Transaction and persistence context management is handled by the EJB container.
This example can also run in Tomcat with JBoss Embedded.
-It requires the booking and booking-ear projects.
</description>
- <size>70000</size>
+ <size>5491000</size>
<url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
</url>
- </project>
+ </project>
<project>
- <category>Seam</category>
- <name>booking-ear</name>
- <shortDescription>Seam Booking Example - EAR</shortDescription>
- <description>This example demonstrates the use of Seam in a Java EE 5 environment.
-Transaction and persistence context management is handled by the EJB container.
-This example can also run in Tomcat with JBoss Embedded.
-It requires the booking-ejb and booking-ejb projects.
-</description>
- <size>4700000</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
- </url>
- </project>
-
- <project>
<category>Portlet</category>
<name>TestJavaPortlet</name>
<shortDescription>JBoss Java Portlet Example</shortDescription>
17 years, 5 months
JBoss Tools SVN: r11642 - trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-11-10 12:08:03 -0500 (Mon, 10 Nov 2008)
New Revision: 11642
Modified:
trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java
Log:
https://jira.jboss.org/jira/browse/JBDS-455
Modified: trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-11-10 16:37:32 UTC (rev 11641)
+++ trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-11-10 17:08:03 UTC (rev 11642)
@@ -133,15 +133,17 @@
if(namePosition < 0) break;
// server type
- position = str.indexOf(",",namePosition+1);
+ int typePosition = str.indexOf(",",namePosition+1);
if(position < 0) break;
- String name = str.substring(namePosition+1,position).trim();
+ String name = str.substring(namePosition+1,typePosition).trim();
// server version
- int versionPosition = str.indexOf(",",position+1);
+ int versionPosition = str.indexOf(",",typePosition+1);
if(versionPosition < 0) break;
+ String type = str.substring(typePosition+1,versionPosition).trim();
+
// server location
position = str.indexOf(",",versionPosition+1);
if(position < 0) break;
@@ -149,15 +151,17 @@
String version = str.substring(versionPosition+1,position);
int index = 0;
-
- if(version.startsWith("3.2"))
- index = 0;
- else if(version.startsWith("4.0"))
- index = 1;
- else if(version.startsWith("4.2"))
+ if(type.startsWith("AS")){
+ if(version.startsWith("3.2"))
+ index = 0;
+ else if(version.startsWith("4.0"))
+ index = 1;
+ else if(version.startsWith("4.2"))
+ index = 2;
+ else if(version.startsWith("5.0"))
+ index = 3;
+ }else
index = 2;
- else if(version.startsWith("5.0"))
- index = 3;
int next = str.indexOf("server",position+1);
17 years, 5 months
JBoss Tools SVN: r11641 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-11-10 11:37:32 -0500 (Mon, 10 Nov 2008)
New Revision: 11641
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3127Test.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
Log:
JBIDE-3127 junit test adjustment, also was removed unused delay time from content tests
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3127Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3127Test.java 2008-11-10 16:14:48 UTC (rev 11640)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3127Test.java 2008-11-10 16:37:32 UTC (rev 11641)
@@ -47,10 +47,13 @@
editorPart.maximizeSource();
assertFalse("Visual part shouldn't be visible",vpeController.isVisualEditorVisible()); //$NON-NLS-1$
//change source code
- editor.getSourceEditor().getTextViewer().getTextWidget().replaceTextRange(offcet-10, "replaced text".length(), "replaced text"); //$NON-NLS-1$ //$NON-NLS-2$
+ editor.getSourceEditor().getTextViewer().getTextWidget().replaceTextRange(offcet-20, "replaced text".length(), "replaced text"); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse("Synced should be false",vpeController.isSynced()); //$NON-NLS-1$
editorPart.maximizeVisual();
vpeController.visualRefresh();
+ //wait while refresh jobs start
+ TestUtil.delay(500);
+ TestUtil.waitForJobs();
if(getException()!=null) {
throw new Exception(getException());
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2008-11-10 16:14:48 UTC (rev 11640)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2008-11-10 16:37:32 UTC (rev 11641)
@@ -79,7 +79,6 @@
TestUtil.waitForJobs();
- TestUtil.delay(2000);
VpeController controller = getVpeController((JSPMultiPageEditor) editor);
// get xml test file
17 years, 5 months
JBoss Tools SVN: r11640 - trunk/documentation/guides/GettingStartedGuide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2008-11-10 11:14:48 -0500 (Mon, 10 Nov 2008)
New Revision: 11640
Modified:
trunk/documentation/guides/GettingStartedGuide/en/modules/first_seam.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-422 - language corrected, Project Facets wizard described as an option available when modifying project creation.
Modified: trunk/documentation/guides/GettingStartedGuide/en/modules/first_seam.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en/modules/first_seam.xml 2008-11-10 15:46:38 UTC (rev 11639)
+++ trunk/documentation/guides/GettingStartedGuide/en/modules/first_seam.xml 2008-11-10 16:14:48 UTC (rev 11640)
@@ -77,19 +77,10 @@
</mediaobject>
</figure>
- <para>All settings are already specified here, you can just modify the Configuration. Chose needed
- one from the list of already predefined configurations or click on the <emphasis>
- <property>Modify...</property>
- </emphasis> to configure your custom facets pattern.</para>
+ <para>All settings are already specified here, you can just modify the Configuration. Click on the <emphasis>
+ <property>Modify...</property></emphasis> button to configure your custom facets pattern:</para>
- <para>On the whole appeared dialog allows to select the "features" you want to use in your
- project. Doing this <property>JBoss Developer Studio</property> setups the appropriate
- tooling for your project. Since JBoss Seam integrates all popular Java EE frameworks, you
- can select any combination of technologies from the list. Here, for the default
- configuration, Dynamic Web Module, Java, JavaServer Faces (JSF), and Seam Facet are already
- selected for a typical database-driven web application. The default project facets should
- suffice.</para>
-
+
<figure id="ProjectFacetsSpecifyingScreen">
<title>Project Facets Specifying</title>
<mediaobject>
@@ -99,7 +90,15 @@
</mediaobject>
</figure>
- <para>In the <property>Project Facets wizard</property> form you can also bring up server
+ <para>On the whole the dialog allows to select the "features" you want to use in your
+ project. Doing this <property>JBoss Developer Studio</property> setups the appropriate
+ tooling for your project. Since JBoss Seam integrates all popular Java EE frameworks, you
+ can select any combination of technologies from the list. Here, for the default
+ configuration, Dynamic Web Module, Java, JavaServer Faces (JSF), and Seam Facet are already
+ selected for a typical database-driven web application. The default project facets should
+ suffice.</para>
+
+ <para>In the <property>Project Facets</property> form you can also bring up server
runtimes panel by clicking <property> Runtimes</property> tab on the right corner. This
panel shows available server runtimes.</para>
17 years, 5 months
JBoss Tools SVN: r11639 - trunk/documentation/guides/GettingStartedGuide/en.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2008-11-10 10:46:38 -0500 (Mon, 10 Nov 2008)
New Revision: 11639
Modified:
trunk/documentation/guides/GettingStartedGuide/en/master.xml
Log:
nothing edited
Modified: trunk/documentation/guides/GettingStartedGuide/en/master.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en/master.xml 2008-11-10 15:38:24 UTC (rev 11638)
+++ trunk/documentation/guides/GettingStartedGuide/en/master.xml 2008-11-10 15:46:38 UTC (rev 11639)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xml/4.3/docbookx.dtd"
-[
+[
<!ENTITY getting_started SYSTEM "modules/getting_started.xml">
<!ENTITY manage SYSTEM "modules/manage.xml">
<!ENTITY first_seam SYSTEM "modules/first_seam.xml">
17 years, 5 months