JBoss Tools SVN: r31151 - in trunk: jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-09 15:36:00 -0400 (Mon, 09 May 2011)
New Revision: 31151
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java
Log:
Rolled back the fixes for WTP M7. To have AS and JSF compilable against M7.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2011-05-09 19:04:21 UTC (rev 31150)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2011-05-09 19:36:00 UTC (rev 31151)
@@ -127,7 +127,7 @@
IServer server = (IServer) data;
ServerUIPlugin.editServer(server);
} catch (Exception e) {
- Trace.trace(Trace.STRING_SEVERE, org.jboss.ide.eclipse.as.ui.Messages.ServerActionProvider_CouldNotOpenServerError, e);
+ Trace.trace(Trace.SEVERE, org.jboss.ide.eclipse.as.ui.Messages.ServerActionProvider_CouldNotOpenServerError, e);
}
}
});
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java 2011-05-09 19:04:21 UTC (rev 31150)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java 2011-05-09 19:36:00 UTC (rev 31151)
@@ -349,7 +349,7 @@
}
}
} catch (Exception e) {
- Trace.trace(Trace.STRING_FINEST, Messages.ServerContentProvider_ErrorInServersViewAnimation, e);
+ Trace.trace(Trace.FINEST, Messages.ServerContentProvider_ErrorInServersViewAnimation, e);
}
display.timerExec(SLEEP, animator[0]);
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java 2011-05-09 19:04:21 UTC (rev 31150)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java 2011-05-09 19:36:00 UTC (rev 31151)
@@ -19,6 +19,7 @@
import java.io.StringReader;
import java.util.ArrayList;
+import org.apache.xerces.xni.parser.XMLEntityResolver;
import org.eclipse.core.resources.IResource;
import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
import org.eclipse.wst.validation.ValidationResult;
@@ -30,11 +31,10 @@
import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
import org.eclipse.wst.xml.core.internal.validation.eclipse.ErrorCustomizationPluginRegistryReader;
import org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;
+import org.jboss.tools.common.xml.XMLEntityResolverImpl;
import org.jboss.tools.jsf.JSFModelPlugin;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
import org.xml.sax.ext.LexicalHandler;
@@ -224,7 +224,7 @@
this.entityResolver = entityResolver;
}
- protected XMLReader createXMLReader(String uri) throws SAXNotRecognizedException, SAXNotSupportedException
+ protected XMLReader createXMLReader(String uri) throws Exception
{
XMLReader reader = super.createXMLReader(uri);
13 years, 5 months
JBoss Tools SVN: r31150 - in trunk/download.jboss.org/jbosstools/updates: requirements/birt and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-09 15:04:21 -0400 (Mon, 09 May 2011)
New Revision: 31150
Modified:
trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/requirements/birt/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/birt/index.html
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/index.html
trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/emf/index.html
trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/indigo/index.html
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/index.html
Log:
update builders from M6 -> M7
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-05-09 19:03:48 UTC (rev 31149)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-05-09 19:04:21 UTC (rev 31150)
@@ -12,9 +12,15 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1303858018000'/>
+<property name='p2.timestamp' value='1304967283000'/>
</properties>
-<children size='20'>
+<children size='24'>
+<child location='../requirements/indigo/201105060900-M7/'/>
+<child location='../requirements/birt/4.0M7/'/>
+<child location='../requirements/eclipse/3.7M7/'/>
+<child location='../requirements/emf/2.7M7/'/>
+<child location='../requirements/webtools/3.3M7/'/>
+
<child location='../requirements/indigo/201103180900-M6/'/>
<child location='../requirements/birt/4.0M6/'/>
<child location='../requirements/eclipse/3.7M6/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-05-09 19:03:48 UTC (rev 31149)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-05-09 19:04:21 UTC (rev 31150)
@@ -12,9 +12,15 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1303858023000'/>
+<property name='p2.timestamp' value='1304967283000'/>
</properties>
-<children size='19'>
+<children size='24'>
+<child location='../requirements/indigo/201105060900-M7/'/>
+<child location='../requirements/birt/4.0M7/'/>
+<child location='../requirements/eclipse/3.7M7/'/>
+<child location='../requirements/emf/2.7M7/'/>
+<child location='../requirements/webtools/3.3M7/'/>
+
<child location='../requirements/indigo/201103180900-M6/'/>
<child location='../requirements/birt/4.0M6/'/>
<child location='../requirements/eclipse/3.7M6/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/birt/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/birt/build.xml 2011-05-09 19:03:48 UTC (rev 31149)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/birt/build.xml 2011-05-09 19:04:21 UTC (rev 31150)
@@ -28,7 +28,7 @@
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/4.0M6/" name="Extra BIRT plugins for Eclipse 3.7 (Not in Indigo)" />
+ <repository location="file:${destination}/4.0M7/" name="Extra BIRT plugins for Eclipse 3.7 (Not in Indigo)" />
<source>
<repository location="${URL}" />
</source>
@@ -43,6 +43,6 @@
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/4.0M6/" artifactRepository="file:${destination}/4.0M6/" publishartifacts="true" source="${destination}/4.0M6/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/4.0M7/" artifactRepository="file:${destination}/4.0M7/" publishartifacts="true" source="${destination}/4.0M7/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/birt/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/birt/index.html 2011-05-09 19:03:48 UTC (rev 31149)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/birt/index.html 2011-05-09 19:04:21 UTC (rev 31150)
@@ -46,8 +46,8 @@
-->
<br/>
<ul>
+<li><a class=link href=4.0M7>4.0M7</a> (Indigo) </li>
<li><a class=link href=4.0M6>4.0M6</a> (Indigo) </li>
-<li><a class=link href=4.0M5>4.0M5</a> (Indigo) </li>
<li><a class=link href=2.6.2>2.6.2</a> (Helios) </li>
</ul>
<br/>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2011-05-09 19:03:48 UTC (rev 31149)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2011-05-09 19:04:21 UTC (rev 31150)
@@ -22,7 +22,7 @@
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/3.7M6/" name="Eclipse 3.7" />
+ <repository location="file:${destination}/3.7M7/" name="Eclipse 3.7" />
<source>
<repository location="${URL}" />
</source>
@@ -30,6 +30,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7M6/" artifactRepository="file:${destination}/3.7M6/" publishartifacts="true" source="${destination}/3.7M6/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7M7/" artifactRepository="file:${destination}/3.7M7/" publishartifacts="true" source="${destination}/3.7M7/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/index.html 2011-05-09 19:03:48 UTC (rev 31149)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/index.html 2011-05-09 19:04:21 UTC (rev 31150)
@@ -46,8 +46,8 @@
-->
<br/>
<ul>
+<li><a class=link href=3.7M7>3.7M7</a> </li>
<li><a class=link href=3.7M6>3.7M6</a> </li>
-<li><a class=link href=3.7M5>3.7M5</a> </li>
<li><a class=link href=3.6.2>3.6.2</a> </li>
</ul>
<br/>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml 2011-05-09 19:03:48 UTC (rev 31149)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml 2011-05-09 19:04:21 UTC (rev 31150)
@@ -22,7 +22,7 @@
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/2.7M6/" name="EMF plugins for Eclipse 3.7" />
+ <repository location="file:${destination}/2.7M7/" name="EMF plugins for Eclipse 3.7" />
<source>
<repository location="${URL}" />
</source>
@@ -30,6 +30,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.7M6/" artifactRepository="file:${destination}/2.7M6/" publishartifacts="true" source="${destination}/2.7M6/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.7M7/" artifactRepository="file:${destination}/2.7M7/" publishartifacts="true" source="${destination}/2.7M7/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/emf/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/emf/index.html 2011-05-09 19:03:48 UTC (rev 31149)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/emf/index.html 2011-05-09 19:04:21 UTC (rev 31150)
@@ -46,8 +46,8 @@
-->
<br/>
<ul>
+<li><a class=link href=2.7M7>2.7M7</a> </li>
<li><a class=link href=2.7M6>2.7M6</a> </li>
-<li><a class=link href=2.7M5>2.7M5</a> </li>
<li><a class=link href=2.6>2.6</a> </li>
</ul>
<br/>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml 2011-05-09 19:03:48 UTC (rev 31149)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml 2011-05-09 19:04:21 UTC (rev 31150)
@@ -16,13 +16,13 @@
-f ~/RHDS/updates/requirements/indigo/build.xml -Ddestination=/tmp/indigo-repo
-->
<target name="mirror">
- <property name="URL" value="http://download.eclipse.org/releases/indigo/" />
+ <property name="URL" value="http://download.eclipse.org/releases/indigo/201105060900/" />
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/indigo/201103180900/" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/indigo/201105060900/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/201103180900-M6/" name="Indigo 201103180900-M6" />
+ <repository location="file:${destination}/201105060900-M7/" name="Indigo 201105060900-M7" />
<source>
<repository location="${URL}" />
</source>
@@ -30,6 +30,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201103180900-M6/" artifactRepository="file:${destination}/201103180900-M6/" publishartifacts="true" source="${destination}/201103180900-M6/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201105060900-M7/" artifactRepository="file:${destination}/201105060900-M7/" publishartifacts="true" source="${destination}/201105060900-M7/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/indigo/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/indigo/index.html 2011-05-09 19:03:48 UTC (rev 31149)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/indigo/index.html 2011-05-09 19:04:21 UTC (rev 31150)
@@ -46,8 +46,8 @@
-->
<br/>
<ul>
+<li><a class=link href=201105060900-M7>201105060900-M7</a> </li>
<li><a class=link href=201103180900-M6>201103180900-M6</a> </li>
-<li><a class=link href=201102040900-M5>201102040900-M5</a> </li>
</ul>
<br/>
</td>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml 2011-05-09 19:03:48 UTC (rev 31149)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml 2011-05-09 19:04:21 UTC (rev 31150)
@@ -23,12 +23,12 @@
-->
<target name="mirror">
- <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.3.0/S-3.3.0M6-201..." />
+ <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.3.0/S-3.3.0M7-201..." />
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/webtools/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/3.3M6/" name="Web Tools plugins for Eclipse 3.7 Indigo" />
+ <repository location="file:${destination}/3.3M7/" name="Web Tools plugins for Eclipse 3.7 Indigo" />
<source>
<repository location="${URL}" />
</source>
@@ -37,6 +37,6 @@
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.3M6/" artifactRepository="file:${destination}/3.3M6/" publishartifacts="true" source="${destination}/3.3M6/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.3M7/" artifactRepository="file:${destination}/3.3M7/" publishartifacts="true" source="${destination}/3.3M7/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/index.html 2011-05-09 19:03:48 UTC (rev 31149)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/index.html 2011-05-09 19:04:21 UTC (rev 31150)
@@ -46,8 +46,8 @@
-->
<br/>
<ul>
+<li><a class=link href=3.3M7>3.3M7</a> (Indigo) </li>
<li><a class=link href=3.3M6>3.3M6</a> (Indigo) </li>
-<li><a class=link href=3.3M5>3.3M5</a> (Indigo) </li>
<li><a class=link href=3.2.3>3.2.3</a> (Helios) </li>
</ul>
<br/>
13 years, 5 months
JBoss Tools SVN: r31149 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-09 15:03:48 -0400 (Mon, 09 May 2011)
New Revision: 31149
Modified:
trunk/build/parent/pom.xml
Log:
add -Plocal.requirements -Dlocal.requirements=file://path/to/mirror/ for faster offline and Hudson builds
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-05-09 19:02:21 UTC (rev 31148)
+++ trunk/build/parent/pom.xml 2011-05-09 19:03:48 UTC (rev 31149)
@@ -37,10 +37,13 @@
<!-- 2a. URL of latest JBT nightly staging composite site (all the components in once place) -->
<jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</jbosstools-nightly-staging-composite>
- <!-- 2b., or, use -Plocal.comp -Dlocal.comp=file://path/to/mirror/of/composite/staging/site/ -->
+ <!-- 2b., or, use -Plocal.composite -Dlocal.composite=file://path/to/mirror/of/composite/staging/site/ -->
<local.composite>file://home/hudson/static_build_env/jbds/builds/staging/_composite_/3.3.indigo/</local.composite>
- <!-- 3. published aggregate update site goes here, for consumption by QE and downstream JBDS builds -->
+ <!-- 3. optionally, use -Plocal.requirements -Dlocal.requirements=file://path/to/mirror/of/composite/requirements/site -->
+ <local.requirements>file://qa/services/http/binaries/RHDS/updates/indigo/</local.requirements>
+
+ <!-- 4. published aggregate update site goes here, for consumption by QE and downstream JBDS builds -->
<jbosstools-nightly>http://download.jboss.org/jbosstools/updates/nightly/3.3.indigo/</jbosstools-nightly>
</properties>
@@ -284,6 +287,28 @@
</repository>
</repositories>
</profile>
+
+ <!-- same contents as jboss-requirements-composite-mirror, but locally available (to improve network lag) -->
+ <profile>
+ <id>local.requirements</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>local.requirements</id>
+ <url>${local.requirements}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+
<!-- same contents as jbosstools-nightly-staging-composite, but locally available (to improve network lag) -->
<profile>
<id>local.composite</id>
13 years, 5 months
JBoss Tools SVN: r31148 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-05-09 15:02:21 -0400 (Mon, 09 May 2011)
New Revision: 31148
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-3.2.xml
trunk/download.jboss.org/jbosstools/examples/project-examples-jbds40.xml
Log:
JBIDE-8399 Improve US States SOAP Service Project Example
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-3.2.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-3.2.xml 2011-05-09 18:35:27 UTC (rev 31147)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-3.2.xml 2011-05-09 19:02:21 UTC (rev 31148)
@@ -16,6 +16,15 @@
<url>
http://anonsvn.jboss.org/repos/jbosstools/workspace/dflorian/teiid-design...
</url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51, org.jboss.ide.eclipse.as.runtime.60</property>
+ <property name="eclipse-projects">PartsProject</property>
+ <property name="required-components">teiid</property>
+ <property name="description">This project example requires a Teiid instance running within the JBoss EAP 5.0 or JBoss AS >= 5.1.0</property>
+ </fix>
+ </fixes>
+ <welcome type="html" url="/PartsProject/readme/Example Instructions.html"/>
<perspectiveId>modelerPerspective</perspectiveId>
</project>
<project>
@@ -50,6 +59,14 @@
<url>
http://anonsvn.jboss.org/repos/jbosstools/workspace/jdoyle/teiid-designer...
</url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
+ <property name="eclipse-projects">StateService,StateServiceEAR</property>
+ <property name="required-components">teiid</property>
+ <property name="description">This project example requires a Teiid instance running within the JBoss EAP 5.0</property>
+ </fix>
+ </fixes>
<perspectiveId>modelerPerspective</perspectiveId>
</project>
</projects>
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-jbds40.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-jbds40.xml 2011-05-09 18:35:27 UTC (rev 31147)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-jbds40.xml 2011-05-09 19:02:21 UTC (rev 31148)
@@ -823,6 +823,15 @@
<url>
http://anonsvn.jboss.org/repos/jbosstools/workspace/dflorian/teiid-design...
</url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51, org.jboss.ide.eclipse.as.runtime.60</property>
+ <property name="eclipse-projects">PartsProject</property>
+ <property name="required-components">teiid</property>
+ <property name="description">This project example requires a Teiid instance running within the JBoss EAP 5.0 or JBoss AS >= 5.1.0</property>
+ </fix>
+ </fixes>
+ <welcome type="html" url="/PartsProject/readme/Example Instructions.html"/>
<perspectiveId>modelerPerspective</perspectiveId>
</project>
<project>
@@ -857,6 +866,14 @@
<url>
http://anonsvn.jboss.org/repos/jbosstools/workspace/jdoyle/teiid-designer...
</url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
+ <property name="eclipse-projects">StateService,StateServiceEAR</property>
+ <property name="required-components">teiid</property>
+ <property name="description">This project example requires a Teiid instance running within the JBoss EAP 5.0</property>
+ </fix>
+ </fixes>
<perspectiveId>modelerPerspective</perspectiveId>
</project>
</projects>
13 years, 5 months
JBoss Tools SVN: r31147 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-09 14:35:27 -0400 (Mon, 09 May 2011)
New Revision: 31147
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java
Log:
Fixed compilation error for WTP M7.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2011-05-09 18:30:18 UTC (rev 31146)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2011-05-09 18:35:27 UTC (rev 31147)
@@ -127,7 +127,7 @@
IServer server = (IServer) data;
ServerUIPlugin.editServer(server);
} catch (Exception e) {
- Trace.trace(Trace.SEVERE, org.jboss.ide.eclipse.as.ui.Messages.ServerActionProvider_CouldNotOpenServerError, e);
+ Trace.trace(Trace.STRING_SEVERE, org.jboss.ide.eclipse.as.ui.Messages.ServerActionProvider_CouldNotOpenServerError, e);
}
}
});
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java 2011-05-09 18:30:18 UTC (rev 31146)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java 2011-05-09 18:35:27 UTC (rev 31147)
@@ -349,7 +349,7 @@
}
}
} catch (Exception e) {
- Trace.trace(Trace.FINEST, Messages.ServerContentProvider_ErrorInServersViewAnimation, e);
+ Trace.trace(Trace.STRING_FINEST, Messages.ServerContentProvider_ErrorInServersViewAnimation, e);
}
display.timerExec(SLEEP, animator[0]);
}
13 years, 5 months
JBoss Tools SVN: r31146 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-09 14:30:18 -0400 (Mon, 09 May 2011)
New Revision: 31146
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java
Log:
Fixed compilation error for WTP M7.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java 2011-05-09 18:00:36 UTC (rev 31145)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java 2011-05-09 18:30:18 UTC (rev 31146)
@@ -19,7 +19,6 @@
import java.io.StringReader;
import java.util.ArrayList;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
import org.eclipse.core.resources.IResource;
import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
import org.eclipse.wst.validation.ValidationResult;
@@ -31,10 +30,11 @@
import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
import org.eclipse.wst.xml.core.internal.validation.eclipse.ErrorCustomizationPluginRegistryReader;
import org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;
-import org.jboss.tools.common.xml.XMLEntityResolverImpl;
import org.jboss.tools.jsf.JSFModelPlugin;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
import org.xml.sax.ext.LexicalHandler;
@@ -224,7 +224,7 @@
this.entityResolver = entityResolver;
}
- protected XMLReader createXMLReader(String uri) throws Exception
+ protected XMLReader createXMLReader(String uri) throws SAXNotRecognizedException, SAXNotSupportedException
{
XMLReader reader = super.createXMLReader(uri);
13 years, 5 months
JBoss Tools SVN: r31145 - trunk/documentation/whatsnew/seam.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-09 14:00:36 -0400 (Mon, 09 May 2011)
New Revision: 31145
Added:
trunk/documentation/whatsnew/seam/seam-news-3.3.0.M1.html
Log:
https://issues.jboss.org/browse/JBIDE-8897
Added: trunk/documentation/whatsnew/seam/seam-news-3.3.0.M1.html
===================================================================
--- trunk/documentation/whatsnew/seam/seam-news-3.3.0.M1.html (rev 0)
+++ trunk/documentation/whatsnew/seam/seam-news-3.3.0.M1.html 2011-05-09 18:00:36 UTC (rev 31145)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css" />
+<title>Seam tools 3.3.0.M1 What's New</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1>Seam tools 3.3.0.M1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a
+ href="../bpel/bpel-news-1.2.0.M1.html">BPEL Tools ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+<tr>
+ <td colspan="2">
+ <hr />
+ <h3>Code Assists</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>Seam-pdf and mail components</b></p>
+ </td>
+ <td valign="top">
+ <p>Content assist now suggests attributes of Seam PDF (http://jboss.com/products/seam/pdf) and Seam mail (http://jboss.com/products/seam/mail) components.</p>
+ <img src="images/seam-pdf.png"/><br/><br/>
+ <img src="images/seam-mail.png"/>
+ <p><small><a
+ href="https://jira.jboss.org/browse/JBIDE-5231">Related Jira 1</a>,
+ <a
+ href="https://jira.jboss.org/browse/JBIDE-5198">Related Jira 2</a></small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
\ No newline at end of file
Property changes on: trunk/documentation/whatsnew/seam/seam-news-3.3.0.M1.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 5 months
JBoss Tools SVN: r31144 - in trunk/smooks/plugins: org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/common and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2011-05-09 07:19:11 -0400 (Mon, 09 May 2011)
New Revision: 31144
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/XSDFileCollect.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/common/Test.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksXMLEditor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLTemplateCreationWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/messages.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerCSVNodeEditPart.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateGraphicalModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateGraphicalModelFactory.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java
Log:
https://issues.jboss.org/browse/JBIDE-8520
Smooks process invalid xml files without validation
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/XSDFileCollect.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/XSDFileCollect.java 2011-05-07 12:44:01 UTC (rev 31143)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/XSDFileCollect.java 2011-05-09 11:19:11 UTC (rev 31144)
@@ -19,7 +19,6 @@
if (file.isFile()) {
String name = file.getName();
if(name.endsWith(".xsd")){ //$NON-NLS-1$
- System.out.println(file.getName());
}
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/common/Test.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/common/Test.java 2011-05-07 12:44:01 UTC (rev 31143)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/common/Test.java 2011-05-09 11:19:11 UTC (rev 31144)
@@ -36,9 +36,7 @@
List<?> list1 = sr.getAbstractResourceConfig();
for (Iterator<?> iterator = list1.iterator(); iterator.hasNext();) {
AbstractResourceConfig arc = (AbstractResourceConfig) iterator.next();
- System.out.println(arc);
}
- System.out.println(obj);
} catch (IOException e) {
e.printStackTrace();
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksXMLEditor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksXMLEditor.java 2011-05-07 12:44:01 UTC (rev 31143)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksXMLEditor.java 2011-05-09 11:19:11 UTC (rev 31144)
@@ -49,9 +49,6 @@
@Override
public void doSetInput(IEditorInput input) throws CoreException {
- System.out.println(((IFileEditorInput) input).getFile()
- .getFileExtension());
-
final IFile newFile = ((IFileEditorInput) input).getFile();
if ("xml".equals(newFile.getFileExtension())) {
// try {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/Messages.java 2011-05-07 12:44:01 UTC (rev 31143)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/Messages.java 2011-05-09 11:19:11 UTC (rev 31144)
@@ -10,6 +10,7 @@
public static String XMLTemplateCreationWizardPage_Button_Load;
public static String XMLTemplateCreationWizardPage_Error_Must_Click_Load;
public static String XMLTemplateCreationWizardPage_Error_Must_Select_Root;
+ public static String XMLTemplateCreationWizardPage_Error_Invalid_Sample_XML;
public static String XMLTemplateCreationWizardPage_FileLabel;
public static String XMLTemplateCreationWizardPage_Label_Select_Root;
public static String XMLTemplateCreationWizardPage_page_description;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLTemplateCreationWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLTemplateCreationWizardPage.java 2011-05-07 12:44:01 UTC (rev 31143)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLTemplateCreationWizardPage.java 2011-05-09 11:19:11 UTC (rev 31144)
@@ -40,6 +40,7 @@
import org.jboss.tools.smooks.SmooksModelUtils;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
import org.jboss.tools.smooks.templating.model.ModelBuilderException;
+import org.jboss.tools.smooks.templating.model.xml.XMLSampleModelBuilder;
import org.jboss.tools.smooks.templating.model.xml.XSDModelBuilder;
import org.xml.sax.SAXException;
@@ -119,6 +120,20 @@
}
setErrorMessage(errorMessage);
setPageComplete(errorMessage == null);
+ } else if(templateSourceType == TemplateSourceType.xml) {
+ // Make sure a model can be created from the selected sample XML...
+ try {
+ String file = SmooksUIUtils.parseFilePath(this.fileText.getText());
+ new XMLSampleModelBuilder(URI.createFileURI(file));
+ } catch (Exception e) {
+ e.printStackTrace();
+ if(e.getCause() != null) {
+ setErrorMessage(Messages.XMLTemplateCreationWizardPage_Error_Invalid_Sample_XML + " " + e.getCause().getMessage()); //$NON-NLS-1$
+ } else {
+ setErrorMessage(Messages.XMLTemplateCreationWizardPage_Error_Invalid_Sample_XML);
+ }
+ setPageComplete(false);
+ }
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/messages.properties 2011-05-07 12:44:01 UTC (rev 31143)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/messages.properties 2011-05-09 11:19:11 UTC (rev 31144)
@@ -4,11 +4,12 @@
XMLTemplateCreationWizardPage_Button_Load=Load
XMLTemplateCreationWizardPage_Error_Must_Click_Load=Press 'Load' button to load XSD root element names.
XMLTemplateCreationWizardPage_Error_Must_Select_Root=Must select a root element.
+XMLTemplateCreationWizardPage_Error_Invalid_Sample_XML=Invalid Sample XML resource selection.
XMLTemplateCreationWizardPage_FileLabel=Create Template From:
XMLTemplateCreationWizardPage_Label_Select_Root=Select root element
XMLTemplateCreationWizardPage_page_description=Select template generation source
XMLTemplateCreationWizardPage_Page_Title=Apply XML Template
XMLTemplateCreationWizardPage_XMLSampleType=Sample XML
-XMLTemplateCreationWizardPage_XMLTemplateLoadError=Unexpected XML Template source selection. Code must be updated to accomodate new source type.
+XMLTemplateCreationWizardPage_XMLTemplateLoadError=Unexpected XML Template source selection. Code must be updated to accommodate new source type.
XMLTemplateCreationWizardPage_XSDParsingError1=Can't get the elements in the XSD file.
XMLTemplateCreationWizardPage_XSDType=XSD
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerCSVNodeEditPart.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerCSVNodeEditPart.java 2011-05-07 12:44:01 UTC (rev 31143)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerCSVNodeEditPart.java 2011-05-09 11:19:11 UTC (rev 31144)
@@ -261,7 +261,6 @@
*/
@Override
public void treeCollapsed(TreeFigureExpansionEvent event) {
- System.out.println();
}
/*
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateGraphicalModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateGraphicalModel.java 2011-05-07 12:44:01 UTC (rev 31143)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateGraphicalModel.java 2011-05-09 11:19:11 UTC (rev 31144)
@@ -61,24 +61,16 @@
private TemplateBuilder templateBuilder = null;
public FreemarkerTemplateGraphicalModel(Object data, ITreeContentProvider contentProvider,
- ILabelProvider labelProvider, ISmooksModelProvider domainProvider) {
+ ILabelProvider labelProvider, ISmooksModelProvider domainProvider) throws TemplateBuilderException {
super(data, contentProvider, labelProvider, domainProvider);
this.smooksModelProvider = domainProvider;
graphModelProvider = createFreemarkerTemplateContentGraphModelProvider();
try {
templateBuilder = graphModelProvider.getTemplateBuilder(this);
- } catch (InvocationTargetException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ModelBuilderException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
} catch (TemplateBuilderException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ throw e;
+ } catch (Exception e) {
+ throw new TemplateBuilderException("Failed to create template Builder instance.", e);
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateGraphicalModelFactory.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateGraphicalModelFactory.java 2011-05-07 12:44:01 UTC (rev 31143)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateGraphicalModelFactory.java 2011-05-09 11:19:11 UTC (rev 31144)
@@ -30,6 +30,7 @@
import org.jboss.tools.smooks.graphical.editors.process.TaskType;
import org.jboss.tools.smooks.model.freemarker.Freemarker;
import org.jboss.tools.smooks.model.javabean12.BeanType;
+import org.jboss.tools.smooks.templating.template.exception.TemplateBuilderException;
/**
* @author Dart
@@ -70,8 +71,12 @@
templateLP = new FreemarkerTemplateModelLabelProvider();
}
if (taskType.inTheTask((Freemarker)model)) {
- graphModel = new FreemarkerTemplateGraphicalModel(model, new FreemarkerContentProvider(
- contentProvider), templateLP, provider);
+ try {
+ graphModel = new FreemarkerTemplateGraphicalModel(model, new FreemarkerContentProvider(
+ contentProvider), templateLP, provider);
+ } catch (TemplateBuilderException e) {
+ return null;
+ }
((TreeContainerModel) graphModel).setHeaderVisable(true);
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java 2011-05-07 12:44:01 UTC (rev 31143)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java 2011-05-09 11:19:11 UTC (rev 31144)
@@ -100,7 +100,6 @@
} else {
smooks.filterSource(inputSource, javaResult);
}
- System.out.println("successfully");
Collection<ObjectSerializer> serializedJavaResults = ObjectSerializer.serialize(javaResult);
if(!serializedJavaResults.isEmpty()) {
System.out.println("[" + localizedMessages.getProperty("SmooksLauncher_Java_Mapping_Results") + "...]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
13 years, 5 months
JBoss Tools SVN: r31143 - in trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge: old and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-05-07 08:44:01 -0400 (Sat, 07 May 2011)
New Revision: 31143
Modified:
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/old/ConsolePartition.java
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/old/ConsolePartitioner.java
Log:
- update to 3.7M7
- suppress the warnings in the org.jboss.tools.seam.forge.old package
Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java 2011-05-07 01:14:25 UTC (rev 31142)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java 2011-05-07 12:44:01 UTC (rev 31143)
@@ -12,7 +12,6 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.IMavenConstants;
import org.eclipse.m2e.core.project.MavenProjectInfo;
import org.eclipse.m2e.core.project.ProjectImportConfiguration;
@@ -28,11 +27,10 @@
}
public void importProject() {
- final MavenPlugin mavenPlugin = MavenPlugin.getDefault();
Job job = new WorkspaceJob("Importing Forge project") {
public IStatus runInWorkspace(IProgressMonitor monitor) {
try {
- mavenPlugin.getProjectConfigurationManager().importProjects(
+ MavenPlugin.getProjectConfigurationManager().importProjects(
getProjectToImport(),
new ProjectImportConfiguration(),
monitor);
@@ -42,7 +40,7 @@
return Status.OK_STATUS;
}
};
- job.setRule(mavenPlugin.getProjectConfigurationManager().getRule());
+ job.setRule(MavenPlugin.getProjectConfigurationManager().getRule());
job.schedule();
}
@@ -50,9 +48,9 @@
MavenProjectInfo result = null;
try {
File projectDir = new File(baseDirPath, projectName);
- File pomFile = new File(projectDir, IMavenConstants.POM_FILE_NAME);
- Model model = MavenPlugin.getDefault().getMavenModelManager().readMavenModel(pomFile);
- String pomName = projectName + "/" + IMavenConstants.POM_FILE_NAME;
+ File pomFile = new File(projectDir, "pom.xml");
+ Model model = MavenPlugin.getMavenModelManager().readMavenModel(pomFile);
+ String pomName = projectName + "/" + "pom.xml";
result = new MavenProjectInfo(pomName, pomFile, model, null);
} catch (CoreException e) {
Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/old/ConsolePartition.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/old/ConsolePartition.java 2011-05-07 01:14:25 UTC (rev 31142)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/old/ConsolePartition.java 2011-05-07 12:44:01 UTC (rev 31143)
@@ -26,7 +26,8 @@
* Only one of inputStream or outputStream will be null depending on the partitions type.
*/
private ConsoleOutputStream outputStream;
- private ConsoleInputStream inputStream;
+ @SuppressWarnings("unused")
+ private ConsoleInputStream inputStream;
private int length;
/**
Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/old/ConsolePartitioner.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/old/ConsolePartitioner.java 2011-05-07 01:14:25 UTC (rev 31142)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/old/ConsolePartitioner.java 2011-05-07 12:44:01 UTC (rev 31143)
@@ -33,6 +33,7 @@
* @since 3.1
*
*/
+@SuppressWarnings(value = { "rawtypes", "unchecked" })
public class ConsolePartitioner implements IConsoleDocumentPartitioner, IDocumentPartitionerExtension {
private PendingPartition consoleClosedPartition;
@@ -74,6 +75,7 @@
/**
* An array of legal line delimiters
*/
+ @SuppressWarnings("unused")
private String[] lld;
private int highWaterMark = -1;
private int lowWaterMark = -1;
13 years, 5 months
JBoss Tools SVN: r31142 - in trunk/struts/plugins: org.jboss.tools.struts.text.ext/META-INF and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-06 21:14:25 -0400 (Fri, 06 May 2011)
New Revision: 31142
Modified:
trunk/struts/plugins/org.jboss.tools.struts.text.ext/META-INF/MANIFEST.MF
trunk/struts/plugins/org.jboss.tools.struts.ui/META-INF/MANIFEST.MF
trunk/struts/plugins/org.jboss.tools.struts.validator.ui/META-INF/MANIFEST.MF
trunk/struts/plugins/org.jboss.tools.struts.verification/META-INF/MANIFEST.MF
trunk/struts/plugins/org.jboss.tools.struts/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-8879
Modified: trunk/struts/plugins/org.jboss.tools.struts/META-INF/MANIFEST.MF
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/META-INF/MANIFEST.MF 2011-05-07 00:55:10 UTC (rev 31141)
+++ trunk/struts/plugins/org.jboss.tools.struts/META-INF/MANIFEST.MF 2011-05-07 01:14:25 UTC (rev 31142)
@@ -40,22 +40,22 @@
org.jboss.tools.struts.model.handlers.refactoring,
org.jboss.tools.struts.messages
Require-Bundle: org.jboss.tools.common,
- org.eclipse.jdt.core,
+ org.eclipse.jdt.core;bundle-version="3.7.0",
org.jboss.tools.common.model,
org.jboss.tools.jst.web,
org.jboss.tools.jst.web.tiles,
- org.eclipse.ui,
- org.eclipse.debug.core,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.core,
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.debug.core;bundle-version="3.7.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.wst.xml.core;bundle-version="1.1.600",
org.jboss.tools.common.projecttemplates,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ltk.ui.refactoring,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.ltk.ui.refactoring;bundle-version="3.5.100",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.apache.velocity;bundle-version="1.5.0",
- org.eclipse.jface.text;visibility:=reexport,
- org.eclipse.jst.jsp.ui;visibility:=reexport
+ org.eclipse.jface.text;visibility:=reexport;bundle-version="3.7.0",
+ org.eclipse.jst.jsp.ui;visibility:=reexport;bundle-version="1.1.600"
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ManifestVersion: 2
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/META-INF/MANIFEST.MF 2011-05-07 00:55:10 UTC (rev 31141)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/META-INF/MANIFEST.MF 2011-05-07 01:14:25 UTC (rev 31142)
@@ -6,22 +6,22 @@
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.jboss.tools.struts.text.ext;singleton:=true
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui.ide,
- org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.text,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
+Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.text;bundle-version="3.5.100",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench;bundle-version="3.7.0",
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.core.resources;bundle-version="3.7.100",
org.jboss.tools.struts,
org.jboss.tools.common.text.ext,
org.jboss.tools.jst.text.ext,
org.jboss.tools.jst.web,
- org.eclipse.wst.sse.core,
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
org.jboss.tools.common.model,
- org.eclipse.wst.xml.core,
- org.eclipse.jst.jsp.core,
+ org.eclipse.wst.xml.core;bundle-version="1.1.600",
+ org.eclipse.jst.jsp.core;bundle-version="1.2.400",
org.jboss.tools.common
Export-Package: org.jboss.tools.struts.text.ext.hyperlink
Bundle-Version: 3.3.0.qualifier
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/META-INF/MANIFEST.MF 2011-05-07 00:55:10 UTC (rev 31141)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/META-INF/MANIFEST.MF 2011-05-07 01:14:25 UTC (rev 31142)
@@ -37,30 +37,30 @@
org.jboss.tools.struts.ui.editor
Require-Bundle: org.jboss.tools.common,
org.jboss.tools.common.gef,
- org.eclipse.ui.ide,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- org.eclipse.ui.views,
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.ui.editors;bundle-version="3.7.0",
+ org.eclipse.ui.views;bundle-version="3.6.0",
org.jboss.tools.common.model,
org.jboss.tools.common.model.ui,
org.jboss.tools.jst.web,
org.jboss.tools.jst.web.ui,
org.jboss.tools.jst.web.tiles,
org.jboss.tools.struts,
- org.eclipse.jface,
- org.eclipse.ui,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
+ org.eclipse.jface;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
org.jboss.tools.common.model.ui,
org.jboss.tools.common.text.xml,
- org.eclipse.debug.core,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.xml.ui,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.gef,
- org.eclipse.core.expressions
+ org.eclipse.debug.core;bundle-version="3.7.0",
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
+ org.eclipse.wst.xml.ui;bundle-version="1.1.200",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.gef;bundle-version="3.7.0",
+ org.eclipse.core.expressions;bundle-version="3.4.200"
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Modified: trunk/struts/plugins/org.jboss.tools.struts.validator.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.validator.ui/META-INF/MANIFEST.MF 2011-05-07 00:55:10 UTC (rev 31141)
+++ trunk/struts/plugins/org.jboss.tools.struts.validator.ui/META-INF/MANIFEST.MF 2011-05-07 01:14:25 UTC (rev 31142)
@@ -8,10 +8,10 @@
Bundle-Localization: plugin
Export-Package: org.jboss.tools.struts.validator.ui,org.jboss.tools.struts.validator.ui.adapter,org.jboss.tools.struts.validator.ui.constants,org.jboss.tools.struts.validator.ui.formset,org.jboss.tools.struts.validator.ui.formset.model,org.jboss.tools.struts.validator.ui.global,org.jboss.tools.struts.validator.ui.internal,org.jboss.tools.struts.validator.ui.wizard.depends,org.jboss.tools.struts.validator.ui.wizard.key,org.jboss.tools.struts.validator.ui
Require-Bundle: org.jboss.tools.common,
- org.eclipse.ui.views,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui,
+ org.eclipse.ui.views;bundle-version="3.6.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
org.jboss.tools.common.model,
org.jboss.tools.common.model.ui,
org.jboss.tools.jst.web,
@@ -20,12 +20,12 @@
org.jboss.tools.common.text.xml,
org.jboss.tools.common.model.ui,
org.jboss.tools.struts.ui,
- org.eclipse.ui.ide,
- org.eclipse.ui.editors,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.xml.ui,
- org.eclipse.core.resources,
- org.eclipse.core.runtime
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.ui.editors;bundle-version="3.7.0",
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
+ org.eclipse.wst.xml.ui;bundle-version="1.1.200",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.core.runtime;bundle-version="3.7.0"
Bundle-Version: 3.1.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Modified: trunk/struts/plugins/org.jboss.tools.struts.verification/META-INF/MANIFEST.MF
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.verification/META-INF/MANIFEST.MF 2011-05-07 00:55:10 UTC (rev 31141)
+++ trunk/struts/plugins/org.jboss.tools.struts.verification/META-INF/MANIFEST.MF 2011-05-07 01:14:25 UTC (rev 31142)
@@ -5,14 +5,14 @@
Bundle-SymbolicName: org.jboss.tools.struts.verification;singleton:=true
Bundle-Localization: plugin
Export-Package: org.jboss.tools.struts.verification
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jdt.core,
+Require-Bundle: org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.jdt.core;bundle-version="3.7.0",
org.jboss.tools.common.model,
org.jboss.tools.jst.web,
org.jboss.tools.common.verification,
org.jboss.tools.struts,
- org.eclipse.ui,
+ org.eclipse.ui;bundle-version="3.7.0",
org.jboss.tools.jst.web.verification
Bundle-Version: 3.1.0.qualifier
Bundle-Activator: org.jboss.tools.struts.verification.StrutsVerificationPlugin
13 years, 5 months