JBoss Tools SVN: r3345 - in trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers: sync and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-27 08:03:49 -0400 (Mon, 27 Aug 2007)
New Revision: 3345
Modified:
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectFinisher.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java
Log:
JBIDE-850
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectFinisher.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectFinisher.java 2007-08-27 12:03:23 UTC (rev 3344)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectFinisher.java 2007-08-27 12:03:49 UTC (rev 3345)
@@ -16,6 +16,7 @@
import java.util.Map;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelConstants;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jst.web.context.IImportWebProjectContext;
@@ -87,7 +88,7 @@
}
private void createWebInfFileSystem() {
- getOrCreateFileSystem("WEB-INF", "%redhat.workspace%", true);
+ getOrCreateFileSystem("WEB-INF", XModelConstants.WORKSPACE_REF, true);
}
private void createWebXMLFileSystem() {
@@ -95,7 +96,7 @@
String webxmlfolder = webxml.getParent();
String relative = getRelativePath(workspace, webxmlfolder);
if(relative == null || relative.startsWith("/..")) {
- String loc = (relative == null) ? webxmlfolder : "%redhat.workspace%" + relative;
+ String loc = (relative == null) ? webxmlfolder : XModelConstants.WORKSPACE_REF + relative;
getOrCreateFileSystem("web-xml", loc, true);
web.setAttributeValue("model path", "/" + webxml.getName());
} else {
@@ -118,7 +119,7 @@
String configLoc = config.getParent();
String relative = getRelativePath(workspace, configLoc);
if(relative == null || relative.startsWith("/..")) {
- String loc = (relative == null) ? configLoc : "%redhat.workspace%" + relative;
+ String loc = (relative == null) ? configLoc : XModelConstants.WORKSPACE_REF + relative;
getOrCreateFileSystem(fsn + "-config-xml", loc, false);
m.setAttributeValue("model path", "/" + config.getName());
} else {
@@ -246,7 +247,7 @@
public static String getFileSystemLocation(String rootpath, String path) {
path = path.replace('\\', '/');
String relative = getRelativePath(rootpath, path);
- return (relative == null) ? path : "%redhat.workspace%" + relative;
+ return (relative == null) ? path : XModelConstants.WORKSPACE_REF + relative;
}
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java 2007-08-27 12:03:23 UTC (rev 3344)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java 2007-08-27 12:03:49 UTC (rev 3345)
@@ -571,7 +571,7 @@
if(loc != null && loc.startsWith("/..")) loc = loc.substring(3); //$NON-NLS-1$
if(loc.startsWith("/..")) { //$NON-NLS-1$
int i = loc.lastIndexOf("/"); //$NON-NLS-1$
- String fsp = "%redhat.workspace%" + "/.." + loc.substring(0, i); //$NON-NLS-1$ //$NON-NLS-2$
+ String fsp = XModelConstants.WORKSPACE_REF + "/.." + loc.substring(0, i); //$NON-NLS-1$ //$NON-NLS-2$
loc = loc.substring(i);
XModelObject f = m.getModel().getByPath(loc);
if(f == null) {
16 years, 8 months
JBoss Tools SVN: r3344 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui: operation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-27 08:03:23 -0400 (Mon, 27 Aug 2007)
New Revision: 3344
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectCreationOperation.java
Log:
JBIDE-850
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java 2007-08-27 12:02:51 UTC (rev 3343)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java 2007-08-27 12:03:23 UTC (rev 3344)
@@ -94,7 +94,7 @@
XModelObject webinf = FileSystemsHelper.getWebInf(model);
File webInfDir = ((IResource)webinf.getAdapter(IResource.class)).getLocation().toFile();
libName = (new File(libLocation).getParentFile().equals(webInfDir))
- ? "%redhat.workspace%/lib/" : libLocation.replace('\\', '/')+"/";
+ ? XModelConstants.WORKSPACE_REF + "/lib/" : libLocation.replace('\\', '/')+"/";
for (int i = 0; i < fs.length; i++) {
String jarName = fs[i].getName();
if(!jarName.endsWith(".jar")) continue;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectCreationOperation.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectCreationOperation.java 2007-08-27 12:02:51 UTC (rev 3343)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectCreationOperation.java 2007-08-27 12:03:23 UTC (rev 3344)
@@ -35,7 +35,6 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
-import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.context.RegisterTomcatContext;
import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
import org.jboss.tools.jst.web.project.helpers.IWebProjectTemplate;
@@ -121,10 +120,10 @@
text = text.substring(0, i) + "\"./" + getProject().getName() + "/WebContent/WEB-INF\"" + text.substring(i + match.length());
}
- match = "%redhat.workspace%/classes";
+ match = XModelConstants.WORKSPACE_REF + "/classes";
i = text.indexOf(match);
if(i >= 0) {
- String replace = "%redhat.workspace%/../../../.deployables/" + getProject().getName() + "/WEB-INF/classes";
+ String replace = XModelConstants.WORKSPACE_REF + "/../../../.deployables/" + getProject().getName() + "/WEB-INF/classes";
text = text.substring(0, i) + replace + text.substring(i + match.length());
}
@@ -138,6 +137,7 @@
p.putAll(System.getProperties());
String workspace = new ProjectHome().getLocation(templateLocation);
p.setProperty(XModelConstants.WORKSPACE, workspace);
+ p.setProperty(XModelConstants.WORKSPACE_OLD, workspace);
p.setProperty(IModelNature.ECLIPSE_PROJECT, templateLocation);
templateModel = XModelFactory.getModel(p);
}
16 years, 8 months
JBoss Tools SVN: r3343 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-27 08:02:51 -0400 (Mon, 27 Aug 2007)
New Revision: 3343
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java
Log:
JBIDE-850
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java 2007-08-27 12:02:24 UTC (rev 3342)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java 2007-08-27 12:02:51 UTC (rev 3343)
@@ -28,6 +28,7 @@
import org.w3c.dom.Node;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelConstants;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.impl.FileSystemsImpl;
import org.jboss.tools.common.model.impl.XModelImpl;
@@ -80,7 +81,7 @@
if (libName != null && libName.length() > 0) {
File libDir = new File(libName);
libName = (new File(libName).getParentFile().equals(webInfDir))
- ? "%redhat.workspace%/lib/" : libName.replace('\\', '/')+"/";
+ ? XModelConstants.WORKSPACE_REF + "/lib/" : libName.replace('\\', '/')+"/";
File[] jars = libDir.listFiles(new FileFilter() {
public boolean accept(File file) {
if (!file.isFile()) return false;
16 years, 8 months
JBoss Tools SVN: r3342 - in trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf: project/facet and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-27 08:02:24 -0400 (Mon, 27 Aug 2007)
New Revision: 3342
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java
Log:
JBIDE-850
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java 2007-08-27 12:01:30 UTC (rev 3341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java 2007-08-27 12:02:24 UTC (rev 3342)
@@ -116,7 +116,7 @@
XModelObject webinf = FileSystemsHelper.getWebInf(model);
File webInfDir = ((IResource)webinf.getAdapter(IResource.class)).getLocation().toFile();
libName = (location.getParentFile().equals(webInfDir))
- ? "%redhat.workspace%/lib/" : location.getAbsolutePath().replace('\\', '/')+"/";
+ ? XModelConstants.WORKSPACE_REF + "/lib/" : location.getAbsolutePath().replace('\\', '/')+"/";
CapabilityPerformer pp = (CapabilityPerformer)getParent();
String capability = pp.capability.getAttributeValue("name");
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java 2007-08-27 12:01:30 UTC (rev 3341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java 2007-08-27 12:02:24 UTC (rev 3342)
@@ -15,6 +15,7 @@
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IDelegate;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.jboss.tools.common.model.XModelConstants;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
/**
@@ -75,14 +76,14 @@
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
"<FILESYSTEMS APPLICATION_NAME=\"{0}\" ENTITY=\"FileSystems\"" +
" VERSION=\"2.0.0\" WORKSPACE_HOME=\"./{1}/WEB-INF\">" +
- "<FILESYSTEM ENTITY=\"FileSystemFolder\" LOCATION=\"%redhat.workspace%\" NAME=\"WEB-INF\"/>" +
+ "<FILESYSTEM ENTITY=\"FileSystemFolder\" LOCATION=\"" + XModelConstants.WORKSPACE_REF + "\" NAME=\"WEB-INF\"/>" +
"<FILESYSTEM ENTITY=\"FileSystemFolder\" INFO=\"Content-Type=Web\"" +
- " LOCATION=\"%redhat.workspace%/..\" NAME=\"WEB-ROOT\"/>" +
+ " LOCATION=\"" + XModelConstants.WORKSPACE_REF + "/..\" NAME=\"WEB-ROOT\"/>" +
"<FILESYSTEM ENTITY=\"FileSystemFolder\"" +
- " LOCATION=\"%redhat.workspace%/../../{2}\" NAME=\"src\"/>" +
- "<FILESYSTEM ENTITY=\"FileSystemFolder\" LOCATION=\"%redhat.workspace%/lib\" NAME=\"lib\"/>" +
+ " LOCATION=\"" + XModelConstants.WORKSPACE_REF + "/../../{2}\" NAME=\"src\"/>" +
+ "<FILESYSTEM ENTITY=\"FileSystemFolder\" LOCATION=\"" + XModelConstants.WORKSPACE_REF + "/lib\" NAME=\"lib\"/>" +
"<FILESYSTEM ENTITY=\"FileSystemFolder\"" +
- " LOCATION=\"%redhat.workspace%/classes\" NAME=\"classes\"/>" +
+ " LOCATION=\"" + XModelConstants.WORKSPACE_REF + "/classes\" NAME=\"classes\"/>" +
"<WEB ENTITY=\"JstWeb\" MODEL_PATH=\"/web.xml\" SERVLET_VERSION=\"2.4\">" +
" <MODULE ENTITY=\"WebJSFModule\" MODEL_PATH=\"/faces-config.xml\"" +
" ROOT=\"WEB-ROOT\" SRC=\"src\" URI=\"/WEB-INF/faces-config.xml\"/>" +
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java 2007-08-27 12:01:30 UTC (rev 3341)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java 2007-08-27 12:02:24 UTC (rev 3342)
@@ -18,6 +18,7 @@
import java.util.Map;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelConstants;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jst.web.context.IImportWebProjectContext;
@@ -82,7 +83,7 @@
}
private void createWebInfFileSystem() {
- getOrCreateFileSystem("WEB-INF", "%redhat.workspace%", true);
+ getOrCreateFileSystem("WEB-INF", XModelConstants.WORKSPACE_REF, true);
}
private void createWebXMLFileSystem() {
@@ -90,7 +91,7 @@
String webxmlfolder = webxml.getParent();
String relative = getRelativePath(workspace, webxmlfolder);
if(relative == null || relative.startsWith("/..")) {
- String loc = (relative == null) ? webxmlfolder : "%redhat.workspace%" + relative;
+ String loc = (relative == null) ? webxmlfolder : XModelConstants.WORKSPACE_REF + relative;
getOrCreateFileSystem("web-xml", loc, true);
web.setAttributeValue("model path", "/" + webxml.getName());
} else {
@@ -197,7 +198,7 @@
public static String getFileSystemLocation(String rootpath, String path) {
path = path.replace('\\', '/');
String relative = getRelativePath(rootpath, path);
- return (relative == null) ? path : "%redhat.workspace%" + relative;
+ return (relative == null) ? path : XModelConstants.WORKSPACE_REF + relative;
}
}
16 years, 8 months
JBoss Tools SVN: r3341 - trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-27 08:01:30 -0400 (Mon, 27 Aug 2007)
New Revision: 3341
Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java
Log:
JBIDE-850
Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java 2007-08-27 12:00:32 UTC (rev 3340)
+++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java 2007-08-27 12:01:30 UTC (rev 3341)
@@ -117,8 +117,7 @@
}
protected String fileName(XModelObject object) {
- return XModelConstants.getProjectPrefix(object.getModel()) +
- ".rule-sets.xml";
+ return ".rule-sets.xml";
}
}
16 years, 8 months
JBoss Tools SVN: r3340 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model: engines/impl and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-27 08:00:32 -0400 (Mon, 27 Aug 2007)
New Revision: 3340
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelConstants.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
Log:
JBIDE-850
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelConstants.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelConstants.java 2007-08-27 11:19:21 UTC (rev 3339)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelConstants.java 2007-08-27 12:00:32 UTC (rev 3340)
@@ -13,15 +13,16 @@
import java.util.*;
public class XModelConstants {
- public static String HOME = "redhat.home";
- public static String WORKSPACE = "redhat.workspace";
- public static String WORKSPACE_NAME = "redhat.workspace.name";
-
- public static String MODEL_VERSION = "version";
+ public static String HOME = "product.home";
- private static String ECOM_HOME = "global.ECOM_HOME";
- private static String ECOM_DATA = "global.ECOM_DATA";
+ public static String WORKSPACE = "workspace.home";
+ public static String WORKSPACE_REF = "%" + WORKSPACE + "%";
+ public static String WORKSPACE_OLD = "redhat.workspace";
+ public static String WORKSPACE_OLD_REF = "%" + WORKSPACE_OLD + "%";
+
+ public static String MODEL_VERSION = "version";
+
private XModelConstants() {}
public static String getHome(XModel model) {
@@ -37,29 +38,6 @@
validate(model);
}
- public static String getWorkspaceName(XModel model) {
- return model.getProperties().getProperty(WORKSPACE_NAME);
- }
-
- public static void setWorkspaceName(XModel model, String name) {
- if(name == null)
- model.getProperties().remove(WORKSPACE_NAME);
- else
- model.getProperties().setProperty(WORKSPACE_NAME, name);
- }
-
- public static String getProjectName(XModel model) {
- String s = getWorkspaceName(model);
- if(s != null) return s;
- s = getWorkspace(model);
- return (s == null) ? null : new java.io.File(s).getName();
- }
-
- public static String getProjectPrefix(XModel model) {
- String s = getWorkspaceName(model);
- return (s == null) ? "" : s + "-";
- }
-
//
public static void validate(XModel model) {
@@ -67,12 +45,9 @@
}
public static void validate(Properties p) {
- String h1 = p.getProperty(HOME), h2 = p.getProperty(ECOM_HOME);
- if(h1 != null) p.setProperty(ECOM_HOME, h1);
- else if(h2 != null) p.setProperty(HOME, h2);
- String w1 = p.getProperty(WORKSPACE), w2 = p.getProperty(ECOM_DATA);
- if(w1 != null) p.setProperty(ECOM_DATA, w1);
- else if(w2 != null) p.setProperty(WORKSPACE, w2);
+ String h1 = p.getProperty(HOME);
+ String w1 = p.getProperty(WORKSPACE);
+ //
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java 2007-08-27 11:19:21 UTC (rev 3339)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java 2007-08-27 12:00:32 UTC (rev 3340)
@@ -69,8 +69,7 @@
}
protected String fileName(XModelObject object) {
- return XModelConstants.getProjectPrefix(object.getModel()) +
- object.getModelEntity().getName().toLowerCase() + ".rex";
+ return object.getModelEntity().getName().toLowerCase() + ".rex";
}
public static void merge(XModelObject object, XModelObject update) {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsImpl.java 2007-08-27 11:19:21 UTC (rev 3339)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsImpl.java 2007-08-27 12:00:32 UTC (rev 3340)
@@ -155,7 +155,10 @@
public String get(String name) {
if("APPLICATION_NAME".equals(name)) {
String s = super.get(name);
- if(s == null || s.length() == 0) s = XModelConstants.getWorkspaceName(getModel());
+ if(s == null || s.length() == 0) {
+ s = "";
+ // project name ?
+ }
return (s == null) ? "" : s;
} else {
return super.get(name);
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2007-08-27 11:19:21 UTC (rev 3339)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2007-08-27 12:00:32 UTC (rev 3340)
@@ -72,6 +72,16 @@
String f = getEclipseFileName(object, true);
if(f == null) super.load(object);
else util().load(new File(f), object);
+
+ XModelObject[] os = object.getChildren();
+ for (int i = 0; i < os.length; i++) {
+ String s = os[i].getAttributeValue("location");
+ if(s == null || !s.startsWith(XModelConstants.WORKSPACE_OLD_REF)) continue;
+ s = XModelConstants.WORKSPACE_REF + s.substring(XModelConstants.WORKSPACE_OLD_REF.length());
+ os[i].setAttributeValue("location", s);
+ System.out.println("Corrected " + s);
+ }
+
removeMissingJarSystems(object);
}
@@ -92,7 +102,7 @@
}
protected String fileName(XModelObject object) {
- return XModelConstants.getProjectPrefix(object.getModel()) + "workspace.pex";
+ return "workspace.pex";
}
private boolean saveEclipse(XModelObject object) {
@@ -242,7 +252,7 @@
private void saveWorkspaceHomeAttr(Element element, XModelObject o) {
Properties p = o.getModel().getProperties();
String project = p.getProperty(IModelNature.ECLIPSE_PROJECT);
- String workspace = p.getProperty("redhat.workspace");
+ String workspace = p.getProperty(XModelConstants.WORKSPACE);
if(project == null) return;
String relative = workspace.startsWith(project + "/") ?
"." + workspace.substring(project.length()) : workspace;
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java 2007-08-27 11:19:21 UTC (rev 3339)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java 2007-08-27 12:00:32 UTC (rev 3340)
@@ -83,9 +83,9 @@
boolean isRelative = "true".equals(p.getProperty("set location relative to project"));
if(!isRelative) return;
String location = canonize(p.getProperty("location"), object.getModel());
- String project = canonize("%redhat.workspace%", object.getModel());
+ String project = canonize(XModelConstants.WORKSPACE_REF, object.getModel());
if(location.equals(project)) {
- p.setProperty("location", "%redhat.workspace%");
+ p.setProperty("location", XModelConstants.WORKSPACE_REF);
return;
}
boolean common = false;
@@ -105,7 +105,7 @@
common = true;
}
if(!common) return;
- String s = "%redhat.workspace%";
+ String s = XModelConstants.WORKSPACE_REF;
if(project.length() > 0) {
int q = new StringTokenizer(project, "/").countTokens();
for (int i = 0; i < q; i++) s += "/..";
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java 2007-08-27 11:19:21 UTC (rev 3339)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java 2007-08-27 12:00:32 UTC (rev 3340)
@@ -395,7 +395,7 @@
private String getProjectName() {
String d = properties.getProperty(XModelConstants.WORKSPACE);
- String n = properties.getProperty(XModelConstants.WORKSPACE_NAME);
+ String n = null; //obsolete
if(d == null) return null;
d = reduceURLPath(d);
if(d.lastIndexOf(':') >= 2)
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java 2007-08-27 11:19:21 UTC (rev 3339)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java 2007-08-27 12:00:32 UTC (rev 3340)
@@ -88,6 +88,7 @@
if(home == null || !home.equals(h)) {
ModelPlugin.getPluginLog().logInfo("WARNING:" + " workspace home changed from " + h + " to " + home);
model.getProperties().setProperty(XModelConstants.WORKSPACE, home);
+ model.getProperties().setProperty(XModelConstants.WORKSPACE_OLD, home);
model.getProperties().setProperty("nature", getID());
model.load();
}
@@ -96,6 +97,7 @@
Properties p = new Properties();
p.putAll(System.getProperties());
p.setProperty(XModelConstants.WORKSPACE, getWorkspaceHome());
+ p.setProperty(XModelConstants.WORKSPACE_OLD, getWorkspaceHome());
p.setProperty(ECLIPSE_PROJECT, project.getLocation().toString());
p.setProperty(ECLIPSE_PROJECT_OLD, project.getLocation().toString());
p.put("project", project);
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 2007-08-27 11:19:21 UTC (rev 3339)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2007-08-27 12:00:32 UTC (rev 3340)
@@ -839,7 +839,7 @@
workspace = new File(workspace).getAbsolutePath().replace('\\', '/');
path = path.replace('\\', '/');
String relative = org.jboss.tools.common.util.FileUtil.getRelativePath(workspace, path);
- return (relative == null) ? path : "%redhat.workspace%" + relative;
+ return (relative == null) ? path : XModelConstants.WORKSPACE_REF + relative;
}
}
16 years, 8 months
JBoss Tools SVN: r3339 - in trunk/documentation/GettingStartedGuide/docs/resources: support/docbook-xsl/html and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2007-08-27 07:19:21 -0400 (Mon, 27 Aug 2007)
New Revision: 3339
Added:
trunk/documentation/GettingStartedGuide/docs/resources/styles/en/collapsing-navigation.xsl
trunk/documentation/GettingStartedGuide/docs/resources/support/docbook-xsl/html/collapsing-navigation.xsl
Log:
http://jira.jboss.com/jira/browse/RF-600
Table of contents optimization
done for single and multi page versions
Added: trunk/documentation/GettingStartedGuide/docs/resources/styles/en/collapsing-navigation.xsl
===================================================================
--- trunk/documentation/GettingStartedGuide/docs/resources/styles/en/collapsing-navigation.xsl (rev 0)
+++ trunk/documentation/GettingStartedGuide/docs/resources/styles/en/collapsing-navigation.xsl 2007-08-27 11:19:21 UTC (rev 3339)
@@ -0,0 +1,199 @@
+<!DOCTYPE xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0" xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <xsl:template name="subtoc">
+ <xsl:param name="toc-context" select="." />
+ <xsl:param name="nodes" select="NOT-AN-ELEMENT" />
+
+ <xsl:variable name="toc.mark">
+ <xsl:apply-templates mode="toc.mark" select="." />
+ </xsl:variable>
+
+ <xsl:variable name="should.collapse.list"
+ select="string-length(string($toc.mark)) > 0">
+ </xsl:variable>
+
+ <xsl:variable name="toc.on.plus.mark">
+ <xsl:choose>
+ <xsl:when test="$should.collapse.list">
+ <xsl:copy-of select="$toc.mark"></xsl:copy-of>
+ </xsl:when>
+ <xsl:otherwise>
+ <span class="expand_collapse_toc" style="visibility:hidden;">  </span>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="nodes.plus" select="$nodes | qandaset" />
+
+ <xsl:variable name="subtoc">
+ <xsl:element name="{$toc.list.type}">
+ <xsl:choose>
+ <xsl:when test="$qanda.in.toc != 0">
+ <xsl:apply-templates mode="toc"
+ select="$nodes.plus">
+ <xsl:with-param name="toc-context"
+ select="$toc-context" />
+ </xsl:apply-templates>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates mode="toc"
+ select="$nodes">
+ <xsl:with-param name="toc-context"
+ select="$toc-context" />
+ </xsl:apply-templates>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:element>
+ </xsl:variable>
+
+ <xsl:variable name="depth">
+ <xsl:choose>
+ <xsl:when test="local-name(.) = 'section'">
+ <xsl:value-of select="count(ancestor::section) + 1" />
+ </xsl:when>
+ <xsl:when test="local-name(.) = 'sect1'">1</xsl:when>
+ <xsl:when test="local-name(.) = 'sect2'">2</xsl:when>
+ <xsl:when test="local-name(.) = 'sect3'">3</xsl:when>
+ <xsl:when test="local-name(.) = 'sect4'">4</xsl:when>
+ <xsl:when test="local-name(.) = 'sect5'">5</xsl:when>
+ <xsl:when test="local-name(.) = 'refsect1'">1</xsl:when>
+ <xsl:when test="local-name(.) = 'refsect2'">2</xsl:when>
+ <xsl:when test="local-name(.) = 'refsect3'">3</xsl:when>
+ <xsl:when test="local-name(.) = 'simplesect'">
+ <!-- sigh... -->
+ <xsl:choose>
+ <xsl:when test="local-name(..) = 'section'">
+ <xsl:value-of
+ select="count(ancestor::section)" />
+ </xsl:when>
+ <xsl:when test="local-name(..) = 'sect1'">
+ 2
+ </xsl:when>
+ <xsl:when test="local-name(..) = 'sect2'">
+ 3
+ </xsl:when>
+ <xsl:when test="local-name(..) = 'sect3'">
+ 4
+ </xsl:when>
+ <xsl:when test="local-name(..) = 'sect4'">
+ 5
+ </xsl:when>
+ <xsl:when test="local-name(..) = 'sect5'">
+ 6
+ </xsl:when>
+ <xsl:when test="local-name(..) = 'refsect1'">
+ 2
+ </xsl:when>
+ <xsl:when test="local-name(..) = 'refsect2'">
+ 3
+ </xsl:when>
+ <xsl:when test="local-name(..) = 'refsect3'">
+ 4
+ </xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>0</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="depth.from.context"
+ select="count(ancestor::*)-count($toc-context/ancestor::*)" />
+
+ <xsl:variable name="subtoc.list">
+ <xsl:choose>
+ <xsl:when test="$toc.dd.type = ''">
+ <xsl:copy-of select="$subtoc" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:element name="{$toc.dd.type}">
+ <xsl:if test="$should.collapse.list">
+ <xsl:attribute name="style">display:none;</xsl:attribute>
+ </xsl:if>
+ <xsl:copy-of select="$subtoc" />
+ </xsl:element>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+
+ <xsl:element name="{$toc.listitem.type}">
+
+ <xsl:copy-of select="$toc.on.plus.mark"></xsl:copy-of>
+ <xsl:call-template name="toc.line">
+ <xsl:with-param name="toc-context"
+ select="$toc-context" />
+ </xsl:call-template>
+
+ <xsl:if
+ test="$toc.listitem.type = 'li'
+ and $toc.section.depth > $depth and
+ ( ($qanda.in.toc = 0 and count($nodes)>0) or
+ ($qanda.in.toc != 0 and count($nodes.plus)>0) )
+ and $toc.max.depth > $depth.from.context">
+ <xsl:copy-of select="$subtoc.list" />
+ </xsl:if>
+ </xsl:element>
+ <xsl:if
+ test="$toc.listitem.type != 'li'
+ and $toc.section.depth > $depth and
+ ( ($qanda.in.toc = 0 and count($nodes)>0) or
+ ($qanda.in.toc != 0 and count($nodes.plus)>0) )
+ and $toc.max.depth > $depth.from.context">
+ <xsl:copy-of select="$subtoc.list" />
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template match="section|chapter" mode="toc.mark">
+ <xsl:variable name="subchapters">
+ <xsl:apply-templates select="child::section" mode="toc" />
+ </xsl:variable>
+
+ <xsl:if test="string-length(string($subchapters))">
+ <xsl:call-template name="toggle.expand.mark" />
+ <xsl:call-template name="toggle.collapse.mark" />
+ </xsl:if>
+
+ </xsl:template>
+
+ <xsl:template match="*" mode="toc.mark">
+
+ </xsl:template>
+
+ <xsl:template name="user.head.content">
+ <xsl:param name="node" select="." />
+ <script type="text/javascript" src="script/toggle.js"></script>
+ </xsl:template>
+
+ <xsl:template name="toggle.expand.mark">
+ <xsl:param name="visible" select="true()"/>
+ <span onclick="toc.expand(this)" class="expand_collapse_toc">
+ <xsl:call-template name="render.display">
+ <xsl:with-param name="visible" select="$visible" />
+ </xsl:call-template>
+ <xsl:text>+</xsl:text>
+ </span>
+ </xsl:template>
+
+ <xsl:template name="toggle.collapse.mark">
+ <xsl:param name="visible" select="false()"/>
+ <span onclick="toc.collapse(this)" class="expand_collapse_toc">
+ <xsl:call-template name="render.display">
+ <xsl:with-param name="visible" select="$visible" />
+ </xsl:call-template>
+ <xsl:text>-</xsl:text>
+ </span>
+ </xsl:template>
+
+ <xsl:template name="render.display">
+ <xsl:param name="visible" select="false()"/>
+ <xsl:attribute name="style">
+ <xsl:if test="not($visible)">display:none;</xsl:if>
+ </xsl:attribute>
+ </xsl:template>
+
+
+</xsl:stylesheet>
Added: trunk/documentation/GettingStartedGuide/docs/resources/support/docbook-xsl/html/collapsing-navigation.xsl
===================================================================
--- trunk/documentation/GettingStartedGuide/docs/resources/support/docbook-xsl/html/collapsing-navigation.xsl (rev 0)
+++ trunk/documentation/GettingStartedGuide/docs/resources/support/docbook-xsl/html/collapsing-navigation.xsl 2007-08-27 11:19:21 UTC (rev 3339)
@@ -0,0 +1,199 @@
+<!DOCTYPE xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0" xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <xsl:template name="subtoc">
+ <xsl:param name="toc-context" select="." />
+ <xsl:param name="nodes" select="NOT-AN-ELEMENT" />
+
+ <xsl:variable name="toc.mark">
+ <xsl:apply-templates mode="toc.mark" select="." />
+ </xsl:variable>
+
+ <xsl:variable name="should.collapse.list"
+ select="string-length(string($toc.mark)) > 0">
+ </xsl:variable>
+
+ <xsl:variable name="toc.on.plus.mark">
+ <xsl:choose>
+ <xsl:when test="$should.collapse.list">
+ <xsl:copy-of select="$toc.mark"></xsl:copy-of>
+ </xsl:when>
+ <xsl:otherwise>
+ <span class="expand_collapse_toc" style="visibility:hidden;">  </span>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="nodes.plus" select="$nodes | qandaset" />
+
+ <xsl:variable name="subtoc">
+ <xsl:element name="{$toc.list.type}">
+ <xsl:choose>
+ <xsl:when test="$qanda.in.toc != 0">
+ <xsl:apply-templates mode="toc"
+ select="$nodes.plus">
+ <xsl:with-param name="toc-context"
+ select="$toc-context" />
+ </xsl:apply-templates>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates mode="toc"
+ select="$nodes">
+ <xsl:with-param name="toc-context"
+ select="$toc-context" />
+ </xsl:apply-templates>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:element>
+ </xsl:variable>
+
+ <xsl:variable name="depth">
+ <xsl:choose>
+ <xsl:when test="local-name(.) = 'section'">
+ <xsl:value-of select="count(ancestor::section) + 1" />
+ </xsl:when>
+ <xsl:when test="local-name(.) = 'sect1'">1</xsl:when>
+ <xsl:when test="local-name(.) = 'sect2'">2</xsl:when>
+ <xsl:when test="local-name(.) = 'sect3'">3</xsl:when>
+ <xsl:when test="local-name(.) = 'sect4'">4</xsl:when>
+ <xsl:when test="local-name(.) = 'sect5'">5</xsl:when>
+ <xsl:when test="local-name(.) = 'refsect1'">1</xsl:when>
+ <xsl:when test="local-name(.) = 'refsect2'">2</xsl:when>
+ <xsl:when test="local-name(.) = 'refsect3'">3</xsl:when>
+ <xsl:when test="local-name(.) = 'simplesect'">
+ <!-- sigh... -->
+ <xsl:choose>
+ <xsl:when test="local-name(..) = 'section'">
+ <xsl:value-of
+ select="count(ancestor::section)" />
+ </xsl:when>
+ <xsl:when test="local-name(..) = 'sect1'">
+ 2
+ </xsl:when>
+ <xsl:when test="local-name(..) = 'sect2'">
+ 3
+ </xsl:when>
+ <xsl:when test="local-name(..) = 'sect3'">
+ 4
+ </xsl:when>
+ <xsl:when test="local-name(..) = 'sect4'">
+ 5
+ </xsl:when>
+ <xsl:when test="local-name(..) = 'sect5'">
+ 6
+ </xsl:when>
+ <xsl:when test="local-name(..) = 'refsect1'">
+ 2
+ </xsl:when>
+ <xsl:when test="local-name(..) = 'refsect2'">
+ 3
+ </xsl:when>
+ <xsl:when test="local-name(..) = 'refsect3'">
+ 4
+ </xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>0</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="depth.from.context"
+ select="count(ancestor::*)-count($toc-context/ancestor::*)" />
+
+ <xsl:variable name="subtoc.list">
+ <xsl:choose>
+ <xsl:when test="$toc.dd.type = ''">
+ <xsl:copy-of select="$subtoc" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:element name="{$toc.dd.type}">
+ <xsl:if test="$should.collapse.list">
+ <xsl:attribute name="style">display:none;</xsl:attribute>
+ </xsl:if>
+ <xsl:copy-of select="$subtoc" />
+ </xsl:element>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+
+ <xsl:element name="{$toc.listitem.type}">
+
+ <xsl:copy-of select="$toc.on.plus.mark"></xsl:copy-of>
+ <xsl:call-template name="toc.line">
+ <xsl:with-param name="toc-context"
+ select="$toc-context" />
+ </xsl:call-template>
+
+ <xsl:if
+ test="$toc.listitem.type = 'li'
+ and $toc.section.depth > $depth and
+ ( ($qanda.in.toc = 0 and count($nodes)>0) or
+ ($qanda.in.toc != 0 and count($nodes.plus)>0) )
+ and $toc.max.depth > $depth.from.context">
+ <xsl:copy-of select="$subtoc.list" />
+ </xsl:if>
+ </xsl:element>
+ <xsl:if
+ test="$toc.listitem.type != 'li'
+ and $toc.section.depth > $depth and
+ ( ($qanda.in.toc = 0 and count($nodes)>0) or
+ ($qanda.in.toc != 0 and count($nodes.plus)>0) )
+ and $toc.max.depth > $depth.from.context">
+ <xsl:copy-of select="$subtoc.list" />
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template match="section|chapter" mode="toc.mark">
+ <xsl:variable name="subchapters">
+ <xsl:apply-templates select="child::section" mode="toc" />
+ </xsl:variable>
+
+ <xsl:if test="string-length(string($subchapters))">
+ <xsl:call-template name="toggle.expand.mark" />
+ <xsl:call-template name="toggle.collapse.mark" />
+ </xsl:if>
+
+ </xsl:template>
+
+ <xsl:template match="*" mode="toc.mark">
+
+ </xsl:template>
+
+ <xsl:template name="user.head.content">
+ <xsl:param name="node" select="." />
+ <script type="text/javascript" src="script/toggle.js"></script>
+ </xsl:template>
+
+ <xsl:template name="toggle.expand.mark">
+ <xsl:param name="visible" select="true()"/>
+ <span onclick="toc.expand(this)" class="expand_collapse_toc">
+ <xsl:call-template name="render.display">
+ <xsl:with-param name="visible" select="$visible" />
+ </xsl:call-template>
+ <xsl:text>+</xsl:text>
+ </span>
+ </xsl:template>
+
+ <xsl:template name="toggle.collapse.mark">
+ <xsl:param name="visible" select="false()"/>
+ <span onclick="toc.collapse(this)" class="expand_collapse_toc">
+ <xsl:call-template name="render.display">
+ <xsl:with-param name="visible" select="$visible" />
+ </xsl:call-template>
+ <xsl:text>-</xsl:text>
+ </span>
+ </xsl:template>
+
+ <xsl:template name="render.display">
+ <xsl:param name="visible" select="false()"/>
+ <xsl:attribute name="style">
+ <xsl:if test="not($visible)">display:none;</xsl:if>
+ </xsl:attribute>
+ </xsl:template>
+
+
+</xsl:stylesheet>
16 years, 8 months
JBoss Tools SVN: r3338 - trunk/documentation/development/usecases/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-08-27 05:27:32 -0400 (Mon, 27 Aug 2007)
New Revision: 3338
Modified:
trunk/documentation/development/usecases/en/modules/seam.xml
Log:
update usecases doc
Modified: trunk/documentation/development/usecases/en/modules/seam.xml
===================================================================
--- trunk/documentation/development/usecases/en/modules/seam.xml 2007-08-27 06:57:49 UTC (rev 3337)
+++ trunk/documentation/development/usecases/en/modules/seam.xml 2007-08-27 09:27:32 UTC (rev 3338)
@@ -205,6 +205,9 @@
<para>If Seam hotdeploy is enabled you should be able to go directly
to "Go to browser" skipping the restart app.</para>
+
+ <para>Running the TestNG test should also just work and show a
+ greenbar.</para>
</listitem>
</itemizedlist>
</section>
16 years, 8 months
JBoss Tools SVN: r3337 - trunk/documentation/development/usecases/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-08-27 02:57:49 -0400 (Mon, 27 Aug 2007)
New Revision: 3337
Modified:
trunk/documentation/development/usecases/en/modules/seam.xml
Log:
update usecases doc
Modified: trunk/documentation/development/usecases/en/modules/seam.xml
===================================================================
--- trunk/documentation/development/usecases/en/modules/seam.xml 2007-08-26 07:20:15 UTC (rev 3336)
+++ trunk/documentation/development/usecases/en/modules/seam.xml 2007-08-27 06:57:49 UTC (rev 3337)
@@ -28,7 +28,7 @@
and linked together correctly.</para>
<para>The project(s) should after this be deployable to an already
- chosen server and testable!</para>
+ chosen server and testable! (for both EAR and WAR)</para>
</listitem>
<listitem>
@@ -37,7 +37,14 @@
<para>There won't be any tests initially, but the initial setup should
be ready.</para>
- <para>This should run the microcontainer/embedded jboss.</para>
+ <para>This should run the microcontainer/embedded jboss just as
+ seam-gen does.</para>
+
+ <para>Remember that the driver jar(s) needs to be available to this
+ project for the database related applications to run.</para>
+
+ <para>It also needs custom persistence.xml and other files to work
+ correctly. See seam-gen for the differences.</para>
</listitem>
<listitem>
@@ -62,8 +69,8 @@
<para>Go to browser and click login, fill in user and password with
"max"/"max", click Login</para>
- <para>Page should should "max" as logged in, click Logout, page should
- now show max is logged out.</para>
+ <para>Page should should show "max" as logged in, click Logout, page
+ should now show max is logged out.</para>
<para>Put a breakpoint in Authenticator.java on the line with
log.info("authenticating #0", identity.getUsername());</para>
@@ -116,7 +123,8 @@
available after clicking "Restart app"</emphasis></para>
<para>Restart App should *not* require restart of the application
- server; just the application.</para>
+ server; just the application.(With seam hotdeploy (requires Seam
+ 1.2.1) classes in META-INF/dev is automatically hotdeployed)</para>
<para>JBoss allows touching of descriptors to trigger restart. See
seam-gen on how it is done technically.</para>
@@ -182,11 +190,21 @@
with @Name("ping") and corresponding ping.xhtml and
PingTest.java.</para>
+ <para>The generated PingBeanTest.java should be in the action folder
+ (suggestion: WAR -> src/action, EAR -> ejb project src),
+ ping.xhtml in WebContent and the PingTest.java + related testng files
+ in the test src/ folder (suggestion project-test ->
+ src/test).</para>
+
+ <para>Click the "Restart Application" button (today only "Touch
+ web.xml" is there for wars so need something for ear's too)</para>
+
<para>Go to browser and go to the page called /ping.seam and you
should have a input field where in you can enter text and the result
should come back on the next page.</para>
- <para>The generated PingTest.java should be</para>
+ <para>If Seam hotdeploy is enabled you should be able to go directly
+ to "Go to browser" skipping the restart app.</para>
</listitem>
</itemizedlist>
</section>
@@ -207,10 +225,10 @@
setup would require more than one project to work in eclipse and it would
probably make sense to define a working set that defines the Seam Project.
e.g. working set called "SeamPhoto" for a project called "SeamPhoto" and
- the corresponding projects would be named "seamphoto.war",
- "seamphoto.model", "seamphoto.ear", "seamphoto.test" (this names are
- *defaults* and our code should not depend on the naming pattern to figure
- out what kind a project is)</para>
+ the corresponding projects would be named "seamphoto", "seamphoto.ejb",
+ "seamphoto.ear", "seamphoto.test" (this names are *defaults* and our code
+ should not depend on the naming pattern to figure out what kind a project
+ is)</para>
<para>The best way to see what should go where is to use seam-gen to
generate two projects, one for war and the other for ear - when built
@@ -311,8 +329,8 @@
<para>A project should be associated with a Seam runtime which defines
what version (1.2 or 2.0) the IDE should assume for the project + the
- set of core libraries for seam. Exactly like one does for JDK
- runtimes.</para>
+ set of core libraries for seam (just derived from the homedir). Exactly
+ like one does for JDK runtimes.</para>
</section>
<section>
@@ -339,8 +357,7 @@
<para>If we create a Hibernate Tools code generation users will have it
available in the Run > Hibernate Code Generation and be able to run it
- repeatedly; not sure though if seam-gen does more than simply let
- hibernate tools do it. Needs to investigate.</para>
+ repeatedly.</para>
<para>Next to this document is a hsqldb folder with a hsqldb with data
that can be used with Seam Generate Entities to have a fully working
@@ -348,22 +365,4 @@
<para></para>
</section>
-
- <section>
- <title>Seam New Action</title>
-
- <para>public boolean authenticate() { log.info("authenticating #0",
- identity.getUsername());
- if(identity.getUsername().equals(identity.getPassword())) {
- FacesMessages.instance().add("sorry - password and username need to be
- different."); return false; } //write your authentication logic here,
- //return true if the authentication was //successful, false otherwise
- identity.addRole("admin"); return true; }</para>
- </section>
-
- <section>
- <title>Seam New Form</title>
-
- <para></para>
- </section>
</chapter>
\ No newline at end of file
16 years, 8 months
JBoss Tools SVN: r3336 - trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-08-26 03:20:15 -0400 (Sun, 26 Aug 2007)
New Revision: 3336
Modified:
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PlugInLoadTest.java
Log:
http://jira.jboss.org/jira/browse/EXIN-13
fix test errors
Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PlugInLoadTest.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PlugInLoadTest.java 2007-08-25 11:43:40 UTC (rev 3335)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PlugInLoadTest.java 2007-08-26 07:20:15 UTC (rev 3336)
@@ -135,8 +135,6 @@
jbideNS+"jdt.j2ee.ui",
jbideNS+"jdt.j2ee.xml.ui",
jbideNS+"jdt.ui",
- jbideNS+"jdt.ws.core",
- jbideNS+"jdt.ws.ui",
jbideNS+"archives.core",
jbideNS+"archives.ui",
jbideNS+"ui",
16 years, 8 months