JBoss Tools SVN: r11362 - trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2008-10-30 14:38:24 -0400 (Thu, 30 Oct 2008)
New Revision: 11362
Modified:
branches/jbosstools-3.0.0.Beta1/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
Log:
https://jira.jboss.org/jira/browse/JBDS-461
Modified: branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-10-30 18:15:36 UTC (rev 11361)
+++ branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-10-30 18:38:24 UTC (rev 11362)
@@ -60,6 +60,7 @@
public static final String SERVERS_FILE = "../../../../studio/application_platforms.properties";
+
// This constants are made to avoid dependency with org.jboss.ide.eclipse.as.core plugin
public static final String JBOSS_AS_RUNTIME_TYPE_ID[] = {
"org.jboss.ide.eclipse.as.runtime.32",
@@ -82,6 +83,8 @@
"JBoss Application Server 4.2",
"JBoss Application Server 5.0"
};
+
+ private static final int installedASIndex = 2;
public static final String JBOSS_AS_HOST = "localhost";
@@ -126,12 +129,14 @@
String jbossASLocation = null;
// server name
- position = str.indexOf("=",position+1);
- if(position < 0) break;
+ int namePosition = str.indexOf("=",position+1);
+ if(namePosition < 0) break;
// server type
- position = str.indexOf(",",position+1);
+ position = str.indexOf(",",namePosition+1);
if(position < 0) break;
+
+ String name = str.substring(namePosition+1,position).trim();
// server version
int versionPosition = str.indexOf(",",position+1);
@@ -169,7 +174,7 @@
runtime = createRuntime(jbossASLocation, progressMonitor, index);
}
if (runtime != null) {
- createServer(progressMonitor, runtime, index);
+ createServer(progressMonitor, runtime, index, name);
}
createDriver(jbossASLocation);
@@ -209,7 +214,7 @@
runtime = createRuntime(jbossASLocation, progressMonitor, 2);
}
if (runtime != null) {
- createServer(progressMonitor, runtime, 2);
+ createServer(progressMonitor, runtime, 2, null);
}
createDriver(jbossASLocation);
@@ -238,7 +243,7 @@
IRuntimeWorkingCopy runtime = createRuntime(jbossASLocation, progressMonitor, 2);
IServerWorkingCopy server = null;
if (runtime != null) {
- server = createServer(progressMonitor, runtime, 2);
+ server = createServer(progressMonitor, runtime, 2, null);
}
createDriver(jbossASLocation);
return server;
@@ -281,12 +286,16 @@
* @return server working copy
* @throws CoreException
*/
- private static IServerWorkingCopy createServer(IProgressMonitor progressMonitor, IRuntimeWorkingCopy runtime, int index) throws CoreException {
+ private static IServerWorkingCopy createServer(IProgressMonitor progressMonitor, IRuntimeWorkingCopy runtime, int index, String name) throws CoreException {
IServerType serverType = ServerCore.findServerType(JBOSS_AS_TYPE_ID[index]);
IServerWorkingCopy server = serverType.createServer(null, null, runtime, progressMonitor);
server.setHost(JBOSS_AS_HOST);
- server.setName(JBOSS_AS_NAME[2]);
+ if(name != null)
+ server.setName(name);
+ else
+ server.setName(JBOSS_AS_NAME[installedASIndex]);
+
// JBossServer.DEPLOY_DIRECTORY
String deployVal = runtime.getLocation().append("server").append(JBOSS_AS_DEFAULT_CONFIGURATION_NAME).append("deploy").toOSString();
((ServerWorkingCopy) server).setAttribute("org.jboss.ide.eclipse.as.core.server.deployDirectory", deployVal);
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-10-30 18:15:36 UTC (rev 11361)
+++ trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-10-30 18:38:24 UTC (rev 11362)
@@ -60,6 +60,7 @@
public static final String SERVERS_FILE = "../../../../studio/application_platforms.properties";
+
// This constants are made to avoid dependency with org.jboss.ide.eclipse.as.core plugin
public static final String JBOSS_AS_RUNTIME_TYPE_ID[] = {
"org.jboss.ide.eclipse.as.runtime.32",
@@ -82,6 +83,8 @@
"JBoss Application Server 4.2",
"JBoss Application Server 5.0"
};
+
+ private static final int installedASIndex = 2;
public static final String JBOSS_AS_HOST = "localhost";
@@ -126,12 +129,14 @@
String jbossASLocation = null;
// server name
- position = str.indexOf("=",position+1);
- if(position < 0) break;
+ int namePosition = str.indexOf("=",position+1);
+ if(namePosition < 0) break;
// server type
- position = str.indexOf(",",position+1);
+ position = str.indexOf(",",namePosition+1);
if(position < 0) break;
+
+ String name = str.substring(namePosition+1,position).trim();
// server version
int versionPosition = str.indexOf(",",position+1);
@@ -169,7 +174,7 @@
runtime = createRuntime(jbossASLocation, progressMonitor, index);
}
if (runtime != null) {
- createServer(progressMonitor, runtime, index);
+ createServer(progressMonitor, runtime, index, name);
}
createDriver(jbossASLocation);
@@ -209,7 +214,7 @@
runtime = createRuntime(jbossASLocation, progressMonitor, 2);
}
if (runtime != null) {
- createServer(progressMonitor, runtime, 2);
+ createServer(progressMonitor, runtime, 2, null);
}
createDriver(jbossASLocation);
@@ -238,7 +243,7 @@
IRuntimeWorkingCopy runtime = createRuntime(jbossASLocation, progressMonitor, 2);
IServerWorkingCopy server = null;
if (runtime != null) {
- server = createServer(progressMonitor, runtime, 2);
+ server = createServer(progressMonitor, runtime, 2, null);
}
createDriver(jbossASLocation);
return server;
@@ -281,12 +286,16 @@
* @return server working copy
* @throws CoreException
*/
- private static IServerWorkingCopy createServer(IProgressMonitor progressMonitor, IRuntimeWorkingCopy runtime, int index) throws CoreException {
+ private static IServerWorkingCopy createServer(IProgressMonitor progressMonitor, IRuntimeWorkingCopy runtime, int index, String name) throws CoreException {
IServerType serverType = ServerCore.findServerType(JBOSS_AS_TYPE_ID[index]);
IServerWorkingCopy server = serverType.createServer(null, null, runtime, progressMonitor);
server.setHost(JBOSS_AS_HOST);
- server.setName(JBOSS_AS_NAME[2]);
+ if(name != null)
+ server.setName(name);
+ else
+ server.setName(JBOSS_AS_NAME[installedASIndex]);
+
// JBossServer.DEPLOY_DIRECTORY
String deployVal = runtime.getLocation().append("server").append(JBOSS_AS_DEFAULT_CONFIGURATION_NAME).append("deploy").toOSString();
((ServerWorkingCopy) server).setAttribute("org.jboss.ide.eclipse.as.core.server.deployDirectory", deployVal);
16 years, 2 months
JBoss Tools SVN: r11361 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.
by jbosstools-commits@lists.jboss.org
Author: dsakovich
Date: 2008-10-30 14:15:36 -0400 (Thu, 30 Oct 2008)
New Revision: 11361
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3009
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2008-10-30 17:01:44 UTC (rev 11360)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2008-10-30 18:15:36 UTC (rev 11361)
@@ -370,6 +370,9 @@
rci = 0;
}
for (int j = 0; j < tableSize; j++) {
+ if (i*tableSize+j >= childrenCount) {
+ break;
+ }
nsIDOMElement visualCell = visualDocument
.createElement(HTML.TAG_TD);
if (columnClasses.size() > 0) {
16 years, 2 months
JBoss Tools SVN: r11359 - trunk/struts/docs/struts_tools_tutorial/en.
by jbosstools-commits@lists.jboss.org
Author: ochikvina
Date: 2008-10-30 13:01:34 -0400 (Thu, 30 Oct 2008)
New Revision: 11359
Modified:
trunk/struts/docs/struts_tools_tutorial/en/master.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-463 - changing the dtd validation schema url;
Modified: trunk/struts/docs/struts_tools_tutorial/en/master.xml
===================================================================
--- trunk/struts/docs/struts_tools_tutorial/en/master.xml 2008-10-30 17:01:27 UTC (rev 11358)
+++ trunk/struts/docs/struts_tools_tutorial/en/master.xml 2008-10-30 17:01:34 UTC (rev 11359)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.docbook.org/xsd/4.3/docbook.xsd"
+"http://www.docbook.org/xml/4.3/docbookx.dtd"
[<!ENTITY introduction SYSTEM "modules/introduction.xml">
<!ENTITY struts_application SYSTEM "modules/struts_application.xml">
16 years, 2 months
JBoss Tools SVN: r11357 - trunk/seam/docs/reference/en.
by jbosstools-commits@lists.jboss.org
Author: ochikvina
Date: 2008-10-30 13:01:14 -0400 (Thu, 30 Oct 2008)
New Revision: 11357
Modified:
trunk/seam/docs/reference/en/master.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-463 - changing the dtd validation schema url;
Modified: trunk/seam/docs/reference/en/master.xml
===================================================================
--- trunk/seam/docs/reference/en/master.xml 2008-10-30 17:01:07 UTC (rev 11356)
+++ trunk/seam/docs/reference/en/master.xml 2008-10-30 17:01:14 UTC (rev 11357)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.docbook.org/xsd/4.3/docbook.xsd"
+"http://www.docbook.org/xml/4.3/docbookx.dtd"
[<!ENTITY intro SYSTEM "modules/intro.xml">
<!ENTITY creating_new_seam SYSTEM "modules/creating_new_seam.xml">
16 years, 2 months
JBoss Tools SVN: r11355 - trunk/jsf/docs/userguide/en.
by jbosstools-commits@lists.jboss.org
Author: ochikvina
Date: 2008-10-30 13:00:53 -0400 (Thu, 30 Oct 2008)
New Revision: 11355
Modified:
trunk/jsf/docs/userguide/en/master.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-463 - changing the dtd validation schema url;
Modified: trunk/jsf/docs/userguide/en/master.xml
===================================================================
--- trunk/jsf/docs/userguide/en/master.xml 2008-10-30 17:00:36 UTC (rev 11354)
+++ trunk/jsf/docs/userguide/en/master.xml 2008-10-30 17:00:53 UTC (rev 11355)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3CR3/docbookx.dtd"
+"http://www.docbook.org/xml/4.3/docbookx.dtd"
[
<!ENTITY Visual_Web_Tools SYSTEM "modules/Visual_Web_Tools.xml">
@@ -20,8 +20,8 @@
<!ENTITY jsfreflink "../../jsf_tools_ref_guide/html_single/index.html">
<!ENTITY jsftutoriallink "../../jsf_tools_tutorial/html_single/index.html">
<!ENTITY strutsreflink "../../struts_tools_ref_guide/html_single/index.html">
-<!ENTITY strutstutoriallink "../../struts_tools_tutorial/html_single/index.html">
-<!ENTITY migrationlink "../../Exadel-migration/html_single/index.html">
+<!ENTITY strutstutoriallink "../../struts_tools_tutorial/html_single/index.html">
+<!ENTITY migrationlink "../../Exadel-migration/html_single/index.html">
]>
<book>
@@ -52,6 +52,6 @@
&springTools;
&editors;
&palette;
- &web_projects;
- &preferences;
+ &web_projects;
+ &preferences;
</book>
16 years, 2 months
JBoss Tools SVN: r11354 - trunk/jsf/docs/jsf_tools_tutorial/en.
by jbosstools-commits@lists.jboss.org
Author: ochikvina
Date: 2008-10-30 13:00:36 -0400 (Thu, 30 Oct 2008)
New Revision: 11354
Modified:
trunk/jsf/docs/jsf_tools_tutorial/en/master.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-463 - changing the dtd validation schema url;
Modified: trunk/jsf/docs/jsf_tools_tutorial/en/master.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_tutorial/en/master.xml 2008-10-30 17:00:23 UTC (rev 11353)
+++ trunk/jsf/docs/jsf_tools_tutorial/en/master.xml 2008-10-30 17:00:36 UTC (rev 11354)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.docbook.org/xsd/4.3/docbook.xsd"
+"http://www.docbook.org/xml/4.3/docbookx.dtd"
[<!ENTITY introduction SYSTEM "modules/introduction.xml">
<!ENTITY jsf_application SYSTEM "modules/jsf_application.xml">
16 years, 2 months