JBoss Tools SVN: r11218 - 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-27 13:25:38 -0400 (Mon, 27 Oct 2008)
New Revision: 11218
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-27 17:07:33 UTC (rev 11217)
+++ branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-10-27 17:25:38 UTC (rev 11218)
@@ -58,15 +58,31 @@
public static final String JBOSS_AS_HOME = "../../../../jboss-eap/jboss-as"; // JBoss AS home directory (relative to plugin)- <RHDS_HOME>/jbossas.
- public static final String SERVERS_FILE = "../../../application_platforms.properties";
+ 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",
+ "org.jboss.ide.eclipse.as.runtime.40",
+ "org.jboss.ide.eclipse.as.runtime.42",
+ "org.jboss.ide.eclipse.as.runtime.50"
+ };
- public static final String JBOSS_AS_RUNTIME_TYPE_ID
- = "org.jboss.ide.eclipse.as.runtime.42";
+ public static final String JBOSS_AS_TYPE_ID[] = {
+ "org.jboss.ide.eclipse.as.32",
+ "org.jboss.ide.eclipse.as.40",
+ "org.jboss.ide.eclipse.as.42",
+ "org.jboss.ide.eclipse.as.50"
+ };
+
- public static final String JBOSS_AS_TYPE_ID = "org.jboss.ide.eclipse.as.42";
+ public static final String JBOSS_AS_NAME[] = {
+ "JBoss Application Server 3.2",
+ "JBoss Application Server 4.0",
+ "JBoss Application Server 4.2",
+ "JBoss Application Server 5.0"
+ };
- public static final String JBOSS_AS_NAME = "JBoss Application Server 4.2";
-
public static final String JBOSS_AS_HOST = "localhost";
public static final String JBOSS_AS_DEFAULT_CONFIGURATION_NAME = "default";
@@ -109,21 +125,35 @@
while(true){
String jbossASLocation = null;
+ // server name
position = str.indexOf("=",position+1);
if(position < 0) break;
- // server name
+ // server type
position = str.indexOf(",",position+1);
if(position < 0) break;
- // server type
- position = str.indexOf(",",position+1);
- if(position < 0) break;
+ // server version
+ int versionPosition = str.indexOf(",",position+1);
+ if(versionPosition < 0) break;
// server location
- position = str.indexOf(",",position+1);
+ position = str.indexOf(",",versionPosition+1);
if(position < 0) break;
+ 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"))
+ index = 2;
+ else if(version.startsWith("5.0"))
+ index = 3;
+
int next = str.indexOf("server",position+1);
if(next < 0)
@@ -136,10 +166,10 @@
IRuntimeWorkingCopy runtime = null;
IProgressMonitor progressMonitor = new NullProgressMonitor();
if (runtime == null) {
- runtime = createRuntime(jbossASLocation, progressMonitor);
+ runtime = createRuntime(jbossASLocation, progressMonitor, index);
}
if (runtime != null) {
- createServer(progressMonitor, runtime);
+ createServer(progressMonitor, runtime, index);
}
createDriver(jbossASLocation);
@@ -176,10 +206,10 @@
IProgressMonitor progressMonitor = new NullProgressMonitor();
if (runtime == null) {
- runtime = createRuntime(jbossASLocation, progressMonitor);
+ runtime = createRuntime(jbossASLocation, progressMonitor, 2);
}
if (runtime != null) {
- createServer(progressMonitor, runtime);
+ createServer(progressMonitor, runtime, 2);
}
createDriver(jbossASLocation);
@@ -205,10 +235,10 @@
* @throws ConnectionProfileException
*/
public static IServerWorkingCopy initJBossAS(String jbossASLocation, IProgressMonitor progressMonitor) throws CoreException, ConnectionProfileException {
- IRuntimeWorkingCopy runtime = createRuntime(jbossASLocation, progressMonitor);
+ IRuntimeWorkingCopy runtime = createRuntime(jbossASLocation, progressMonitor, 2);
IServerWorkingCopy server = null;
if (runtime != null) {
- server = createServer(progressMonitor, runtime);
+ server = createServer(progressMonitor, runtime, 2);
}
createDriver(jbossASLocation);
return server;
@@ -221,13 +251,13 @@
* @return runtime working copy
* @throws CoreException
*/
- private static IRuntimeWorkingCopy createRuntime(String jbossASLocation, IProgressMonitor progressMonitor) throws CoreException {
+ private static IRuntimeWorkingCopy createRuntime(String jbossASLocation, IProgressMonitor progressMonitor, int index) throws CoreException {
IRuntimeWorkingCopy runtime = null;
String type = null;
String version = null;
String runtimeId = null;
IPath jbossAsLocationPath = new Path(jbossASLocation);
- IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(type, version, JBOSS_AS_RUNTIME_TYPE_ID);
+ IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(type, version, JBOSS_AS_RUNTIME_TYPE_ID[index]);
if (runtimeTypes.length > 0) {
runtime = runtimeTypes[0].createRuntime(runtimeId, progressMonitor);
runtime.setLocation(jbossAsLocationPath);
@@ -251,12 +281,12 @@
* @return server working copy
* @throws CoreException
*/
- private static IServerWorkingCopy createServer(IProgressMonitor progressMonitor, IRuntimeWorkingCopy runtime) throws CoreException {
- IServerType serverType = ServerCore.findServerType(JBOSS_AS_TYPE_ID);
+ private static IServerWorkingCopy createServer(IProgressMonitor progressMonitor, IRuntimeWorkingCopy runtime, int index) 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);
+ server.setName(JBOSS_AS_NAME[2]);
// 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-27 17:07:33 UTC (rev 11217)
+++ trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-10-27 17:25:38 UTC (rev 11218)
@@ -58,15 +58,31 @@
public static final String JBOSS_AS_HOME = "../../../../jboss-eap/jboss-as"; // JBoss AS home directory (relative to plugin)- <RHDS_HOME>/jbossas.
- public static final String SERVERS_FILE = "../../../application_platforms.properties";
+ 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",
+ "org.jboss.ide.eclipse.as.runtime.40",
+ "org.jboss.ide.eclipse.as.runtime.42",
+ "org.jboss.ide.eclipse.as.runtime.50"
+ };
- public static final String JBOSS_AS_RUNTIME_TYPE_ID
- = "org.jboss.ide.eclipse.as.runtime.42";
+ public static final String JBOSS_AS_TYPE_ID[] = {
+ "org.jboss.ide.eclipse.as.32",
+ "org.jboss.ide.eclipse.as.40",
+ "org.jboss.ide.eclipse.as.42",
+ "org.jboss.ide.eclipse.as.50"
+ };
+
- public static final String JBOSS_AS_TYPE_ID = "org.jboss.ide.eclipse.as.42";
+ public static final String JBOSS_AS_NAME[] = {
+ "JBoss Application Server 3.2",
+ "JBoss Application Server 4.0",
+ "JBoss Application Server 4.2",
+ "JBoss Application Server 5.0"
+ };
- public static final String JBOSS_AS_NAME = "JBoss Application Server 4.2";
-
public static final String JBOSS_AS_HOST = "localhost";
public static final String JBOSS_AS_DEFAULT_CONFIGURATION_NAME = "default";
@@ -109,21 +125,35 @@
while(true){
String jbossASLocation = null;
+ // server name
position = str.indexOf("=",position+1);
if(position < 0) break;
- // server name
+ // server type
position = str.indexOf(",",position+1);
if(position < 0) break;
- // server type
- position = str.indexOf(",",position+1);
- if(position < 0) break;
+ // server version
+ int versionPosition = str.indexOf(",",position+1);
+ if(versionPosition < 0) break;
// server location
- position = str.indexOf(",",position+1);
+ position = str.indexOf(",",versionPosition+1);
if(position < 0) break;
+ 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"))
+ index = 2;
+ else if(version.startsWith("5.0"))
+ index = 3;
+
int next = str.indexOf("server",position+1);
if(next < 0)
@@ -136,10 +166,10 @@
IRuntimeWorkingCopy runtime = null;
IProgressMonitor progressMonitor = new NullProgressMonitor();
if (runtime == null) {
- runtime = createRuntime(jbossASLocation, progressMonitor);
+ runtime = createRuntime(jbossASLocation, progressMonitor, index);
}
if (runtime != null) {
- createServer(progressMonitor, runtime);
+ createServer(progressMonitor, runtime, index);
}
createDriver(jbossASLocation);
@@ -176,10 +206,10 @@
IProgressMonitor progressMonitor = new NullProgressMonitor();
if (runtime == null) {
- runtime = createRuntime(jbossASLocation, progressMonitor);
+ runtime = createRuntime(jbossASLocation, progressMonitor, 2);
}
if (runtime != null) {
- createServer(progressMonitor, runtime);
+ createServer(progressMonitor, runtime, 2);
}
createDriver(jbossASLocation);
@@ -205,10 +235,10 @@
* @throws ConnectionProfileException
*/
public static IServerWorkingCopy initJBossAS(String jbossASLocation, IProgressMonitor progressMonitor) throws CoreException, ConnectionProfileException {
- IRuntimeWorkingCopy runtime = createRuntime(jbossASLocation, progressMonitor);
+ IRuntimeWorkingCopy runtime = createRuntime(jbossASLocation, progressMonitor, 2);
IServerWorkingCopy server = null;
if (runtime != null) {
- server = createServer(progressMonitor, runtime);
+ server = createServer(progressMonitor, runtime, 2);
}
createDriver(jbossASLocation);
return server;
@@ -221,13 +251,13 @@
* @return runtime working copy
* @throws CoreException
*/
- private static IRuntimeWorkingCopy createRuntime(String jbossASLocation, IProgressMonitor progressMonitor) throws CoreException {
+ private static IRuntimeWorkingCopy createRuntime(String jbossASLocation, IProgressMonitor progressMonitor, int index) throws CoreException {
IRuntimeWorkingCopy runtime = null;
String type = null;
String version = null;
String runtimeId = null;
IPath jbossAsLocationPath = new Path(jbossASLocation);
- IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(type, version, JBOSS_AS_RUNTIME_TYPE_ID);
+ IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(type, version, JBOSS_AS_RUNTIME_TYPE_ID[index]);
if (runtimeTypes.length > 0) {
runtime = runtimeTypes[0].createRuntime(runtimeId, progressMonitor);
runtime.setLocation(jbossAsLocationPath);
@@ -251,12 +281,12 @@
* @return server working copy
* @throws CoreException
*/
- private static IServerWorkingCopy createServer(IProgressMonitor progressMonitor, IRuntimeWorkingCopy runtime) throws CoreException {
- IServerType serverType = ServerCore.findServerType(JBOSS_AS_TYPE_ID);
+ private static IServerWorkingCopy createServer(IProgressMonitor progressMonitor, IRuntimeWorkingCopy runtime, int index) 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);
+ server.setName(JBOSS_AS_NAME[2]);
// 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: r11217 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: src/org/jboss/tools/jsf/vpe/jsf/test/jbide and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-10-27 13:07:33 -0400 (Mon, 27 Oct 2008)
New Revision: 11217
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/graphicImage.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java
Log:
corrected tests
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp.xml 2008-10-27 16:51:46 UTC (rev 11216)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/commandButton.jsp.xml 2008-10-27 17:07:33 UTC (rev 11217)
@@ -1,17 +1,17 @@
<tests>
<test id="commandButton1">
- <input type="submit" />
+ <input type="button" value="commandButton"/>
</test>
<test id="commandButton2">
- <input type="button" />
+ <input type="button" value="commandButton1" />
</test>
<test id="commandButton3">
- <input type="reset" />
+ <input type="reset" value="commandButton3" />
</test>
<test id="commandButton4">
- <input type="submit" />
+ <input type="submit" value="commandButton4" />
</test>
<test id="commandButton5">
- <input type="image" />
+ <input type="image" SRC="/.*ve/unresolved_image.gif/" />
</test>
</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/graphicImage.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/graphicImage.jsp.xml 2008-10-27 16:51:46 UTC (rev 11216)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/graphicImage.jsp.xml 2008-10-27 17:07:33 UTC (rev 11217)
@@ -1,8 +1,8 @@
<tests>
<test id="graphicImage1">
- <IMG SRC="unresolved.gif" />
+ <IMG SRC="/.*ve/unresolved_image.gif/" />
</test>
<test id="graphicImage2">
- <IMG />
+ <IMG SRC="/.*jsfTest/WebContent/pages/components/img/image.jpeg/" />
</test>
</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java 2008-10-27 16:51:46 UTC (rev 11216)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java 2008-10-27 17:07:33 UTC (rev 11217)
@@ -62,7 +62,6 @@
ELEMENTS.add("h:inputText"); //$NON-NLS-1$
ELEMENTS.add("h:inputTextarea"); //$NON-NLS-1$
ELEMENTS.add("h:inputSecret"); //$NON-NLS-1$
- ELEMENTS.add("h:inputHidden"); //$NON-NLS-1$
}
public JsfJbide2362Test(String name) {
16 years, 2 months
JBoss Tools SVN: r11216 - branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-10-27 12:51:46 -0400 (Mon, 27 Oct 2008)
New Revision: 11216
Modified:
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java
Log:
corrected test
Modified: branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java 2008-10-27 16:43:30 UTC (rev 11215)
+++ branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java 2008-10-27 16:51:46 UTC (rev 11216)
@@ -62,7 +62,6 @@
ELEMENTS.add("h:inputText"); //$NON-NLS-1$
ELEMENTS.add("h:inputTextarea"); //$NON-NLS-1$
ELEMENTS.add("h:inputSecret"); //$NON-NLS-1$
- ELEMENTS.add("h:inputHidden"); //$NON-NLS-1$
}
public JsfJbide2362Test(String name) {
@@ -231,7 +230,7 @@
}
// wait
- TestUtil.delay(500);
+ TestUtil.delay(1000);
// wait
assertNotNull(xulRunnerEditor.getLastSelectedNode());
}
16 years, 2 months
JBoss Tools SVN: r11215 - branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-27 12:43:30 -0400 (Mon, 27 Oct 2008)
New Revision: 11215
Modified:
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java
Log:
https://jira.jboss.org/jira/browse/JBDS-460 is fixed.
Seam FP runtime initialization is added.
merged from revision 21211
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2008-10-27 16:36:36 UTC (rev 11214)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2008-10-27 16:43:30 UTC (rev 11215)
@@ -38,6 +38,9 @@
public static String RUNTIME_CONFIG_FORMAT_VERSION = "1.0"; //$NON-NLS-1$
+ public static final String SEAM_1_2_HOME = "../../../../jboss-eap/seam"; //$NON-NLS-1$
+ public static final String SEAM_2_0_HOME = "../../../../jboss-eap/seamfp"; //$NON-NLS-1$
+
/**
*
*/
@@ -52,27 +55,48 @@
.node(SeamCorePlugin.PLUGIN_ID);
node.put(SeamProjectPreferences.RUNTIME_CONFIG_FORMAT_VERSION, RUNTIME_CONFIG_FORMAT_VERSION);
-// node.put(SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE, "DefaultDS"); //$NON-NLS-1$
node.put(SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS, "war"); //$NON-NLS-1$
node.put(SeamProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE, "HSQL"); //$NON-NLS-1$
- initializeDefault(node,getSeamGenBuildPath());
+ Map<String, SeamRuntime> map = new HashMap<String,SeamRuntime>();
+
+ // Initialize Seam 1.2 Runtime from JBoss EAP
+ String seamGenBuildPath = getSeamGenBuildPath(SEAM_1_2_HOME);
+ File seamFolder = new File(seamGenBuildPath);
+ if(seamFolder.exists() && seamFolder.isDirectory()) {
+ SeamRuntime rt = new SeamRuntime();
+ rt.setHomeDir(seamGenBuildPath);
+ rt.setName("Seam " + SeamVersion.SEAM_1_2 + ".AP"); //$NON-NLS-1$ //$NON-NLS-2$
+ rt.setDefault(true);
+ rt.setVersion(SeamVersion.SEAM_1_2);
+ map.put(rt.getName(), rt);
+ }
+ // Initialize Seam 2.0 Runtime from JBoss EAP
+ seamGenBuildPath = getSeamGenBuildPath(SEAM_2_0_HOME);
+ seamFolder = new File(seamGenBuildPath);
+ if(seamFolder.exists() && seamFolder.isDirectory()) {
+ SeamRuntime rt = new SeamRuntime();
+ rt.setHomeDir(seamGenBuildPath);
+ rt.setName("Seam " + SeamVersion.SEAM_2_0 + ".FP"); //$NON-NLS-1$ //$NON-NLS-2$
+ rt.setDefault(true);
+ rt.setVersion(SeamVersion.SEAM_2_0);
+ map.put(rt.getName(), rt);
+ }
+ node.put(SeamProjectPreferences.RUNTIME_LIST, new SeamRuntimeListConverter().getString(map));
try {
node.flush();
} catch (BackingStoreException e) {
SeamCorePlugin.getPluginLog().logError(e);
}
}
-
- public static final String SEAM_GEN_HOME = "../../../../jboss-eap/seam"; //$NON-NLS-1$
- public String getSeamGenBuildPath() {
+ private String getSeamGenBuildPath(String seamHomePath) {
String pluginLocation=null;
try {
pluginLocation = FileLocator.resolve(SeamCorePlugin.getDefault().getBundle().getEntry("/")).getFile(); //$NON-NLS-1$
} catch (IOException e) {
SeamCorePlugin.getPluginLog().logError(e);
};
- File seamGenDir = new File(pluginLocation, SEAM_GEN_HOME);
+ File seamGenDir = new File(pluginLocation, seamHomePath);
Path p = new Path(seamGenDir.getPath());
p.makeAbsolute();
if(p.toFile().exists()) {
@@ -81,23 +105,4 @@
return ""; //$NON-NLS-1$
}
}
-
- /**
- * @param node
- * @param seamGenBuildPath
- * @return
- */
- public void initializeDefault(IEclipsePreferences node, String seamGenBuildPath) {
- Map<String, SeamRuntime> map = new HashMap<String,SeamRuntime>();
- File seamFolder = new File(seamGenBuildPath);
- if(seamFolder.exists() && seamFolder.isDirectory()) {
- SeamRuntime rt = new SeamRuntime();
- rt.setHomeDir(seamGenBuildPath);
- rt.setName("Seam " + SeamVersion.SEAM_1_2 + ".AP"); //$NON-NLS-1$ //$NON-NLS-2$
- rt.setDefault(true);
- rt.setVersion(SeamVersion.SEAM_1_2);
- map.put(rt.getName(), rt);
- }
- node.put(SeamProjectPreferences.RUNTIME_LIST, new SeamRuntimeListConverter().getString(map));
- }
}
16 years, 2 months
JBoss Tools SVN: r11214 - branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.xml/schema.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-10-27 12:36:36 -0400 (Mon, 27 Oct 2008)
New Revision: 11214
Modified:
branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.xml/schema/contentAssistProcessor.exsd
Log:
https://jira.jboss.org/jira/browse/JBIDE-2397 Make EL code completions beautifull and context relevant
contentAssistProcessor schema is fixed
Modified: branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.xml/schema/contentAssistProcessor.exsd
===================================================================
--- branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.xml/schema/contentAssistProcessor.exsd 2008-10-27 16:34:26 UTC (rev 11213)
+++ branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.xml/schema/contentAssistProcessor.exsd 2008-10-27 16:36:36 UTC (rev 11214)
@@ -52,7 +52,7 @@
</annotation>
<complexType>
<sequence>
- <element ref="partitiontype" minOccurs="1" maxOccurs="unbounded"/>
+ <element ref="contenttype" minOccurs="1" maxOccurs="unbounded"/>
</sequence>
<attribute name="id" type="string" use="required">
<annotation>
16 years, 2 months
JBoss Tools SVN: r11213 - trunk/common/plugins/org.jboss.tools.common.text.xml/schema.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-10-27 12:34:26 -0400 (Mon, 27 Oct 2008)
New Revision: 11213
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/schema/contentAssistProcessor.exsd
Log:
https://jira.jboss.org/jira/browse/JBIDE-2397 Make EL code completions beautifull and context relevant
contentAssistProcessor schema is fixed
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/schema/contentAssistProcessor.exsd
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/schema/contentAssistProcessor.exsd 2008-10-27 16:27:38 UTC (rev 11212)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/schema/contentAssistProcessor.exsd 2008-10-27 16:34:26 UTC (rev 11213)
@@ -52,7 +52,7 @@
</annotation>
<complexType>
<sequence>
- <element ref="partitiontype" minOccurs="1" maxOccurs="unbounded"/>
+ <element ref="contenttype" minOccurs="1" maxOccurs="unbounded"/>
</sequence>
<attribute name="id" type="string" use="required">
<annotation>
16 years, 2 months
JBoss Tools SVN: r11212 - branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-10-27 12:27:38 -0400 (Mon, 27 Oct 2008)
New Revision: 11212
Modified:
branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-3010 NullPoineterException when call CA
Modified: branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2008-10-27 16:19:02 UTC (rev 11211)
+++ branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2008-10-27 16:27:38 UTC (rev 11212)
@@ -350,6 +350,7 @@
<contentAssistProcessor
class="org.jboss.tools.jst.jsp.contentassist.ExtendedJSPContentAssistProcessor"
id="org.jboss.tools.jst.jsp.contentassist.ExtendedJSPContentAssistProcessor">
+
<contenttype id="org.eclipse.jst.jsp.core.jspsource">
<partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
<partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
@@ -359,25 +360,12 @@
<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
</contenttype>
- <contenttype id="org.eclipse.wst.html.core.htmlsource">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- <partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
- <partitiontype id="org.eclipse.jst.jsp.DEFAULT_JSP" />
- <partitiontype id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
- <partitiontype id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" />
- <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
- <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
- </contenttype>
</contentAssistProcessor>
<contentAssistProcessor
class="org.jboss.tools.jst.jsp.contentassist.FaceletsHtmlContentAssistProcessor"
id="org.jboss.tools.jst.jsp.contentassist.FaceletsHtmlContentAssistProcessor">
- <contenttype id="org.eclipse.jst.jsp.core.jspsource">
- <partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
- <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
- <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" /> <!-- Is this forgotten? -->
- </contenttype>
+
<contenttype id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
@@ -392,9 +380,7 @@
<contentAssistProcessor
class="org.eclipse.wst.css.ui.internal.contentassist.CSSContentAssistProcessor"
id="org.eclipse.wst.css.ui.internal.contentassist.CSSContentAssistProcessor">
- <contenttype id="org.eclipse.jst.jsp.core.jspsource">
- <partitiontype id="org.eclipse.wst.css.STYLE" />
- </contenttype>
+
<contenttype id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.eclipse.wst.css.STYLE" />
</contenttype>
16 years, 2 months
JBoss Tools SVN: r11211 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-27 12:19:02 -0400 (Mon, 27 Oct 2008)
New Revision: 11211
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java
Log:
https://jira.jboss.org/jira/browse/JBDS-460 is fixed.
Seam FP runtime initialization is added.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2008-10-27 16:10:13 UTC (rev 11210)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2008-10-27 16:19:02 UTC (rev 11211)
@@ -38,6 +38,9 @@
public static String RUNTIME_CONFIG_FORMAT_VERSION = "1.0"; //$NON-NLS-1$
+ public static final String SEAM_1_2_HOME = "../../../../jboss-eap/seam"; //$NON-NLS-1$
+ public static final String SEAM_2_0_HOME = "../../../../jboss-eap/seamfp"; //$NON-NLS-1$
+
/**
*
*/
@@ -52,27 +55,48 @@
.node(SeamCorePlugin.PLUGIN_ID);
node.put(SeamProjectPreferences.RUNTIME_CONFIG_FORMAT_VERSION, RUNTIME_CONFIG_FORMAT_VERSION);
-// node.put(SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE, "DefaultDS"); //$NON-NLS-1$
node.put(SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS, "war"); //$NON-NLS-1$
node.put(SeamProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE, "HSQL"); //$NON-NLS-1$
- initializeDefault(node,getSeamGenBuildPath());
+ Map<String, SeamRuntime> map = new HashMap<String,SeamRuntime>();
+
+ // Initialize Seam 1.2 Runtime from JBoss EAP
+ String seamGenBuildPath = getSeamGenBuildPath(SEAM_1_2_HOME);
+ File seamFolder = new File(seamGenBuildPath);
+ if(seamFolder.exists() && seamFolder.isDirectory()) {
+ SeamRuntime rt = new SeamRuntime();
+ rt.setHomeDir(seamGenBuildPath);
+ rt.setName("Seam " + SeamVersion.SEAM_1_2 + ".AP"); //$NON-NLS-1$ //$NON-NLS-2$
+ rt.setDefault(true);
+ rt.setVersion(SeamVersion.SEAM_1_2);
+ map.put(rt.getName(), rt);
+ }
+ // Initialize Seam 2.0 Runtime from JBoss EAP
+ seamGenBuildPath = getSeamGenBuildPath(SEAM_2_0_HOME);
+ seamFolder = new File(seamGenBuildPath);
+ if(seamFolder.exists() && seamFolder.isDirectory()) {
+ SeamRuntime rt = new SeamRuntime();
+ rt.setHomeDir(seamGenBuildPath);
+ rt.setName("Seam " + SeamVersion.SEAM_2_0 + ".FP"); //$NON-NLS-1$ //$NON-NLS-2$
+ rt.setDefault(true);
+ rt.setVersion(SeamVersion.SEAM_2_0);
+ map.put(rt.getName(), rt);
+ }
+ node.put(SeamProjectPreferences.RUNTIME_LIST, new SeamRuntimeListConverter().getString(map));
try {
node.flush();
} catch (BackingStoreException e) {
SeamCorePlugin.getPluginLog().logError(e);
}
}
-
- public static final String SEAM_GEN_HOME = "../../../../jboss-eap/seam"; //$NON-NLS-1$
- public String getSeamGenBuildPath() {
+ private String getSeamGenBuildPath(String seamHomePath) {
String pluginLocation=null;
try {
pluginLocation = FileLocator.resolve(SeamCorePlugin.getDefault().getBundle().getEntry("/")).getFile(); //$NON-NLS-1$
} catch (IOException e) {
SeamCorePlugin.getPluginLog().logError(e);
};
- File seamGenDir = new File(pluginLocation, SEAM_GEN_HOME);
+ File seamGenDir = new File(pluginLocation, seamHomePath);
Path p = new Path(seamGenDir.getPath());
p.makeAbsolute();
if(p.toFile().exists()) {
@@ -81,23 +105,4 @@
return ""; //$NON-NLS-1$
}
}
-
- /**
- * @param node
- * @param seamGenBuildPath
- * @return
- */
- public void initializeDefault(IEclipsePreferences node, String seamGenBuildPath) {
- Map<String, SeamRuntime> map = new HashMap<String,SeamRuntime>();
- File seamFolder = new File(seamGenBuildPath);
- if(seamFolder.exists() && seamFolder.isDirectory()) {
- SeamRuntime rt = new SeamRuntime();
- rt.setHomeDir(seamGenBuildPath);
- rt.setName("Seam " + SeamVersion.SEAM_1_2 + ".AP"); //$NON-NLS-1$ //$NON-NLS-2$
- rt.setDefault(true);
- rt.setVersion(SeamVersion.SEAM_1_2);
- map.put(rt.getName(), rt);
- }
- node.put(SeamProjectPreferences.RUNTIME_LIST, new SeamRuntimeListConverter().getString(map));
- }
}
16 years, 2 months
JBoss Tools SVN: r11210 - trunk/jst/plugins/org.jboss.tools.jst.jsp.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-10-27 12:10:13 -0400 (Mon, 27 Oct 2008)
New Revision: 11210
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-3010 NullPoineterException when call CA
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2008-10-27 15:54:19 UTC (rev 11209)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2008-10-27 16:10:13 UTC (rev 11210)
@@ -360,25 +360,12 @@
<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
</contenttype>
- <contenttype id="org.eclipse.wst.html.core.htmlsource">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- <partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
- <partitiontype id="org.eclipse.jst.jsp.DEFAULT_JSP" />
- <partitiontype id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
- <partitiontype id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" />
- <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
- <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
- </contenttype>
</contentAssistProcessor>
<contentAssistProcessor
class="org.jboss.tools.jst.jsp.contentassist.FaceletsHtmlContentAssistProcessor"
id="org.jboss.tools.jst.jsp.contentassist.FaceletsHtmlContentAssistProcessor">
- <contenttype id="org.eclipse.jst.jsp.core.jspsource">
- <partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
- <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
- <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" /> <!-- Is this forgotten? -->
- </contenttype>
+
<contenttype id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
@@ -393,9 +380,6 @@
<contentAssistProcessor
class="org.eclipse.wst.css.ui.internal.contentassist.CSSContentAssistProcessor"
id="org.eclipse.wst.css.ui.internal.contentassist.CSSContentAssistProcessor">
- <contenttype id="org.eclipse.jst.jsp.core.jspsource">
- <partitiontype id="org.eclipse.wst.css.STYLE" />
- </contenttype>
<contenttype id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.eclipse.wst.css.STYLE" />
</contenttype>
16 years, 2 months
JBoss Tools SVN: r11209 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-27 11:54:19 -0400 (Mon, 27 Oct 2008)
New Revision: 11209
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.properties
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorConfigurationBlock.java
Log:
JBIDE-2946
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.java 2008-10-27 15:53:14 UTC (rev 11208)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.java 2008-10-27 15:54:19 UTC (rev 11209)
@@ -140,6 +140,7 @@
//Seam Expression language
public static String SeamValidatorConfigurationBlock_section_el;
+ public static String SeamValidatorConfigurationBlock_pb_elSyntaxError_label;
public static String SeamValidatorConfigurationBlock_pb_unknownElVariableName_label;
public static String SeamValidatorConfigurationBlock_pb_checkVars_label;
public static String SeamValidatorConfigurationBlock_pb_unknownElVariablePropertyName_label;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.properties 2008-10-27 15:53:14 UTC (rev 11208)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.properties 2008-10-27 15:54:19 UTC (rev 11209)
@@ -56,6 +56,7 @@
##Seam Expression language
SeamValidatorConfigurationBlock_section_el=Expression language
+SeamValidatorConfigurationBlock_pb_elSyntaxError_label=EL Syntax Error
SeamValidatorConfigurationBlock_pb_unknownElVariableName_label=Context variable cannot be resolved:
SeamValidatorConfigurationBlock_pb_checkVars_label=Recognize "var" attributes
SeamValidatorConfigurationBlock_pb_unknownElVariablePropertyName_label=Property cannot be resolved:
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorConfigurationBlock.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorConfigurationBlock.java 2008-10-27 15:53:14 UTC (rev 11208)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorConfigurationBlock.java 2008-10-27 15:54:19 UTC (rev 11209)
@@ -122,9 +122,10 @@
private static SectionDescription SECTION_EL = new SectionDescription(
SeamPreferencesMessages.SeamValidatorConfigurationBlock_section_el,
new String[][]{
+ {SeamPreferences.EL_SYNTAX_ERROR, SeamPreferencesMessages.SeamValidatorConfigurationBlock_pb_elSyntaxError_label},
{SeamPreferences.UNKNOWN_EL_VARIABLE_NAME, SeamPreferencesMessages.SeamValidatorConfigurationBlock_pb_unknownElVariableName_label},
{SeamPreferences.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, SeamPreferencesMessages.SeamValidatorConfigurationBlock_pb_unknownElVariablePropertyName_label},
- {SeamPreferences.UNPAIRED_GETTER_OR_SETTER, SeamPreferencesMessages.SeamValidatorConfigurationBlock_pb_unpairedGetterOrSetter_label}
+ {SeamPreferences.UNPAIRED_GETTER_OR_SETTER, SeamPreferencesMessages.SeamValidatorConfigurationBlock_pb_unpairedGetterOrSetter_label},
}
);
16 years, 2 months