JBoss Tools SVN: r9620 - in trunk/jst/plugins/org.jboss.tools.jst.web: src/org/jboss/tools and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-08-08 06:34:35 -0400 (Fri, 08 Aug 2008)
New Revision: 9620
Removed:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/common/
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml
Log:
JBIDE-2598
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2008-08-08 10:26:57 UTC (rev 9619)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2008-08-08 10:34:35 UTC (rev 9620)
@@ -228,8 +228,6 @@
class="org.jboss.tools.jst.web.webapp.model.WebAppUserConstraintImpl"/>
<xclass id="org.jboss.tools.jst.web.webapp.model.handlers.CreateForWebApp23Handler"
class="org.jboss.tools.jst.web.webapp.model.handlers.CreateForWebApp23Handler"/>
- <xclass id="org.jboss.tools.common.meta.impl.adapters.XAdapterProjectsRoot"
- class="org.jboss.tools.common.meta.impl.adapters.XAdapterProjectsRoot"/>
<xclass id="org.jboss.tools.jst.web.project.AddServletSupportWizard"
class="org.jboss.tools.jst.web.project.AddServletSupportWizard"/>
<xclass id="org.jboss.tools.jst.web.tld.model.handlers.CreateTLDFileSupport"
17 years, 4 months
JBoss Tools SVN: r9619 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-08-08 06:26:57 -0400 (Fri, 08 Aug 2008)
New Revision: 9619
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java
Log:
JBIDE-2598
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java 2008-08-08 10:21:04 UTC (rev 9618)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java 2008-08-08 10:26:57 UTC (rev 9619)
@@ -11,6 +11,8 @@
package org.jboss.tools.common.model.ui.dnd;
import java.util.*;
+
+import org.eclipse.core.runtime.Platform;
import org.eclipse.swt.dnd.*;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
@@ -29,7 +31,9 @@
static {
try {
- paletteAdopt = (XAdoptManager)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.jst.web.tld.model.handlers.JSPAdopt");
+ if(Platform.getBundle("org.jboss.tools.jst.web") != null) {
+ paletteAdopt = (XAdoptManager)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.jst.web.tld.model.handlers.JSPAdopt");
+ }
} catch (ClassCastException e) {
ModelUIPlugin.getPluginLog().logError(e);
}
17 years, 4 months
JBoss Tools SVN: r9618 - in trunk/documentation/movies: new_seam_project and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-08-08 06:21:04 -0400 (Fri, 08 Aug 2008)
New Revision: 9618
Added:
trunk/documentation/movies/new_seam_project/
trunk/documentation/movies/new_seam_project/new_seam_project.wnk
trunk/documentation/movies/new_seam_project/readme.txt
Log:
https://jira.jboss.org/jira/browse/JBDS-348 - remaking demo on creating New Seam Project and running it on JBoss AS
Added: trunk/documentation/movies/new_seam_project/new_seam_project.wnk
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/movies/new_seam_project/new_seam_project.wnk
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/movies/new_seam_project/readme.txt
===================================================================
--- trunk/documentation/movies/new_seam_project/readme.txt (rev 0)
+++ trunk/documentation/movies/new_seam_project/readme.txt 2008-08-08 10:21:04 UTC (rev 9618)
@@ -0,0 +1,25 @@
+To apply Jboss org styles to the generated HTML file, you should do next:
+
+
+- first, add the HEAD of the HTML document to attach a style sheet, a tab icon and a title of the page:
+
+ <head>
+ <title>Create Seam Project and run it on JBoss AS</title>
+ <link rel="stylesheet" href="../resources/tools.css"
+ type="text/css"/>
+ <link xmlns="" rel="shortcut icon" type="image/vnd.microsoft.icon" href="../resources/images/favicon.ico"/>
+ </head>
+
+
+- place the generated by Wink OBJECT inside this block element:
+
+ <div class="book">
+ <p id="title"><a href="http://www.jboss.org" class="site_href">
+ <strong>JBoss.org</strong></a><a href="http://docs.jboss.org/" class="doc_href">
+ <strong>Community Demos</strong></a></p>
+
+ <--! Place the OBJECT generated by Wink here. -->
+
+ </div>
+
+
\ No newline at end of file
17 years, 4 months
JBoss Tools SVN: r9617 - in trunk/common/plugins/org.jboss.tools.common.model: src/org/jboss/tools/common/meta/impl/adapters and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-08-08 05:53:43 -0400 (Fri, 08 Aug 2008)
New Revision: 9617
Added:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/adapters/XAdapterProjectsRoot.java
Modified:
trunk/common/plugins/org.jboss.tools.common.model/plugin.xml
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsRenameListener.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
Log:
JBIDE-2598
Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2008-08-08 09:48:57 UTC (rev 9616)
+++ trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2008-08-08 09:53:43 UTC (rev 9617)
@@ -331,6 +331,8 @@
class="org.jboss.tools.common.meta.impl.adapters.XAdapterModelElement"/>
<xclass id="org.jboss.tools.common.meta.impl.adapters.XAdapterModelPath"
class="org.jboss.tools.common.meta.impl.adapters.XAdapterModelPath"/>
+ <xclass id="org.jboss.tools.common.meta.impl.adapters.XAdapterProjectsRoot"
+ class="org.jboss.tools.common.meta.impl.adapters.XAdapterProjectsRoot"/>
<xclass id="org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintFileFilter"
class="org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintFileFilter"/>
Copied: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/adapters/XAdapterProjectsRoot.java (from rev 7060, trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/common/meta/impl/adapters/XAdapterProjectsRoot.java)
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/adapters/XAdapterProjectsRoot.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/adapters/XAdapterProjectsRoot.java 2008-08-08 09:53:43 UTC (rev 9617)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.meta.impl.adapters;
+
+import org.jboss.tools.common.meta.constraint.*;
+import org.jboss.tools.common.model.*;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
+
+public class XAdapterProjectsRoot extends XAdapterModelElement {
+ static String USE_DEFAULT = "Use Default Path";
+
+ public String getProperty(XProperty object) {
+ XModelObject o = (XModelObject)object;
+ if("yes".equals(o.getAttributeValue(USE_DEFAULT))) {
+ return ModelPlugin.getWorkspace().getRoot().getLocation().toOSString();
+ }
+ return super.getProperty(object);
+ }
+
+}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsRenameListener.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsRenameListener.java 2008-08-08 09:48:57 UTC (rev 9616)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsRenameListener.java 2008-08-08 09:53:43 UTC (rev 9617)
@@ -24,7 +24,9 @@
static {
try {
- contribution = (Contribution)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.jst.web.project.FileSystemsRenameListenerContribution");
+ if(Platform.getBundle("org.jboss.tools.jst.web") != null) {
+ contribution = (Contribution)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.jst.web.project.FileSystemsRenameListenerContribution");
+ }
} catch (ClassCastException e) {
ModelPlugin.getPluginLog().logError(e);
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2008-08-08 09:48:57 UTC (rev 9616)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2008-08-08 09:53:43 UTC (rev 9617)
@@ -20,6 +20,7 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.jdt.core.*;
import org.eclipse.jdt.ui.PreferenceConstants;
@@ -177,11 +178,19 @@
}
}
- private static String[] MODEL_NATURES = new String[]{
- "org.jboss.tools.struts.strutsnature",
- "org.jboss.tools.jsf.jsfnature",
- };
+ private static String[] MODEL_NATURES = new String[0];
+ static {
+ List<String> natures = new ArrayList<String>();
+ if(Platform.getBundle("org.jboss.tools.struts") != null) {
+ natures.add("org.jboss.tools.struts.strutsnature");
+ }
+ if(Platform.getBundle("org.jboss.tools.jsf") != null) {
+ natures.add("org.jboss.tools.jsf.jsfnature");
+ }
+ MODEL_NATURES = natures.toArray(new String[0]);
+ }
+
public static String[] getModelNatureNames() {
return MODEL_NATURES;
}
17 years, 4 months
JBoss Tools SVN: r9616 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-08-08 05:48:57 -0400 (Fri, 08 Aug 2008)
New Revision: 9616
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees/AllResourcesTree.java
Log:
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees/AllResourcesTree.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees/AllResourcesTree.java 2008-08-08 02:02:16 UTC (rev 9615)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees/AllResourcesTree.java 2008-08-08 09:48:57 UTC (rev 9616)
@@ -147,6 +147,11 @@
}
if(value.indexOf("/", 1) < 0) return null;
IResource r = ModelPlugin.getWorkspace().getRoot().getFolder(new Path(value));
+ if(r == null || !r.exists()) {
+ //we can have both folders and files in tree
+ //so if resource is not a folder, it still can be a file
+ r = ModelPlugin.getWorkspace().getRoot().getFile(new Path(value));
+ }
if(r == null || !r.exists()) return null;
return EclipseResourceUtil.getObjectByResource(r);
}
17 years, 4 months
JBoss Tools SVN: r9615 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-08-07 22:02:16 -0400 (Thu, 07 Aug 2008)
New Revision: 9615
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
JBIDE-2504 Problems with VPE refresh when CTRL+Z(Y) hotkeys used
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-08-07 22:36:19 UTC (rev 9614)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-08-08 02:02:16 UTC (rev 9615)
@@ -524,6 +524,9 @@
uiJob.setPriority(Job.LONG);
// Fix of JBIDE-1900
+
+ uiJob.schedule(400L);
+ } else {
uiJob.cancel();
uiJob.schedule(400L);
}
@@ -1673,9 +1676,11 @@
public void templateReloaded() {
visualRefresh();
}
-
+
public void visualRefresh() {
-
+ if (uiJob != null && uiJob.getState() != Job.NONE) {
+ return;
+ }
if (visualRefresfJob == null || visualRefresfJob.getState() == Job.NONE) {
visualRefresfJob = new UIJob(VpeUIMessages.VPE_VISUAL_REFRESH_JOB) {
@@ -1687,47 +1692,32 @@
return Status.CANCEL_STATUS;
}
+ if (!switcher
+ .startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_SOURCE)) {
+ return Status.CANCEL_STATUS;
+ }
+ try {
+ monitor.beginTask(VpeUIMessages.VPE_VISUAL_REFRESH_JOB,
+ IProgressMonitor.UNKNOWN);
+ visualRefreshImpl();
+ monitor.done();
+ } catch (VpeDisposeException exc) {
+ // just ignore this exception
+ } catch (NullPointerException ex) {
- if (uiJob != null && uiJob.getState() == Job.RUNNING) {
- uiJob.cancel();
- getChangeEvents().clear();
- // wait while ui job is finished
- schedule(500);
- } else {
-
- if (uiJob != null) {
-
- uiJob.cancel();
- getChangeEvents().clear();
+ if (switcher != null) {
+ throw ex;
+ } else {
+ // class was disposed and exception result of
+ // that we can't stop
+ // refresh job in time, so we just ignore this
+ // exception
}
- if (!switcher
- .startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_SOURCE)) {
- return Status.CANCEL_STATUS;
- }
- try {
- monitor.beginTask(
- VpeUIMessages.VPE_VISUAL_REFRESH_JOB,
- IProgressMonitor.UNKNOWN);
- visualRefreshImpl();
- monitor.done();
- } catch (VpeDisposeException exc) {
- // just ignore this exception
- } catch (NullPointerException ex) {
+ } finally {
- if (switcher != null) {
- throw ex;
- } else {
- // class was disposed and exception result of
- // that we can't stop
- // refresh job in time, so we just ignore this
- // exception
- }
- } finally {
+ if (switcher != null) {
- if (switcher != null) {
-
- switcher.stopActiveEditor();
- }
+ switcher.stopActiveEditor();
}
}
return Status.OK_STATUS;
17 years, 4 months
JBoss Tools SVN: r9614 - trunk/vpe/tests/org.jboss.tools.vpe.test/templates.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-08-07 18:36:19 -0400 (Thu, 07 Aug 2008)
New Revision: 9614
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test4.xml
Log:
Fix JUnit tests exceptions in vpe.test
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test4.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test4.xml 2008-08-07 22:18:24 UTC (rev 9613)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test4.xml 2008-08-07 22:36:19 UTC (rev 9614)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+class="<?xml version="1.0" encoding="UTF-8"?>
<!-- This class contains invalid template expressions -->
<vpe:templates>
<vpe:template-taglib uri="http://myfaces.apache.org/extensions"
@@ -377,7 +377,7 @@
<div style="display:hidden" />
</vpe:template>
</vpe:if>
- <vpe:template children="yes" modify="no" class="org.jboss.tools.vpe.editor.template.myfaces.VpeMyFacesDataScrollerTemplate"/>
+ <vpe:template children="yes" modify="no"/>
</vpe:tag>
<vpe:tag name="x:dataTable" case-sensitive="yes">
17 years, 4 months
JBoss Tools SVN: r9613 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-08-07 18:18:24 -0400 (Thu, 07 Aug 2008)
New Revision: 9613
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java
Log:
fix exception:
org.eclipse.core.internal.resources.ResourceException: Resource '/earprj/WebContent/WEB-INF/classes/META-INF' does not exist.
[java] at org.eclipse.core.internal.resources.Resource.checkExists(Resource.java:317)
[java] at org.eclipse.core.internal.resources.Resource.checkAccessible(Resource.java:194)
[java] at org.eclipse.core.internal.resources.Container.members(Container.java:181)
[java] at org.eclipse.core.internal.resources.Container.members(Container.java:164)
[java] at org.jboss.tools.common.model.filesystems.impl.FolderImpl.getResources(FolderImpl.java:951)
[java] at org.jboss.tools.common.model.filesystems.impl.FolderImpl.loadChildren(FolderImpl.java:128)
[java] at org.jboss.tools.common.model.impl.RegularObjectImpl.getChildren(RegularObjectImpl.java:56)
[java] at org.jboss.tools.jst.web.tld.TaglibMapping.findTldsInFolder(TaglibMapping.java:215)
[java] at org.jboss.tools.jst.web.tld.TaglibMapping.findTldsInFolder(TaglibMapping.java:219)
[java] at org.jboss.tools.jst.web.tld.TaglibMapping.findTldsInFolder(TaglibMapping.java:219)
[java] at org.jboss.tools.jst.web.tld.TaglibMapping.loadTldsInWebInf(TaglibMapping.java:172)
[java] at org.jboss.tools.jst.web.tld.TaglibMapping.revalidate(TaglibMapping.java:82)
[java] at org.jboss.tools.jsf.web.JSFWatcherContributor.updateProject(JSFWatcherContributor.java:49)
[java] at org.jboss.tools.common.model.project.Watcher.updateAll(Watcher.java:109)
[java] at org.jboss.tools.common.model.project.Watcher.access$0(Watcher.java:92)
[java] at org.jboss.tools.common.model.project.Watcher$WatcherRunnable.run(Watcher.java:52)
[java] at org.jboss.tools.common.model.XJob.run(XJob.java:119)
[java] at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55)
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2008-08-07 18:46:45 UTC (rev 9612)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2008-08-07 22:18:24 UTC (rev 9613)
@@ -948,7 +948,7 @@
try {
if(!isActive()) return null;
IContainer c = getResource();
- return (c != null) ? c.members() : new IResource[0];
+ return (c != null && c.isAccessible()) ? c.members() : new IResource[0];
} catch (CoreException e) {
ModelPlugin.getPluginLog().logError(e);
return new IResource[0];
17 years, 4 months
JBoss Tools SVN: r9612 - tags/jbosstools-3.0.0.Alpha1.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-08-07 14:46:45 -0400 (Thu, 07 Aug 2008)
New Revision: 9612
Added:
tags/jbosstools-3.0.0.Alpha1/ws/
Log:
Tag components for JBT 3.0.0.Alpha1 release
Copied: tags/jbosstools-3.0.0.Alpha1/ws (from rev 9611, trunk/ws)
17 years, 4 months
JBoss Tools SVN: r9611 - tags/jbosstools-3.0.0.Alpha1.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-08-07 14:46:41 -0400 (Thu, 07 Aug 2008)
New Revision: 9611
Added:
tags/jbosstools-3.0.0.Alpha1/vpe/
Log:
Tag components for JBT 3.0.0.Alpha1 release
Copied: tags/jbosstools-3.0.0.Alpha1/vpe (from rev 9610, trunk/vpe)
17 years, 4 months