JBoss Tools SVN: r16939 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-07-31 19:24:37 -0400 (Fri, 31 Jul 2009)
New Revision: 16939
Added:
trunk/component-dependencies-graph.png
Removed:
trunk/component-dependencies-graph.png
Log:
dependencies graph
Deleted: trunk/component-dependencies-graph.png
===================================================================
(Binary files differ)
Added: trunk/component-dependencies-graph.png
===================================================================
(Binary files differ)
Property changes on: trunk/component-dependencies-graph.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 5 months
JBoss Tools SVN: r16938 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-07-31 19:20:07 -0400 (Fri, 31 Jul 2009)
New Revision: 16938
Added:
trunk/component-dependencies-graph.png
Log:
dependencies graph
Added: trunk/component-dependencies-graph.png
===================================================================
(Binary files differ)
Property changes on: trunk/component-dependencies-graph.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 5 months
JBoss Tools SVN: r16937 - trunk/bpel/releng.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-07-31 19:03:28 -0400 (Fri, 31 Jul 2009)
New Revision: 16937
Modified:
trunk/bpel/releng/build.properties
Log:
reenable tests
Modified: trunk/bpel/releng/build.properties
===================================================================
--- trunk/bpel/releng/build.properties 2009-07-31 22:50:16 UTC (rev 16936)
+++ trunk/bpel/releng/build.properties 2009-07-31 23:03:28 UTC (rev 16937)
@@ -13,8 +13,8 @@
testFeatureToBuildID=org.jboss.tools.bpel.tests.feature
# tests do not run due to missing dependencies for o.j.t.c - xulrunner and xpcom?
-#build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup
-build.steps=buildUpdate,generateDigests,publish,cleanup
+build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup
+#build.steps=buildUpdate,generateDigests,publish,cleanup
# to (re)generate map and psfs, use these settings
#build.steps=dir2svnmap,map2psf
15 years, 5 months
JBoss Tools SVN: r16936 - in trunk/bpel/plugins/org.jboss.tools.bpel.as.integration: META-INF and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-07-31 18:50:16 -0400 (Fri, 31 Jul 2009)
New Revision: 16936
Added:
trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/tools/
trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/tools/bpel/
trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/tools/bpel/as/
trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/tools/bpel/as/integration/
Removed:
trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/bpel/as/integration/
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/plugin.xml
trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/tools/bpel/as/integration/Activator.java
trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/tools/bpel/as/integration/JBossServerBPELPublisher.java
Log:
JBIDE-4696 refactor
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/META-INF/MANIFEST.MF 2009-07-31 22:45:18 UTC (rev 16935)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/META-INF/MANIFEST.MF 2009-07-31 22:50:16 UTC (rev 16936)
@@ -3,7 +3,7 @@
Bundle-Name: BPEL JBoss AS Publisher
Bundle-SymbolicName: org.jboss.tools.bpel.as.integration;singleton:=true
Bundle-Version: 1.0.0
-Bundle-Activator: org.jboss.bpel.as.integration.Activator
+Bundle-Activator: org.jboss.tools.bpel.as.integration.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.jboss.ide.eclipse.as.core,
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/plugin.xml
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/plugin.xml 2009-07-31 22:45:18 UTC (rev 16935)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/plugin.xml 2009-07-31 22:50:16 UTC (rev 16936)
@@ -4,7 +4,7 @@
<extension
point="org.jboss.ide.eclipse.as.core.publishers">
<publisher
- class="org.jboss.bpel.as.integration.JBossServerBPELPublisher"
+ class="org.jboss.tools.bpel.as.integration.JBossServerBPELPublisher"
priority="4">
</publisher>
</extension>
Copied: trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/tools/bpel/as/integration (from rev 16935, trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/bpel/as/integration)
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/tools/bpel/as/integration/Activator.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/bpel/as/integration/Activator.java 2009-07-31 22:45:18 UTC (rev 16935)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/tools/bpel/as/integration/Activator.java 2009-07-31 22:50:16 UTC (rev 16936)
@@ -1,4 +1,4 @@
-package org.jboss.bpel.as.integration;
+package org.jboss.tools.bpel.as.integration;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -9,7 +9,7 @@
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.bpel.as.integration";
+ public static final String PLUGIN_ID = "org.jboss.tools.bpel.as.integration";
// The shared instance
private static Activator plugin;
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/tools/bpel/as/integration/JBossServerBPELPublisher.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/bpel/as/integration/JBossServerBPELPublisher.java 2009-07-31 22:45:18 UTC (rev 16935)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/tools/bpel/as/integration/JBossServerBPELPublisher.java 2009-07-31 22:50:16 UTC (rev 16936)
@@ -1,4 +1,4 @@
-package org.jboss.bpel.as.integration;
+package org.jboss.tools.bpel.as.integration;
import org.eclipse.bpel.runtimes.IBPELModuleFacetConstants;
import org.eclipse.core.resources.IProject;
15 years, 5 months
JBoss Tools SVN: r16935 - trunk/bpel/plugins.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-07-31 18:45:18 -0400 (Fri, 31 Jul 2009)
New Revision: 16935
Added:
trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/
Removed:
trunk/bpel/plugins/org.jboss.bpel.as.integration/
Log:
refactor for consistency w/ other bpel plugins/features
Copied: trunk/bpel/plugins/org.jboss.tools.bpel.as.integration (from rev 16934, trunk/bpel/plugins/org.jboss.bpel.as.integration)
15 years, 5 months
JBoss Tools SVN: r16934 - in trunk/as/plugins: org.jboss.ide.eclipse.archives.webtools/filesetdata and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-07-31 17:25:13 -0400 (Fri, 31 Jul 2009)
New Revision: 16934
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.32
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.40
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.42
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.50
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.51
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.43
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.50
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
JBIDE-4680 - more changes as per max
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF 2009-07-31 20:18:26 UTC (rev 16933)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF 2009-07-31 21:25:13 UTC (rev 16934)
@@ -20,7 +20,8 @@
org.jboss.ide.eclipse.as.ui;bundle-version="1.0.0",
org.eclipse.core.filesystem;bundle-version="1.2.0",
org.eclipse.ui.navigator;bundle-version="3.3.100",
- org.jboss.tools.jmx.core;bundle-version="0.2.1"
+ org.jboss.tools.jmx.core;bundle-version="0.2.1",
+ org.eclipse.core.variables;bundle-version="3.2.200"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.jboss.ide.eclipse.archives.webtools,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.32
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.32 2009-07-31 20:18:26 UTC (rev 16933)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.32 2009-07-31 21:25:13 UTC (rev 16934)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<filesets>
-<fileset excludes="" folder="server/${config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
+<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
</filesets>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.40
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.40 2009-07-31 20:18:26 UTC (rev 16933)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.40 2009-07-31 21:25:13 UTC (rev 16934)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<filesets>
-<fileset excludes="" folder="server/${config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
+<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
</filesets>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.42
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.42 2009-07-31 20:18:26 UTC (rev 16933)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.42 2009-07-31 21:25:13 UTC (rev 16934)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<filesets>
-<fileset excludes="" folder="server/${config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
+<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
</filesets>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.50
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.50 2009-07-31 20:18:26 UTC (rev 16933)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.50 2009-07-31 21:25:13 UTC (rev 16934)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<filesets>
-<fileset excludes="" folder="server/${config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
+<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
</filesets>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.51
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.51 2009-07-31 20:18:26 UTC (rev 16933)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.51 2009-07-31 21:25:13 UTC (rev 16934)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<filesets>
-<fileset excludes="" folder="server/${config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
+<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
</filesets>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.43
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.43 2009-07-31 20:18:26 UTC (rev 16933)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.43 2009-07-31 21:25:13 UTC (rev 16934)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<filesets>
-<fileset excludes="" folder="server/${config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
+<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
</filesets>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.50
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.50 2009-07-31 20:18:26 UTC (rev 16933)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.50 2009-07-31 21:25:13 UTC (rev 16934)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<filesets>
-<fileset excludes="" folder="server/${config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
+<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
</filesets>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java 2009-07-31 20:18:26 UTC (rev 16933)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java 2009-07-31 21:25:13 UTC (rev 16934)
@@ -10,11 +10,12 @@
******************************************************************************/
package org.jboss.ide.eclipse.archives.webtools.filesets;
+import org.eclipse.core.internal.variables.StringSubstitutionEngine;
+import org.eclipse.core.internal.variables.StringVariableManager;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
public class Fileset implements Cloneable {
@@ -49,17 +50,17 @@
*/
public String getFolder() {
String tmp = folder == null ? "" : folder; //$NON-NLS-1$
-
- // TODO do the string replacement! perhaps use variables plugin
- IJBossServerRuntime ajbsrt = (IJBossServerRuntime) server.getRuntime()
- .loadAdapter(IJBossServerRuntime.class,
- new NullProgressMonitor());
- String config = null;
- if( ajbsrt != null )
- config = ajbsrt.getJBossConfiguration();
- if( config != null )
- tmp = tmp.replace("${config}", config); //$NON-NLS-1$
-
+ tmp = tmp.replace("${jboss_config_dir}", //$NON-NLS-1$
+ "${jboss_config_dir:" + server.getName() + "}"); //$NON-NLS-1$ //$NON-NLS-2$
+ tmp = tmp.replace("${jboss_config}", //$NON-NLS-1$
+ "${jboss_config:" + server.getName() + "}"); //$NON-NLS-1$ //$NON-NLS-2$
+
+ try {
+ StringSubstitutionEngine engine = new StringSubstitutionEngine();
+ tmp = engine.performStringSubstitution(tmp, true,
+ true, StringVariableManager.getDefault());
+ } catch( CoreException ce ) {}
+
IPath p = new Path(tmp);
if( !p.isAbsolute() && server != null ) {
if( server.getRuntime() != null )
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2009-07-31 20:18:26 UTC (rev 16933)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2009-07-31 21:25:13 UTC (rev 16934)
@@ -14,7 +14,8 @@
org.eclipse.jst.j2ee,
org.eclipse.wst.xml.core,
org.apache.ant,
- org.jboss.tools.jmx.core;bundle-version="0.2.1"
+ org.jboss.tools.jmx.core;bundle-version="0.2.1",
+ org.eclipse.core.variables;bundle-version="3.2.200"
Eclipse-LazyStart: true
Export-Package: org.jboss.ide.eclipse.as.core,
org.jboss.ide.eclipse.as.core.extensions.descriptors,
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java 2009-07-31 21:25:13 UTC (rev 16934)
@@ -0,0 +1,54 @@
+package org.jboss.ide.eclipse.as.core.resolvers;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.variables.IDynamicVariable;
+import org.eclipse.core.variables.IDynamicVariableResolver;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerCore;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+
+public class ConfigNameResolver implements IDynamicVariableResolver {
+
+ public String resolveValue(IDynamicVariable variable, String argument)
+ throws CoreException {
+ if( variable.getName().equals("jboss_config")) //$NON-NLS-1$
+ return handleConfig(variable, argument);
+ if( variable.getName().equals("jboss_config_dir")) //$NON-NLS-1$
+ return handleConfigDir(variable, argument);
+ return null;
+ }
+
+ protected String handleConfig(IDynamicVariable variable, String argument) {
+ IServer[] servers = ServerCore.getServers();
+ for( int i = 0; i < servers.length; i++ ) {
+ if( servers[i].getName().equals(argument)) {
+ IJBossServerRuntime ajbsrt = (IJBossServerRuntime) servers[i].getRuntime()
+ .loadAdapter(IJBossServerRuntime.class,
+ new NullProgressMonitor());
+ String config = null;
+ if( ajbsrt != null )
+ config = ajbsrt.getJBossConfiguration();
+ if( config != null )
+ return config;
+ }
+ }
+ return null;
+ }
+ protected String handleConfigDir(IDynamicVariable variable, String argument) {
+ IServer[] servers = ServerCore.getServers();
+ for( int i = 0; i < servers.length; i++ ) {
+ if( servers[i].getName().equals(argument)) {
+ IJBossServerRuntime ajbsrt = (IJBossServerRuntime) servers[i].getRuntime()
+ .loadAdapter(IJBossServerRuntime.class,
+ new NullProgressMonitor());
+ String config = null;
+ if( ajbsrt != null )
+ config = ajbsrt.getConfigLocationFullPath().append(ajbsrt.getJBossConfiguration()).toString();
+ if( config != null )
+ return config;
+ }
+ }
+ return null;
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-07-31 20:18:26 UTC (rev 16933)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-07-31 21:25:13 UTC (rev 16934)
@@ -905,4 +905,19 @@
id="org.jboss.ide.eclipse.as.core.server.internal.launch.serverClasspathProvider">
</classpathProvider>
</extension>
+ <extension
+ point="org.eclipse.core.variables.dynamicVariables">
+ <variable
+ name="jboss_config"
+ description="Returns the configuration name for the server who's name matches the variable"
+ resolver="org.jboss.ide.eclipse.as.core.resolvers.ConfigNameResolver"
+ supportsArgument="true">
+ </variable>
+ <variable
+ name="jboss_config_dir"
+ description="Returns the full path of the configuration folder for the server who's name matches the variable"
+ resolver="org.jboss.ide.eclipse.as.core.resolvers.ConfigNameResolver"
+ supportsArgument="true">
+ </variable>
+ </extension>
</plugin>
15 years, 5 months
JBoss Tools SVN: r16933 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-07-31 16:18:26 -0400 (Fri, 31 Jul 2009)
New Revision: 16933
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
Log:
JBIDE-4660: Update and correct the CA-related JUnit tests after the new-style CA is applied.
JsfJspJbide1641Test Test suite related issue is corrected
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-07-31 15:52:38 UTC (rev 16932)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-07-31 20:18:26 UTC (rev 16933)
@@ -665,12 +665,18 @@
if (xmlDocument == null)
return EMPTY_TAGS;
- // Get Fixed Structured Document Region
- IStructuredDocumentRegion sdFixedRegion = this.getStructuredDocumentRegion(getOffset());
- if (sdFixedRegion == null)
- return EMPTY_TAGS;
- Node n = findNodeForOffset(xmlDocument, sdFixedRegion.getStartOffset());
+ Node n = null;
+ if (includeThisTag) {
+ n = findNodeForOffset(xmlDocument, getOffset());
+ } else {
+ // Get Fixed Structured Document Region
+ IStructuredDocumentRegion sdFixedRegion = this.getStructuredDocumentRegion(getOffset());
+ if (sdFixedRegion == null)
+ return null;
+
+ n = findNodeForOffset(xmlDocument, sdFixedRegion.getStartOffset());
+ }
if (n == null)
return EMPTY_TAGS;
15 years, 5 months
JBoss Tools SVN: r16932 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-31 11:52:38 -0400 (Fri, 31 Jul 2009)
New Revision: 16932
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4683
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2009-07-31 15:32:37 UTC (rev 16931)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2009-07-31 15:52:38 UTC (rev 16932)
@@ -801,7 +801,7 @@
IComponent c = findComponent(query);
if(c == null) return null;
String prefix = getPrefix(query);
- if(prefix == null) return c.getName();
+ if(prefix == null || prefix.length() == 0) return c.getName();
return prefix + ":" + c.getName(); //$NON-NLS-1$
}
@@ -816,7 +816,7 @@
KbQuery createQuery(TagProposal proposal) {
KbQuery kbQuery = new KbQuery();
- String name = proposal.getPrefix() + ":" + proposal.getName(); //$NON-NLS-1$
+ String name = proposal.getPrefix().length() == 0 ? proposal.getName() : proposal.getPrefix() + ":" + proposal.getName(); //$NON-NLS-1$
kbQuery.setPrefix(proposal.getPrefix());
kbQuery.setUri(proposal.getUri());
kbQuery.setParentTags(new String[]{name});
15 years, 5 months
JBoss Tools SVN: r16931 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb: taglibs and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-31 11:32:37 -0400 (Fri, 31 Jul 2009)
New Revision: 16931
Added:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/StrutsHtml.xml
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
Log:
JBIDE-1826
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2009-07-31 15:24:28 UTC (rev 16930)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2009-07-31 15:32:37 UTC (rev 16931)
@@ -61,6 +61,10 @@
location="taglibs/Jsp.xml"
name="JSP"
uri="http://java.sun.com/JSP/Page"/>
+ <tag-lib
+ name="Struts HTML"
+ location="taglibs/StrutsHtml.xml"
+ uri="http://struts.apache.org/tags-html"/>
<component-extension
location="taglibs/componentExtension.xml"/>
</extension>
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/StrutsHtml.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/StrutsHtml.xml (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/StrutsHtml.xml 2009-07-31 15:32:37 UTC (rev 16931)
@@ -0,0 +1,698 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE tag-lib PUBLIC "-//Red Hat, Inc//DTD Knowledge Base 2.0//EN" "http://anonsvn.jboss.org/repos/jbosstools/trunk/jst/plugins/org.jboss.too...">
+<tag-lib defaultPrefix="html">
+ <component closeTag="true" name="base">
+ <attribute name="target" required="false"/>
+ <attribute name="server" required="false"/>
+ </component>
+ <component name="button">
+ <attribute name="accesskey" required="false"/>
+ <attribute name="alt" required="false"/>
+ <attribute name="altKey" required="false"/>
+ <attribute name="disabled" required="false"/>
+ <attribute name="indexed" required="false"/>
+ <attribute name="onblur" required="false"/>
+ <attribute name="onchange" required="false"/>
+ <attribute name="onclick" required="false"/>
+ <attribute name="ondblclick" required="false"/>
+ <attribute name="onfocus" required="false"/>
+ <attribute name="onkeydown" required="false"/>
+ <attribute name="onkeypress" required="false"/>
+ <attribute name="onkeyup" required="false"/>
+ <attribute name="onmousedown" required="false"/>
+ <attribute name="onmousemove" required="false"/>
+ <attribute name="onmouseout" required="false"/>
+ <attribute name="onmouseover" required="false"/>
+ <attribute name="onmouseup" required="false"/>
+ <attribute name="property" required="true"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="tabindex" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="value" required="false"/>
+ </component>
+ <component name="cancel">
+ <attribute name="accesskey" required="false"/>
+ <attribute name="alt" required="false"/>
+ <attribute name="altKey" required="false"/>
+ <attribute name="bundle" required="false"/>
+ <attribute name="disabled" required="false"/>
+ <attribute name="onblur" required="false"/>
+ <attribute name="onchange" required="false"/>
+ <attribute name="onclick" required="false"/>
+ <attribute name="ondblclick" required="false"/>
+ <attribute name="onfocus" required="false"/>
+ <attribute name="onkeydown" required="false"/>
+ <attribute name="onkeypress" required="false"/>
+ <attribute name="onkeyup" required="false"/>
+ <attribute name="onmousedown" required="false"/>
+ <attribute name="onmousemove" required="false"/>
+ <attribute name="onmouseout" required="false"/>
+ <attribute name="onmouseover" required="false"/>
+ <attribute name="onmouseup" required="false"/>
+ <attribute name="property" required="false"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="tabindex" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="value" required="false"/>
+ </component>
+ <component name="checkbox">
+ <attribute name="accesskey" required="false"/>
+ <attribute name="alt" required="false"/>
+ <attribute name="altKey" required="false"/>
+ <attribute name="bundle" required="false"/>
+ <attribute name="disabled" required="false"/>
+ <attribute name="indexed" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="onblur" required="false"/>
+ <attribute name="onchange" required="false"/>
+ <attribute name="onclick" required="false"/>
+ <attribute name="ondblclick" required="false"/>
+ <attribute name="onfocus" required="false"/>
+ <attribute name="onkeydown" required="false"/>
+ <attribute name="onkeypress" required="false"/>
+ <attribute name="onkeyup" required="false"/>
+ <attribute name="onmousedown" required="false"/>
+ <attribute name="onmousemove" required="false"/>
+ <attribute name="onmouseout" required="false"/>
+ <attribute name="onmouseover" required="false"/>
+ <attribute name="onmouseup" required="false"/>
+ <attribute name="property" required="true"/>
+ <attribute name="style" required="false"/>
+ <attribute name="errorKey" required="false"/>
+ <attribute name="errorStyle" required="false"/>
+ <attribute name="errorStyleClass" required="false"/>
+ <attribute name="errorStyleId" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="tabindex" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="value" required="false"/>
+ </component>
+ <component closeTag="true" name="errors">
+ <attribute name="bundle" required="false"/>
+ <attribute name="locale" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="property" required="false"/>
+ <attribute name="footer" required="false"/>
+ <attribute name="header" required="false"/>
+ <attribute name="prefix" required="false"/>
+ <attribute name="suffix" required="false"/>
+ </component>
+ <component name="file">
+ <attribute name="accesskey" required="false"/>
+ <attribute name="accept" required="false"/>
+ <attribute name="alt" required="false"/>
+ <attribute name="altKey" required="false"/>
+ <attribute name="bundle" required="false"/>
+ <attribute name="disabled" required="false"/>
+ <attribute name="indexed" required="false"/>
+ <attribute name="maxlength" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="onblur" required="false"/>
+ <attribute name="onchange" required="false"/>
+ <attribute name="onclick" required="false"/>
+ <attribute name="ondblclick" required="false"/>
+ <attribute name="onfocus" required="false"/>
+ <attribute name="onkeydown" required="false"/>
+ <attribute name="onkeypress" required="false"/>
+ <attribute name="onkeyup" required="false"/>
+ <attribute name="onmousedown" required="false"/>
+ <attribute name="onmousemove" required="false"/>
+ <attribute name="onmouseout" required="false"/>
+ <attribute name="onmouseover" required="false"/>
+ <attribute name="onmouseup" required="false"/>
+ <attribute name="property" required="true"/>
+ <attribute name="size" required="false"/>
+ <attribute name="style" required="false"/>
+ <attribute name="errorKey" required="false"/>
+ <attribute name="errorStyle" required="false"/>
+ <attribute name="errorStyleClass" required="false"/>
+ <attribute name="errorStyleId" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="tabindex" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="value" required="false"/>
+ </component>
+ <component name="form">
+ <attribute name="action" required="true"/>
+ <attribute name="acceptCharset" required="false"/>
+ <attribute name="enctype" required="false"/>
+ <attribute name="focus" required="false"/>
+ <attribute name="focusIndex" required="false"/>
+ <attribute name="method" required="false"/>
+ <attribute name="onreset" required="false"/>
+ <attribute name="onsubmit" required="false"/>
+ <attribute name="scriptLanguage" required="false"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="target" required="false"/>
+ <attribute name="disabled" required="false"/>
+ <attribute name="readonly" required="false"/>
+ </component>
+ <component name="frame">
+ <attribute name="action" required="false"/>
+ <attribute name="module" required="false"/>
+ <attribute name="anchor" required="false"/>
+ <attribute name="bundle" required="false"/>
+ <attribute name="forward" required="false"/>
+ <attribute name="frameborder" required="false"/>
+ <attribute name="frameName" required="false"/>
+ <attribute name="href" required="false"/>
+ <attribute name="longdesc" required="false"/>
+ <attribute name="marginheight" required="false"/>
+ <attribute name="marginwidth" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="noresize" required="false"/>
+ <attribute name="page" required="false"/>
+ <attribute name="paramId" required="false"/>
+ <attribute name="paramName" required="false"/>
+ <attribute name="paramProperty" required="false"/>
+ <attribute name="paramScope" required="false"/>
+ <attribute name="property" required="false"/>
+ <attribute name="scope" required="false"/>
+ <attribute name="scrolling" required="false"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="transaction" required="false"/>
+ </component>
+ <component closeTag="true" name="hidden">
+ <attribute name="accesskey" required="false"/>
+ <attribute name="alt" required="false"/>
+ <attribute name="altKey" required="false"/>
+ <attribute name="bundle" required="false"/>
+ <attribute name="disabled" required="false"/>
+ <attribute name="indexed" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="onblur" required="false"/>
+ <attribute name="onchange" required="false"/>
+ <attribute name="onclick" required="false"/>
+ <attribute name="ondblclick" required="false"/>
+ <attribute name="onfocus" required="false"/>
+ <attribute name="onkeydown" required="false"/>
+ <attribute name="onkeypress" required="false"/>
+ <attribute name="onkeyup" required="false"/>
+ <attribute name="onmousedown" required="false"/>
+ <attribute name="onmousemove" required="false"/>
+ <attribute name="onmouseout" required="false"/>
+ <attribute name="onmouseover" required="false"/>
+ <attribute name="onmouseup" required="false"/>
+ <attribute name="property" required="true"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="value" required="false"/>
+ <attribute name="write" required="false"/>
+ </component>
+ <component name="html">
+ <attribute name="lang" required="false"/>
+ <attribute name="locale" required="false"/>
+ <attribute name="xhtml" required="false"/>
+ </component>
+ <component name="image">
+ <attribute name="accesskey" required="false"/>
+ <attribute name="align" required="false"/>
+ <attribute name="alt" required="false"/>
+ <attribute name="altKey" required="false"/>
+ <attribute name="border" required="false"/>
+ <attribute name="bundle" required="false"/>
+ <attribute name="disabled" required="false"/>
+ <attribute name="indexed" required="false"/>
+ <attribute name="locale" required="false"/>
+ <attribute name="onblur" required="false"/>
+ <attribute name="onchange" required="false"/>
+ <attribute name="onclick" required="false"/>
+ <attribute name="ondblclick" required="false"/>
+ <attribute name="onfocus" required="false"/>
+ <attribute name="onkeydown" required="false"/>
+ <attribute name="onkeypress" required="false"/>
+ <attribute name="onkeyup" required="false"/>
+ <attribute name="onmousedown" required="false"/>
+ <attribute name="onmousemove" required="false"/>
+ <attribute name="onmouseout" required="false"/>
+ <attribute name="onmouseover" required="false"/>
+ <attribute name="onmouseup" required="false"/>
+ <attribute name="page" required="false"/>
+ <attribute name="pageKey" required="false"/>
+ <attribute name="property" required="false"/>
+ <attribute name="src" required="false">
+ <proposal type="file">
+ <param name="extensions" value="%image%"/>
+ </proposal>
+ </attribute>
+ <attribute name="srcKey" required="false"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="tabindex" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="value" required="false"/>
+ </component>
+ <component closeTag="true" name="img" extended="false">
+ <attribute name="align" required="false"/>
+ <attribute name="alt" required="false"/>
+ <attribute name="altKey" required="false"/>
+ <attribute name="border" required="false"/>
+ <attribute name="bundle" required="false"/>
+ <attribute name="contextRelative" required="false"/>
+ <attribute name="height" required="false"/>
+ <attribute name="hspace" required="false"/>
+ <attribute name="imageName" required="false"/>
+ <attribute name="ismap" required="false"/>
+ <attribute name="locale" required="false"/>
+ <attribute name="lowsrc" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="onclick" required="false"/>
+ <attribute name="ondblclick" required="false"/>
+ <attribute name="onkeydown" required="false"/>
+ <attribute name="onkeypress" required="false"/>
+ <attribute name="onkeyup" required="false"/>
+ <attribute name="onmousedown" required="false"/>
+ <attribute name="onmousemove" required="false"/>
+ <attribute name="onmouseout" required="false"/>
+ <attribute name="onmouseover" required="false"/>
+ <attribute name="onmouseup" required="false"/>
+ <attribute name="paramId" required="false"/>
+ <attribute name="page" required="false"/>
+ <attribute name="pageKey" required="false"/>
+ <attribute name="action" required="false"/>
+ <attribute name="module" required="false"/>
+ <attribute name="paramName" required="false"/>
+ <attribute name="paramProperty" required="false"/>
+ <attribute name="paramScope" required="false"/>
+ <attribute name="property" required="false"/>
+ <attribute name="scope" required="false"/>
+ <attribute name="src" required="false">
+ <proposal type="file">
+ <param name="extensions" value="%image%"/>
+ </proposal>
+ </attribute>
+ <attribute name="srcKey" required="false"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="useLocalEncoding" required="false"/>
+ <attribute name="usemap" required="false"/>
+ <attribute name="vspace" required="false"/>
+ <attribute name="width" required="false"/>
+ </component>
+ <component closeTag="true" name="javascript">
+ <attribute name="bundle" required="false"/>
+ <attribute name="cdata" required="false"/>
+ <attribute name="dynamicJavascript" required="false"/>
+ <attribute name="formName" required="false"/>
+ <attribute name="method" required="false"/>
+ <attribute name="page" required="false"/>
+ <attribute name="scriptLanguage" required="false"/>
+ <attribute name="src" required="false"/>
+ <attribute name="staticJavascript" required="false"/>
+ <attribute name="htmlComment" required="false"/>
+ </component>
+ <component name="link">
+ <attribute name="bundle" required="false"/>
+ <attribute name="accesskey" required="false"/>
+ <attribute name="action" required="false"/>
+ <attribute name="module" required="false"/>
+ <attribute name="anchor" required="false"/>
+ <attribute name="forward" required="false"/>
+ <attribute name="href" required="false"/>
+ <attribute name="indexed" required="false"/>
+ <attribute name="indexId" required="false"/>
+ <attribute name="linkName" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="onblur" required="false"/>
+ <attribute name="onclick" required="false"/>
+ <attribute name="ondblclick" required="false"/>
+ <attribute name="onfocus" required="false"/>
+ <attribute name="onkeydown" required="false"/>
+ <attribute name="onkeypress" required="false"/>
+ <attribute name="onkeyup" required="false"/>
+ <attribute name="onmousedown" required="false"/>
+ <attribute name="onmousemove" required="false"/>
+ <attribute name="onmouseout" required="false"/>
+ <attribute name="onmouseover" required="false"/>
+ <attribute name="onmouseup" required="false"/>
+ <attribute name="page" required="false"/>
+ <attribute name="paramId" required="false"/>
+ <attribute name="paramName" required="false"/>
+ <attribute name="paramProperty" required="false"/>
+ <attribute name="paramScope" required="false"/>
+ <attribute name="property" required="false"/>
+ <attribute name="scope" required="false"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="tabindex" required="false"/>
+ <attribute name="target" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="transaction" required="false"/>
+ <attribute name="useLocalEncoding" required="false"/>
+ </component>
+ <component name="messages">
+ <attribute name="id" required="true"/>
+ <attribute name="bundle" required="false"/>
+ <attribute name="locale" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="property" required="false"/>
+ <attribute name="header" required="false"/>
+ <attribute name="footer" required="false"/>
+ <attribute name="message" required="false"/>
+ </component>
+ <component name="multibox">
+ <attribute name="accesskey" required="false"/>
+ <attribute name="alt" required="false"/>
+ <attribute name="altKey" required="false"/>
+ <attribute name="bundle" required="false"/>
+ <attribute name="disabled" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="onblur" required="false"/>
+ <attribute name="onchange" required="false"/>
+ <attribute name="onclick" required="false"/>
+ <attribute name="ondblclick" required="false"/>
+ <attribute name="onfocus" required="false"/>
+ <attribute name="onkeydown" required="false"/>
+ <attribute name="onkeypress" required="false"/>
+ <attribute name="onkeyup" required="false"/>
+ <attribute name="onmousedown" required="false"/>
+ <attribute name="onmousemove" required="false"/>
+ <attribute name="onmouseout" required="false"/>
+ <attribute name="onmouseover" required="false"/>
+ <attribute name="onmouseup" required="false"/>
+ <attribute name="property" required="true"/>
+ <attribute name="style" required="false"/>
+ <attribute name="errorKey" required="false"/>
+ <attribute name="errorStyle" required="false"/>
+ <attribute name="errorStyleClass" required="false"/>
+ <attribute name="errorStyleId" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="tabindex" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="value" required="false"/>
+ </component>
+ <component name="option">
+ <attribute name="bundle" required="false"/>
+ <attribute name="disabled" required="false"/>
+ <attribute name="key" required="false"/>
+ <attribute name="locale" required="false"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="value" required="true"/>
+ </component>
+ <component closeTag="true" name="options">
+ <attribute name="collection" required="false"/>
+ <attribute name="filter" required="false"/>
+ <attribute name="labelName" required="false"/>
+ <attribute name="labelProperty" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="property" required="false"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ </component>
+ <component closeTag="true" name="optionsCollection">
+ <attribute name="filter" required="false"/>
+ <attribute name="label" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="property" required="false"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="value" required="false"/>
+ </component>
+ <component name="password">
+ <attribute name="accesskey" required="false"/>
+ <attribute name="alt" required="false"/>
+ <attribute name="altKey" required="false"/>
+ <attribute name="bundle" required="false"/>
+ <attribute name="disabled" required="false"/>
+ <attribute name="indexed" required="false"/>
+ <attribute name="maxlength" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="onblur" required="false"/>
+ <attribute name="onchange" required="false"/>
+ <attribute name="onclick" required="false"/>
+ <attribute name="ondblclick" required="false"/>
+ <attribute name="onfocus" required="false"/>
+ <attribute name="onkeydown" required="false"/>
+ <attribute name="onkeypress" required="false"/>
+ <attribute name="onkeyup" required="false"/>
+ <attribute name="onmousedown" required="false"/>
+ <attribute name="onmousemove" required="false"/>
+ <attribute name="onmouseout" required="false"/>
+ <attribute name="onmouseover" required="false"/>
+ <attribute name="onmouseup" required="false"/>
+ <attribute name="property" required="true"/>
+ <attribute name="readonly" required="false"/>
+ <attribute name="redisplay" required="false"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="errorKey" required="false"/>
+ <attribute name="errorStyle" required="false"/>
+ <attribute name="errorStyleClass" required="false"/>
+ <attribute name="errorStyleId" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="size" required="false"/>
+ <attribute name="tabindex" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="value" required="false"/>
+ </component>
+ <component name="radio">
+ <attribute name="accesskey" required="false"/>
+ <attribute name="alt" required="false"/>
+ <attribute name="altKey" required="false"/>
+ <attribute name="bundle" required="false"/>
+ <attribute name="disabled" required="false"/>
+ <attribute name="indexed" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="onblur" required="false"/>
+ <attribute name="onchange" required="false"/>
+ <attribute name="onclick" required="false"/>
+ <attribute name="ondblclick" required="false"/>
+ <attribute name="onfocus" required="false"/>
+ <attribute name="onkeydown" required="false"/>
+ <attribute name="onkeypress" required="false"/>
+ <attribute name="onkeyup" required="false"/>
+ <attribute name="property" required="true"/>
+ <attribute name="onmousedown" required="false"/>
+ <attribute name="onmousemove" required="false"/>
+ <attribute name="onmouseout" required="false"/>
+ <attribute name="onmouseover" required="false"/>
+ <attribute name="onmouseup" required="false"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="errorKey" required="false"/>
+ <attribute name="errorStyle" required="false"/>
+ <attribute name="errorStyleClass" required="false"/>
+ <attribute name="errorStyleId" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="tabindex" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="value" required="true"/>
+ <attribute name="idName" required="false"/>
+ </component>
+ <component name="reset">
+ <attribute name="accesskey" required="false"/>
+ <attribute name="alt" required="false"/>
+ <attribute name="altKey" required="false"/>
+ <attribute name="bundle" required="false"/>
+ <attribute name="disabled" required="false"/>
+ <attribute name="onblur" required="false"/>
+ <attribute name="onchange" required="false"/>
+ <attribute name="onclick" required="false"/>
+ <attribute name="ondblclick" required="false"/>
+ <attribute name="onfocus" required="false"/>
+ <attribute name="onkeydown" required="false"/>
+ <attribute name="onkeypress" required="false"/>
+ <attribute name="onkeyup" required="false"/>
+ <attribute name="onmousedown" required="false"/>
+ <attribute name="onmousemove" required="false"/>
+ <attribute name="onmouseout" required="false"/>
+ <attribute name="onmouseover" required="false"/>
+ <attribute name="onmouseup" required="false"/>
+ <attribute name="property" required="false"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="tabindex" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="value" required="false"/>
+ </component>
+ <component closeTag="true" name="rewrite">
+ <attribute name="action" required="false"/>
+ <attribute name="module" required="false"/>
+ <attribute name="anchor" required="false"/>
+ <attribute name="forward" required="false"/>
+ <attribute name="href" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="page" required="false"/>
+ <attribute name="paramId" required="false"/>
+ <attribute name="paramName" required="false"/>
+ <attribute name="paramProperty" required="false"/>
+ <attribute name="paramScope" required="false"/>
+ <attribute name="property" required="false"/>
+ <attribute name="scope" required="false"/>
+ <attribute name="transaction" required="false"/>
+ <attribute name="useLocalEncoding" required="false"/>
+ </component>
+ <component name="select">
+ <attribute name="alt" required="false"/>
+ <attribute name="altKey" required="false"/>
+ <attribute name="bundle" required="false"/>
+ <attribute name="disabled" required="false"/>
+ <attribute name="indexed" required="false"/>
+ <attribute name="multiple" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="onblur" required="false"/>
+ <attribute name="onchange" required="false"/>
+ <attribute name="onclick" required="false"/>
+ <attribute name="ondblclick" required="false"/>
+ <attribute name="onfocus" required="false"/>
+ <attribute name="onkeydown" required="false"/>
+ <attribute name="onkeypress" required="false"/>
+ <attribute name="onkeyup" required="false"/>
+ <attribute name="onmousedown" required="false"/>
+ <attribute name="onmousemove" required="false"/>
+ <attribute name="onmouseout" required="false"/>
+ <attribute name="onmouseover" required="false"/>
+ <attribute name="onmouseup" required="false"/>
+ <attribute name="property" required="true"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="errorKey" required="false"/>
+ <attribute name="errorStyle" required="false"/>
+ <attribute name="errorStyleClass" required="false"/>
+ <attribute name="errorStyleId" required="false"/>
+ <attribute name="tabindex" required="false"/>
+ <attribute name="size" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="value" required="false"/>
+ </component>
+ <component name="submit">
+ <attribute name="accesskey" required="false"/>
+ <attribute name="alt" required="false"/>
+ <attribute name="altKey" required="false"/>
+ <attribute name="bundle" required="false"/>
+ <attribute name="disabled" required="false"/>
+ <attribute name="indexed" required="false"/>
+ <attribute name="onblur" required="false"/>
+ <attribute name="onchange" required="false"/>
+ <attribute name="onclick" required="false"/>
+ <attribute name="ondblclick" required="false"/>
+ <attribute name="onfocus" required="false"/>
+ <attribute name="onkeydown" required="false"/>
+ <attribute name="onkeypress" required="false"/>
+ <attribute name="onkeyup" required="false"/>
+ <attribute name="onmousedown" required="false"/>
+ <attribute name="onmousemove" required="false"/>
+ <attribute name="onmouseout" required="false"/>
+ <attribute name="onmouseover" required="false"/>
+ <attribute name="onmouseup" required="false"/>
+ <attribute name="property" required="false"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="tabindex" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="value" required="false"/>
+ </component>
+ <component name="text">
+ <attribute name="accesskey" required="false"/>
+ <attribute name="alt" required="false"/>
+ <attribute name="altKey" required="false"/>
+ <attribute name="bundle" required="false"/>
+ <attribute name="disabled" required="false"/>
+ <attribute name="indexed" required="false"/>
+ <attribute name="maxlength" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="onblur" required="false"/>
+ <attribute name="onchange" required="false"/>
+ <attribute name="onclick" required="false"/>
+ <attribute name="ondblclick" required="false"/>
+ <attribute name="onfocus" required="false"/>
+ <attribute name="onkeydown" required="false"/>
+ <attribute name="onkeypress" required="false"/>
+ <attribute name="onkeyup" required="false"/>
+ <attribute name="onmousedown" required="false"/>
+ <attribute name="onmousemove" required="false"/>
+ <attribute name="onmouseout" required="false"/>
+ <attribute name="onmouseover" required="false"/>
+ <attribute name="onmouseup" required="false"/>
+ <attribute name="property" required="true"/>
+ <attribute name="readonly" required="false"/>
+ <attribute name="size" required="false"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="errorKey" required="false"/>
+ <attribute name="errorStyle" required="false"/>
+ <attribute name="errorStyleClass" required="false"/>
+ <attribute name="errorStyleId" required="false"/>
+ <attribute name="tabindex" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="value" required="false"/>
+ </component>
+ <component name="textarea">
+ <attribute name="accesskey" required="false"/>
+ <attribute name="alt" required="false"/>
+ <attribute name="altKey" required="false"/>
+ <attribute name="bundle" required="false"/>
+ <attribute name="cols" required="false"/>
+ <attribute name="disabled" required="false"/>
+ <attribute name="indexed" required="false"/>
+ <attribute name="name" required="false"/>
+ <attribute name="onblur" required="false"/>
+ <attribute name="onchange" required="false"/>
+ <attribute name="onclick" required="false"/>
+ <attribute name="ondblclick" required="false"/>
+ <attribute name="onfocus" required="false"/>
+ <attribute name="onkeydown" required="false"/>
+ <attribute name="onkeypress" required="false"/>
+ <attribute name="onkeyup" required="false"/>
+ <attribute name="onmousedown" required="false"/>
+ <attribute name="onmousemove" required="false"/>
+ <attribute name="onmouseout" required="false"/>
+ <attribute name="onmouseover" required="false"/>
+ <attribute name="onmouseup" required="false"/>
+ <attribute name="property" required="true"/>
+ <attribute name="readonly" required="false"/>
+ <attribute name="rows" required="false"/>
+ <attribute name="style" required="false"/>
+ <attribute name="styleClass" required="false"/>
+ <attribute name="styleId" required="false"/>
+ <attribute name="errorKey" required="false"/>
+ <attribute name="errorStyle" required="false"/>
+ <attribute name="errorStyleClass" required="false"/>
+ <attribute name="errorStyleId" required="false"/>
+ <attribute name="tabindex" required="false"/>
+ <attribute name="title" required="false"/>
+ <attribute name="titleKey" required="false"/>
+ <attribute name="value" required="false"/>
+ </component>
+ <component closeTag="true" name="xhtml"/>
+</tag-lib>
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/StrutsHtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 5 months
JBoss Tools SVN: r16930 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-31 11:24:28 -0400 (Fri, 31 Jul 2009)
New Revision: 16930
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4684
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 2009-07-31 13:06:17 UTC (rev 16929)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java 2009-07-31 15:24:28 UTC (rev 16930)
@@ -17,14 +17,24 @@
import java.util.List;
import java.util.Map;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
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.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
+import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.jsf.JSFModelPlugin;
+import org.jboss.tools.jsf.model.FacesProcessImpl;
import org.jboss.tools.jsf.model.JSFConstants;
import org.jboss.tools.jst.web.context.IImportWebProjectContext;
import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
@@ -248,12 +258,52 @@
XModelObject facesConfig = model.getByPath("/faces-config.xml");
if (facesConfig == null) {
XModelObject webinf = FileSystemsHelper.getWebInf(model);
- if (webinf != null) {
+ boolean isJSF2 = isJSF2a();
+ if(!isJSF2) try {
+ isJSF2 = isJSF2();
+ } catch (CoreException e) {
+ JSFModelPlugin.getPluginLog().logError(e);
+ }
+ if (webinf != null && !isJSF2) {
facesConfig = XModelObjectLoaderUtil.createValidObject(model, JSFConstants.ENT_FACESCONFIG_12);
DefaultCreateHandler.addCreatedObject(webinf, facesConfig, -1);
+ FacesProcessImpl process = (FacesProcessImpl)facesConfig.getChildByPath(JSFConstants.ELM_PROCESS);
+ if(process != null) process.firePrepared();
}
}
}
+ boolean isJSF2() throws CoreException {
+ IProject project = EclipseResourceUtil.getProject(model.getRoot());
+ IProjectFacet facet = ProjectFacetsManager.getProjectFacet("jst.jsf");
+ IFacetedProject fp = ProjectFacetsManager.create(project);
+ if(fp == null) return false;
+ IProjectFacetVersion v = fp.getProjectFacetVersion(facet);
+ if(v == null) return false;
+ String vs = v.getVersionString();
+ if(vs.startsWith("2.")) return true;
+ return false;
+ }
+
+ boolean isJSF2a() {
+ XModelObject fs = model.getByPath("FileSystems/lib-jsf-api.jar");
+ if(fs == null) return false;
+ XModelObject m = fs.getChildByPath("META-INF/MANIFEST.MF");
+ if(!(m instanceof FileAnyImpl)) return false;
+ String content = ((FileAnyImpl)m).getAsText();
+ String attr = "Implementation-Version";
+ int i = content.indexOf(attr);
+ if(i < 0) return false;
+ i += attr.length();
+ for (int j = i; j < content.length(); j++) {
+ char ch = content.charAt(j);
+ if(!Character.isDigit(ch)) {
+ continue;
+ }
+ return ch > '1';
+ }
+ return false;
+ }
+
}
15 years, 5 months