JBoss Tools SVN: r24115 - in trunk/runtime: site and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-12 12:53:21 -0400 (Thu, 12 Aug 2010)
New Revision: 24115
Added:
trunk/runtime/site/
trunk/runtime/site/pom.xml
trunk/runtime/site/site.xml
Log:
add site/ folder to runtime builder
Added: trunk/runtime/site/pom.xml
===================================================================
--- trunk/runtime/site/pom.xml (rev 0)
+++ trunk/runtime/site/pom.xml 2010-08-12 16:53:21 UTC (rev 24115)
@@ -0,0 +1,14 @@
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <relativePath>../../build/parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.runtime</groupId>
+ <artifactId>site</artifactId>
+ <name>runtime.site</name>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>eclipse-update-site</packaging>
+</project>
Added: trunk/runtime/site/site.xml
===================================================================
--- trunk/runtime/site/site.xml (rev 0)
+++ trunk/runtime/site/site.xml 2010-08-12 16:53:21 UTC (rev 24115)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <description>To install these features, point Eclipse at this site.</description>
+ <!-- JBoss Tools runtime Nightly Build Update Site -->
+ <category-def label="JBoss Tools runtime Nightly Build Update Site" name="JBoss Tools runtime Nightly Build Update Site">
+ <description>JBoss Tools runtime Nightly Build Update Site: contains all features in this build.</description>
+ </category-def>
+ <feature url="features/org.jboss.tools.runtime.feature_0.0.0.jar" id="org.jboss.tools.runtime.feature" version="0.0.0">
+ <category name="JBoss Tools runtime Nightly Build Update Site"/>
+ </feature>
+
+</site>
15 years, 8 months
JBoss Tools SVN: r24114 - trunk/runtime/features/org.jboss.tools.runtime.feature.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-12 12:51:47 -0400 (Thu, 12 Aug 2010)
New Revision: 24114
Modified:
trunk/runtime/features/org.jboss.tools.runtime.feature/feature.xml
Log:
remove ref to JBDS update site and CSP
Modified: trunk/runtime/features/org.jboss.tools.runtime.feature/feature.xml
===================================================================
--- trunk/runtime/features/org.jboss.tools.runtime.feature/feature.xml 2010-08-12 16:50:08 UTC (rev 24113)
+++ trunk/runtime/features/org.jboss.tools.runtime.feature/feature.xml 2010-08-12 16:51:47 UTC (rev 24114)
@@ -425,15 +425,10 @@
END OF TERMS AND CONDITIONS
</license>
-
<!-- url element commented out because of
https://jira.jboss.org/jira/browse/JBDS-1187 Configuration plugin errors in feature.xml file -->
<!--url-->
- <!-- A password is required for this site. See the Customer Support Portal (CSP) or contact your rep for more information -->
- <!-- <update label="%updateSiteName" url="https://devstudio.jboss.com/updates/3.0/"/> -->
- <!-- You can also get *unsupported* community-tested updates to JBDS from the JBoss Tools site.
- These updates generally become part of JBDS in the same way that Fedora content eventually becomes RHEL. -->
- <!-- <discovery label="%JBossToolsUpdatesSiteName" url="http://download.jboss.org/jbosstools/updates/stable/galileo/"/> -->
+ <!-- <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/helios/"/> -->
<!-- url -->
<plugin
15 years, 8 months
JBoss Tools SVN: r24113 - in trunk/runtime: features and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-12 12:50:08 -0400 (Thu, 12 Aug 2010)
New Revision: 24113
Added:
trunk/runtime/features/org.jboss.tools.runtime.feature/pom.xml
trunk/runtime/features/pom.xml
trunk/runtime/plugins/org.jboss.tools.runtime/pom.xml
trunk/runtime/plugins/pom.xml
trunk/runtime/pom.xml
Log:
add missing pom.xml files for new runtime component
Added: trunk/runtime/features/org.jboss.tools.runtime.feature/pom.xml
===================================================================
--- trunk/runtime/features/org.jboss.tools.runtime.feature/pom.xml (rev 0)
+++ trunk/runtime/features/org.jboss.tools.runtime.feature/pom.xml 2010-08-12 16:50:08 UTC (rev 24113)
@@ -0,0 +1,14 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <relativePath>../../../parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.runtime.feature</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
Added: trunk/runtime/features/pom.xml
===================================================================
--- trunk/runtime/features/pom.xml (rev 0)
+++ trunk/runtime/features/pom.xml 2010-08-12 16:50:08 UTC (rev 24113)
@@ -0,0 +1,18 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <relativePath>../../parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>runtime.features</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>org.jboss.tools.runtime.feature</module>
+ </modules>
+</project>
+
\ No newline at end of file
Added: trunk/runtime/plugins/org.jboss.tools.runtime/pom.xml
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime/pom.xml (rev 0)
+++ trunk/runtime/plugins/org.jboss.tools.runtime/pom.xml 2010-08-12 16:50:08 UTC (rev 24113)
@@ -0,0 +1,14 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <relativePath>../../../parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.runtime</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Added: trunk/runtime/plugins/pom.xml
===================================================================
--- trunk/runtime/plugins/pom.xml (rev 0)
+++ trunk/runtime/plugins/pom.xml 2010-08-12 16:50:08 UTC (rev 24113)
@@ -0,0 +1,18 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <relativePath>../../parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>runtime.plugins</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>org.jboss.tools.runtime</module>
+ </modules>
+</project>
+
\ No newline at end of file
Added: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml (rev 0)
+++ trunk/runtime/pom.xml 2010-08-12 16:50:08 UTC (rev 24113)
@@ -0,0 +1,16 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>runtime</artifactId>
+ <name>runtime.all</name>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>plugins</module>
+ <module>features</module>
+ <!-- <module>tests</module> -->
+ <module>site</module>
+ </modules>
+</project>
+
15 years, 8 months
JBoss Tools SVN: r24112 - in trunk/tests/features: org.jboss.tools.test.sdk.feature and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-12 12:43:44 -0400 (Thu, 12 Aug 2010)
New Revision: 24112
Modified:
trunk/tests/features/org.jboss.tools.test.feature/feature.xml
trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml
Log:
JBIDE-6300 move from tests/ into common/ to resolve cyclic dependency
Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2010-08-12 16:21:30 UTC (rev 24111)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2010-08-12 16:43:44 UTC (rev 24112)
@@ -34,16 +34,4 @@
install-size="0"
version="0.0.0"/>
- <plugin
- id="org.jboss.tools.ui.bot.ext"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.ui.bot.ext.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
</feature>
Modified: trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-08-12 16:21:30 UTC (rev 24111)
+++ trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-08-12 16:43:44 UTC (rev 24112)
@@ -294,20 +294,6 @@
unpack="false"/>
<plugin
- id="org.jboss.tools.ui.bot.ext"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.ui.bot.ext.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.jboss.tools.struts.ui.bot.test"
download-size="0"
install-size="0"
15 years, 8 months
JBoss Tools SVN: r24111 - trunk/tests/plugins.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-12 12:21:30 -0400 (Thu, 12 Aug 2010)
New Revision: 24111
Removed:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/
Modified:
trunk/tests/plugins/pom.xml
Log:
JBIDE-6300 move from tests/ into common/ to resolve cyclic dependency
Modified: trunk/tests/plugins/pom.xml
===================================================================
--- trunk/tests/plugins/pom.xml 2010-08-12 16:21:05 UTC (rev 24110)
+++ trunk/tests/plugins/pom.xml 2010-08-12 16:21:30 UTC (rev 24111)
@@ -8,8 +8,6 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.tests</module>
- <module>org.jboss.tools.ui.bot.ext</module>
- <module>org.jboss.tools.ui.bot.ext.test</module>
</modules>
</project>
15 years, 8 months
JBoss Tools SVN: r24110 - trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views.
by jbosstools-commits@lists.jboss.org
Author: bfitzpat
Date: 2010-08-12 12:21:05 -0400 (Thu, 12 Aug 2010)
New Revision: 24110
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java
Log:
OPEN - issue JBIDE-6793: [tester] SOAPExceptionImpl thrown when user types in invalid SOAP message
https://jira.jboss.org/browse/JBIDE-6793
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java 2010-08-12 16:19:18 UTC (rev 24109)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java 2010-08-12 16:21:05 UTC (rev 24110)
@@ -1324,10 +1324,30 @@
monitor.worked(10);
return status;
} catch (Exception e) {
+
+ // try and drill down to find the root cause
+ Throwable innerE = e.getCause();
+
+ // if we can't find it, just go with th exception
+ if (innerE == null) {
+ WSTestStatus status = new WSTestStatus(IStatus.OK,
+ JBossWSUIPlugin.PLUGIN_ID,
+ JBossWSUIMessages.JAXRSWSTestView_Exception_Status + e.getLocalizedMessage());
+ status.setResultsText(e.toString());
+ JBossWSUIPlugin.log(e);
+ return status;
+ }
+
+ // continue to drill down until we find the innermost one
+ while (innerE.getCause() != null) {
+ innerE = innerE.getCause();
+ }
+
+ // Now report that
WSTestStatus status = new WSTestStatus(IStatus.OK,
JBossWSUIPlugin.PLUGIN_ID,
- JBossWSUIMessages.JAXRSWSTestView_Exception_Status + e.getLocalizedMessage());
- status.setResultsText(e.toString());
+ JBossWSUIMessages.JAXRSWSTestView_Exception_Status + innerE.getLocalizedMessage());
+ status.setResultsText(innerE.toString());
JBossWSUIPlugin.log(e);
return status;
}
15 years, 8 months
JBoss Tools SVN: r24109 - in trunk/common: features/org.jboss.tools.common.all.feature and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-12 12:19:18 -0400 (Thu, 12 Aug 2010)
New Revision: 24109
Added:
trunk/common/features/org.jboss.tools.ui.bot.feature/
trunk/common/features/org.jboss.tools.ui.bot.feature/.project
trunk/common/features/org.jboss.tools.ui.bot.feature/build.properties
trunk/common/features/org.jboss.tools.ui.bot.feature/feature.properties
trunk/common/features/org.jboss.tools.ui.bot.feature/feature.xml
trunk/common/features/org.jboss.tools.ui.bot.feature/pom.xml
trunk/common/plugins/org.jboss.tools.ui.bot.ext.test/
trunk/common/plugins/org.jboss.tools.ui.bot.ext/
Modified:
trunk/common/features/org.jboss.tools.common.all.feature/feature.xml
trunk/common/features/pom.xml
trunk/common/plugins/pom.xml
Log:
JBIDE-6300 move from tests/ into common/ to resolve cyclic dependency
Modified: trunk/common/features/org.jboss.tools.common.all.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/feature.xml 2010-08-12 15:47:05 UTC (rev 24108)
+++ trunk/common/features/org.jboss.tools.common.all.feature/feature.xml 2010-08-12 16:19:18 UTC (rev 24109)
@@ -44,6 +44,10 @@
id="org.jboss.tools.common.verification.feature"
version="0.0.0"/>
+ <includes
+ id="org.jboss.tools.ui.bot.feature"
+ version="0.0.0"/>
+
<plugin
id="org.jboss.tools.common.el.core"
download-size="0"
Added: trunk/common/features/org.jboss.tools.ui.bot.feature/.project
===================================================================
--- trunk/common/features/org.jboss.tools.ui.bot.feature/.project (rev 0)
+++ trunk/common/features/org.jboss.tools.ui.bot.feature/.project 2010-08-12 16:19:18 UTC (rev 24109)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.ui.bot.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
Added: trunk/common/features/org.jboss.tools.ui.bot.feature/build.properties
===================================================================
--- trunk/common/features/org.jboss.tools.ui.bot.feature/build.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.ui.bot.feature/build.properties 2010-08-12 16:19:18 UTC (rev 24109)
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+ feature.properties
Added: trunk/common/features/org.jboss.tools.ui.bot.feature/feature.properties
===================================================================
--- trunk/common/features/org.jboss.tools.ui.bot.feature/feature.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.ui.bot.feature/feature.properties 2010-08-12 16:19:18 UTC (rev 24109)
@@ -0,0 +1,37 @@
+###############################################################################
+# Copyright (c) 2010 JBoss by Red Hat and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# JBoss by Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JBoss Tools SWTBot Extensions
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+devUpdateSiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=JBoss Tools SWTBot Extensions
+
+copyright=Copyright (c) 2007 Exadel, Inc and Red Hat, Inc.\n\
+Distributed under license by Red Hat, Inc. All rights reserved.\n\
+This program is made available under the terms of the\n\
+Eclipse Public License v1.0 which accompanies this distribution,\n\
+and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
+Contributors\:\n\
+Exadel, Inc. and Red Hat, Inc. - initial API and implementation
Added: trunk/common/features/org.jboss.tools.ui.bot.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.ui.bot.feature/feature.xml (rev 0)
+++ trunk/common/features/org.jboss.tools.ui.bot.feature/feature.xml 2010-08-12 16:19:18 UTC (rev 24109)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.ui.bot.feature"
+ label="%featureName"
+ version="3.2.0.qualifier"
+ provider-name="%providerName">
+
+ <description url="http://www.jboss.org/tools">
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</license>
+
+
+ <!-- <url>
+ <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/galileo/"/>
+ </url> -->
+
+ <includes
+ id="org.jboss.tools.ui.bot.ext"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jboss.tools.ui.bot.ext.test"
+ version="0.0.0"/>
+
+</feature>
Added: trunk/common/features/org.jboss.tools.ui.bot.feature/pom.xml
===================================================================
--- trunk/common/features/org.jboss.tools.ui.bot.feature/pom.xml (rev 0)
+++ trunk/common/features/org.jboss.tools.ui.bot.feature/pom.xml 2010-08-12 16:19:18 UTC (rev 24109)
@@ -0,0 +1,13 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.ui.bot.features</groupId>
+ <artifactId>org.jboss.tools.ui.bot.feature</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
Modified: trunk/common/features/pom.xml
===================================================================
--- trunk/common/features/pom.xml 2010-08-12 15:47:05 UTC (rev 24108)
+++ trunk/common/features/pom.xml 2010-08-12 16:19:18 UTC (rev 24109)
@@ -14,6 +14,7 @@
<module>org.jboss.tools.common.text.ext.feature</module>
<module>org.jboss.tools.common.ui.feature</module>
<module>org.jboss.tools.common.verification.feature</module>
+ <module>org.jboss.tools.ui.bot.feature</module>
</modules>
</project>
Copied: trunk/common/plugins/org.jboss.tools.ui.bot.ext (from rev 24043, trunk/tests/plugins/org.jboss.tools.ui.bot.ext)
Copied: trunk/common/plugins/org.jboss.tools.ui.bot.ext.test (from rev 24043, trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test)
Modified: trunk/common/plugins/pom.xml
===================================================================
--- trunk/common/plugins/pom.xml 2010-08-12 15:47:05 UTC (rev 24108)
+++ trunk/common/plugins/pom.xml 2010-08-12 16:19:18 UTC (rev 24109)
@@ -23,6 +23,8 @@
<module>org.jboss.tools.common.ui</module>
<module>org.jboss.tools.common.verification</module>
<module>org.jboss.tools.common.verification.ui</module>
+ <module>org.jboss.tools.ui.bot.ext</module>
+ <module>org.jboss.tools.ui.bot.ext.test</module>
</modules>
</project>
15 years, 8 months
JBoss Tools SVN: r24108 - in trunk/hibernatetools/plugins: org.hibernate.eclipse.console/src/org/hibernate/eclipse/codegen and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: vyemialyanchyk
Date: 2010-08-12 11:47:05 -0400 (Thu, 12 Aug 2010)
New Revision: 24108
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/codegen/ExportAntCodeGenWizardPage.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java
Log:
https://jira.jboss.org/browse/JBIDE-6809 - fixed
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java 2010-08-12 15:46:46 UTC (rev 24107)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java 2010-08-12 15:47:05 UTC (rev 24108)
@@ -21,6 +21,8 @@
import org.dom4j.Element;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.hibernate.console.preferences.ConsoleConfigurationPreferences;
import org.hibernate.console.preferences.ConsoleConfigurationPreferences.ConfigurationMode;
import org.hibernate.util.StringHelper;
@@ -33,8 +35,18 @@
* @author Vitali Yemialyanchyk
*/
public class ConfigurationXMLFactory {
+
protected ConsoleConfigurationPreferences prefs;
protected Properties additional;
+ /**
+ * place to generate Ant script file (all paths in script should be
+ * relative to this place)
+ */
+ protected IPath pathPlace2Generate = null;
+ /**
+ * workspace path
+ */
+ protected IPath pathWorkspacePath = null;
public ConfigurationXMLFactory(ConsoleConfigurationPreferences prefs, Properties additional) {
this.prefs = prefs;
@@ -66,8 +78,12 @@
rootName = ConfigurationXMLStrings.CONFIGURATION;
}
Element root = DocumentFactory.getInstance().createElement(rootName);
- updateAttr(root, file2Str(prefs.getConfigXMLFile()), ConfigurationXMLStrings.CONFIGURATIONFILE);
- updateAttr(root, file2Str(prefs.getPropertyFile()), ConfigurationXMLStrings.PROPERTYFILE);
+ String tmp = file2Str(prefs.getConfigXMLFile());
+ tmp = makePathRelative(tmp, pathPlace2Generate, pathWorkspacePath);
+ updateAttr(root, tmp, ConfigurationXMLStrings.CONFIGURATIONFILE);
+ tmp = file2Str(prefs.getPropertyFile());
+ tmp = makePathRelative(tmp, pathPlace2Generate, pathWorkspacePath);
+ updateAttr(root, tmp, ConfigurationXMLStrings.PROPERTYFILE);
updateAttr(root, prefs.getEntityResolverName(), ConfigurationXMLStrings.ENTITYRESOLVER);
updateAttr(root, prefs.getNamingStrategy(), ConfigurationXMLStrings.NAMINGSTRATEGY);
updateAttr(root, prefs.getPersistenceUnitName(), ConfigurationXMLStrings.PERSISTENCEUNIT);
@@ -85,14 +101,21 @@
fileset.addAttribute("id", "id"); //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < mappingFiles.length; i++) {
Element include = fileset.addElement("include"); //$NON-NLS-1$
- include.addAttribute("name", mappingFiles[i].getAbsolutePath()); //$NON-NLS-1$
+ tmp = mappingFiles[i].getAbsolutePath();
+ tmp = new Path(tmp).toString();
+ tmp = makePathRelative(tmp, pathPlace2Generate, pathWorkspacePath);
+ include.addAttribute("name", tmp); //$NON-NLS-1$
}
}
return root;
}
public static String file2Str(File file) {
- return file == null ? null : file.getPath();
+ String res = file == null ? null : file.getPath();
+ if (res != null) {
+ res = new Path(res).toString();
+ }
+ return res;
}
public static void updateAttr(Element el, String val, String prName) {
@@ -131,4 +154,35 @@
}
}
}
+
+ public static String makePathRelative(String strPathItem, final IPath pathPlace2Generate, final IPath pathWorkspacePath) {
+ if (strPathItem != null && pathPlace2Generate != null && pathWorkspacePath != null) {
+ IPath tmpPath = new Path(strPathItem);
+ if (pathWorkspacePath.isPrefixOf(tmpPath)) {
+ tmpPath = tmpPath.makeRelativeTo(pathPlace2Generate);
+ strPathItem = pathPlace2Generate.toString();
+ String tmp = tmpPath.toString();
+ if (tmp.length() > 0) {
+ strPathItem += IPath.SEPARATOR + tmp;
+ }
+ }
+ }
+ return strPathItem;
+ }
+
+ public void setPlace2Generate(IPath pathPlace2Generate) {
+ this.pathPlace2Generate = pathPlace2Generate;
+ }
+
+ public IPath getPlace2Generate() {
+ return pathPlace2Generate;
+ }
+
+ public void setWorkspacePath(IPath pathWorkspacePath) {
+ this.pathWorkspacePath = pathWorkspacePath;
+ }
+
+ public IPath getWorkspacePath() {
+ return pathWorkspacePath;
+ }
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/codegen/ExportAntCodeGenWizardPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/codegen/ExportAntCodeGenWizardPage.java 2010-08-12 15:46:46 UTC (rev 24107)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/codegen/ExportAntCodeGenWizardPage.java 2010-08-12 15:47:05 UTC (rev 24108)
@@ -217,6 +217,11 @@
String externalPropFileName = CodeGenXMLFactory.propFileNameSuffix;
externalPropFileName = getFileName() + "." + externalPropFileName; //$NON-NLS-1$
codeGenXMLFactory.setExternalPropFileName(externalPropFileName);
+ codeGenXMLFactory.setPlace2Generate(getContainerFullPath().toString());
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ if (workspace != null && workspace.getRoot() != null && workspace.getRoot().getLocation() != null) {
+ codeGenXMLFactory.setWorkspacePath(workspace.getRoot().getLocation().toString());
+ }
String buildXml = codeGenXMLFactory.createCodeGenXML();
return new ByteArrayInputStream(buildXml.getBytes());
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java 2010-08-12 15:46:46 UTC (rev 24107)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java 2010-08-12 15:47:05 UTC (rev 24108)
@@ -27,6 +27,8 @@
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
import org.eclipse.datatools.connectivity.drivers.DriverInstance;
@@ -52,12 +54,18 @@
*/
public class CodeGenXMLFactory {
+ public static final String varBuildDir = "build.dir"; //$NON-NLS-1$
+ public static final String varCurrentDir = "current.dir"; //$NON-NLS-1$
+ public static final String varWorkspaceDir = "workspace.dir"; //$NON-NLS-1$
+
public static final String NL = System.getProperty("line.separator"); //$NON-NLS-1$
/**
* UUID to make a stub for propFileContentPreSave,
* before formatting
*/
public static final long versionUID4PropFile = 1841714864553304000L;
+ public static final long place2GenerateUID = 3855319363698081943L;
+ public static final long workspacePathUID = 2720818065195124531L;
/**
*/
public static final String propFileNameSuffix = "hibernate.properties"; //$NON-NLS-1$
@@ -79,6 +87,15 @@
* file name for generated properties file
*/
protected String externalPropFileName = propFileNameSuffix;
+ /**
+ * place to generate Ant script file (all paths in script should be
+ * relative to this place)
+ */
+ protected String place2Generate = ""; //$NON-NLS-1$
+ /**
+ * workspace path
+ */
+ protected String workspacePath = ""; //$NON-NLS-1$
public CodeGenXMLFactory(ILaunchConfiguration lc) {
this.lc = lc;
@@ -107,21 +124,39 @@
String revEngFile = getResLocation(attributes.getRevengSettings());
props.setProperty(ConfigurationXMLStrings.REVENGFILE, revEngFile);
}
+ //
+ final IPath pathPlace2Generate = isEmpty(place2Generate) ? null : new Path(getResLocation(place2Generate));
+ final IPath pathWorkspacePath = isEmpty(workspacePath) ? null : new Path(getResLocation(workspacePath));
+ //
String consoleConfigName = attributes.getConsoleConfigurationName();
ConsoleConfigurationPreferences consoleConfigPrefs =
getConsoleConfigPreferences(consoleConfigName);
final ConfigurationXMLFactory configurationXMLFactory = new ConfigurationXMLFactory(
consoleConfigPrefs, props);
+ configurationXMLFactory.setPlace2Generate(pathPlace2Generate);
+ configurationXMLFactory.setWorkspacePath(pathWorkspacePath);
Element rootConsoleConfig = configurationXMLFactory.createRoot();
//
String defaultTargetName = "hibernateAntCodeGeneration"; //$NON-NLS-1$
- Element root = DocumentFactory.getInstance().createElement(CodeGenerationStrings.PROJECT);
+ Element el, root = DocumentFactory.getInstance().createElement(CodeGenerationStrings.PROJECT);
root.addAttribute(CodeGenerationStrings.NAME, "CodeGen"); //$NON-NLS-1$
root.addAttribute(CodeGenerationStrings.DEFAULT, defaultTargetName);
//
+ if (!isEmpty(place2Generate)) {
+ el = root.addElement(CodeGenerationStrings.PROPERTY);
+ el.addAttribute(CodeGenerationStrings.NAME, varCurrentDir);
+ el.addAttribute(CodeGenerationStrings.LOCATION, getPlace2GenerateUID());
+ }
+ if (!isEmpty(workspacePath)) {
+ el = root.addElement(CodeGenerationStrings.PROPERTY);
+ el.addAttribute(CodeGenerationStrings.NAME, varWorkspaceDir);
+ el.addAttribute(CodeGenerationStrings.LOCATION, getWorkspacePathUID());
+ }
+ //
String location = getResLocation(attributes.getOutputPath());
- Element el = root.addElement(CodeGenerationStrings.PROPERTY);
- el.addAttribute(CodeGenerationStrings.NAME, "build.dir"); //$NON-NLS-1$
+ location = ConfigurationXMLFactory.makePathRelative(location, pathPlace2Generate, pathWorkspacePath);
+ el = root.addElement(CodeGenerationStrings.PROPERTY);
+ el.addAttribute(CodeGenerationStrings.NAME, varBuildDir);
el.addAttribute(CodeGenerationStrings.LOCATION, location);
//
String hibernatePropFile = null;
@@ -204,7 +239,7 @@
Element target = root.addElement(CodeGenerationStrings.TARGET);
target.addAttribute(CodeGenerationStrings.NAME, generateHibernatePropeties);
//
- hibernatePropFile = "${" + hibernatePropFile + "}"; //$NON-NLS-1$ //$NON-NLS-2$
+ hibernatePropFile = getVar(hibernatePropFile);
Element echo = target.addElement(CodeGenerationStrings.ECHO);
echo.addAttribute(CodeGenerationStrings.FILE, hibernatePropFile);
echo.addText(getPropFileContentStubUID());
@@ -231,6 +266,8 @@
} catch (URISyntaxException e) {
// ignore
}
+ strPathItem = new Path(strPathItem).toString();
+ strPathItem = ConfigurationXMLFactory.makePathRelative(strPathItem, pathPlace2Generate, pathWorkspacePath);
pathItem.addAttribute(CodeGenerationStrings.LOCATION, strPathItem);
}
//
@@ -246,7 +283,7 @@
taskdef.addAttribute(CodeGenerationStrings.CLASSPATHREF, toolslibID);
//
Element hibernatetool = target.addElement(CodeGenerationStrings.HIBERNATETOOL);
- hibernatetool.addAttribute(CodeGenerationStrings.DESTDIR, "${build.dir}"); //$NON-NLS-1$
+ hibernatetool.addAttribute(CodeGenerationStrings.DESTDIR, getVar(varBuildDir));
String templatePath = getResLocation(attributes.getTemplatePath());
if (attributes.isUseOwnTemplates()) {
hibernatetool.addAttribute(CodeGenerationStrings.TEMPLATEPATH, templatePath);
@@ -262,7 +299,7 @@
// the path there are user classes
Element classpath = hibernatetool.addElement(CodeGenerationStrings.CLASSPATH);
Element path = classpath.addElement(CodeGenerationStrings.PATH);
- path.addAttribute(CodeGenerationStrings.LOCATION, "${build.dir}"); //$NON-NLS-1$
+ path.addAttribute(CodeGenerationStrings.LOCATION, getVar(varBuildDir));
//
Map<String, Map<String, AttributeDescription>> exportersDescr =
ExportersXMLAttributeDescription.getExportersDescription();
@@ -363,8 +400,12 @@
return driverClass;
}
+ public String getVar(String str) {
+ return "${" + str + "}"; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
public void addIntoPropFileContent(StringBuilder pfc, String str) {
- pfc.append(NL + str + "=${" + str + "}"); //$NON-NLS-1$ //$NON-NLS-2$
+ pfc.append(NL + str + "=" + getVar(str)); //$NON-NLS-1$
}
public void addIntoPropFileContent(StringBuilder pfc, String name, String value) {
@@ -389,7 +430,9 @@
final IResource outputPathRes = findResource(path);
String location = path == null ? "" : path; //$NON-NLS-1$
if (outputPathRes != null) {
- location = outputPathRes.getLocation().toOSString();
+ location = outputPathRes.getLocation().toString();
+ } else {
+ location = new Path(location).toString();
}
return location;
}
@@ -406,10 +449,18 @@
return (str == null || str.length() == 0);
}
- public String getPropFileContentStubUID() {
+ public static String getPropFileContentStubUID() {
return Long.toHexString(versionUID4PropFile);
}
+ public static String getPlace2GenerateUID() {
+ return Long.toHexString(place2GenerateUID);
+ }
+
+ public static String getWorkspacePathUID() {
+ return Long.toHexString(workspacePathUID);
+ }
+
public String getPropFileContentPreSave() {
return propFileContentPreSave == null ? "" : propFileContentPreSave; //$NON-NLS-1$
}
@@ -418,8 +469,18 @@
Element rootBuildXml = createRoot();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ConfigurationXMLFactory.dump(baos, rootBuildXml);
- String res = baos.toString().replace(
- getPropFileContentStubUID(), getPropFileContentPreSave()).trim();
+ String res = baos.toString().trim();
+ //place2Generate, workspacePath
+ if (!isEmpty(place2Generate)) {
+ String location = getResLocation(place2Generate);
+ res = res.replace(location, getVar(varCurrentDir));
+ res = res.replace(getPlace2GenerateUID(), location);
+ }
+ if (!isEmpty(workspacePath)) {
+ String location = getResLocation(workspacePath);
+ res = res.replace(getWorkspacePathUID(), location);
+ }
+ res = res.replace(getPropFileContentStubUID(), getPropFileContentPreSave());
return res;
}
@@ -435,4 +496,20 @@
return externalPropFileName;
}
+ public void setPlace2Generate(String place2Generate) {
+ this.place2Generate = place2Generate;
+ }
+
+ public String getPlace2Generate() {
+ return place2Generate;
+ }
+
+ public void setWorkspacePath(String workspacePath) {
+ this.workspacePath = workspacePath;
+ }
+
+ public String getWorkspacePath() {
+ return workspacePath;
+ }
+
}
15 years, 8 months
JBoss Tools SVN: r24107 - in trunk/hibernatetools/tests/org.hibernate.eclipse.console.test: src/org/hibernate/eclipse/console/test and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: vyemialyanchyk
Date: 2010-08-12 11:46:46 -0400 (Thu, 12 Aug 2010)
New Revision: 24107
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenInternalProps_test1.xml
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenInternalProps_test2.xml
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps_test1.xml
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps_test2.xml
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test1.xml
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test2.xml
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test1.xml
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test2.xml
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6809 - fixed
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenInternalProps_test1.xml
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenInternalProps_test1.xml 2010-08-12 15:24:02 UTC (rev 24106)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenInternalProps_test1.xml 2010-08-12 15:46:46 UTC (rev 24107)
@@ -12,7 +12,7 @@
<target name="hibernateAntCodeGeneration" depends="generateHibernatePropeties">
<taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/>
<hibernatetool destdir="${build.dir}">
- <configuration configurationFile="project\src\hibernate.cfg.xml" propertyFile="${hibernatePropFile}"/>
+ <configuration configurationFile="project/src/hibernate.cfg.xml" propertyFile="${hibernatePropFile}"/>
<classpath>
<path location="${build.dir}"/>
</classpath>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenInternalProps_test2.xml
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenInternalProps_test2.xml 2010-08-12 15:24:02 UTC (rev 24106)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenInternalProps_test2.xml 2010-08-12 15:46:46 UTC (rev 24107)
@@ -12,7 +12,7 @@
<target name="hibernateAntCodeGeneration" depends="generateHibernatePropeties">
<taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/>
<hibernatetool destdir="${build.dir}">
- <configuration configurationFile="project\src\hibernate.cfg.xml" propertyFile="${hibernatePropFile}"/>
+ <configuration configurationFile="project/src/hibernate.cfg.xml" propertyFile="${hibernatePropFile}"/>
<classpath>
<path location="${build.dir}"/>
</classpath>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps_test1.xml
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps_test1.xml 2010-08-12 15:24:02 UTC (rev 24106)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps_test1.xml 2010-08-12 15:46:46 UTC (rev 24107)
@@ -4,7 +4,7 @@
<target name="hibernateAntCodeGeneration">
<taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/>
<hibernatetool destdir="${build.dir}">
- <configuration configurationFile="project\src\hibernate.cfg.xml" propertyFile="hibernate.properties"/>
+ <configuration configurationFile="project/src/hibernate.cfg.xml" propertyFile="hibernate.properties"/>
<classpath>
<path location="${build.dir}"/>
</classpath>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps_test2.xml
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps_test2.xml 2010-08-12 15:24:02 UTC (rev 24106)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps_test2.xml 2010-08-12 15:46:46 UTC (rev 24107)
@@ -4,7 +4,7 @@
<target name="hibernateAntCodeGeneration">
<taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/>
<hibernatetool destdir="${build.dir}">
- <configuration configurationFile="project\src\hibernate.cfg.xml" propertyFile="hibernate.properties"/>
+ <configuration configurationFile="project/src/hibernate.cfg.xml" propertyFile="hibernate.properties"/>
<classpath>
<path location="${build.dir}"/>
</classpath>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test1.xml
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test1.xml 2010-08-12 15:24:02 UTC (rev 24106)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test1.xml 2010-08-12 15:46:46 UTC (rev 24107)
@@ -4,7 +4,7 @@
<target name="hibernateAntCodeGeneration">
<taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/>
<hibernatetool destdir="${build.dir}">
- <jdbcconfiguration configurationFile="project\src\hibernate.cfg.xml" propertyFile="project\src\hibernate.properties" detectManyToMany="true" detectOneToOne="true" detectOptimisticLock="true" revEngFile="reslocation/test"/>
+ <jdbcconfiguration configurationFile="project/src/hibernate.cfg.xml" propertyFile="project/src/hibernate.properties" detectManyToMany="true" detectOneToOne="true" detectOptimisticLock="true" revEngFile="reslocation/test"/>
<classpath>
<path location="${build.dir}"/>
</classpath>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test2.xml
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test2.xml 2010-08-12 15:24:02 UTC (rev 24106)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test2.xml 2010-08-12 15:46:46 UTC (rev 24107)
@@ -4,7 +4,7 @@
<target name="hibernateAntCodeGeneration">
<taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/>
<hibernatetool destdir="${build.dir}">
- <jdbcconfiguration configurationFile="project\src\hibernate.cfg.xml" propertyFile="project\src\hibernate.properties" detectManyToMany="true" detectOneToOne="true" detectOptimisticLock="true" revEngFile="reslocation/test"/>
+ <jdbcconfiguration configurationFile="project/src/hibernate.cfg.xml" propertyFile="project/src/hibernate.properties" detectManyToMany="true" detectOneToOne="true" detectOptimisticLock="true" revEngFile="reslocation/test"/>
<classpath>
<path location="${build.dir}"/>
</classpath>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test1.xml
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test1.xml 2010-08-12 15:24:02 UTC (rev 24106)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test1.xml 2010-08-12 15:46:46 UTC (rev 24107)
@@ -1,10 +1,12 @@
<project name="CodeGen" default="hibernateAntCodeGeneration">
- <property name="build.dir" location="reslocation/test"/>
+ <property name="current.dir" location="project/src"/>
+ <property name="workspace.dir" location="project/src"/>
+ <property name="build.dir" location="12345678901234567890"/>
<path id="toolslib"/>
<target name="hibernateAntCodeGeneration">
<taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/>
<hibernatetool destdir="${build.dir}">
- <configuration configurationFile="project\src\hibernate.cfg.xml" propertyFile="project\src\hibernate.properties"/>
+ <configuration configurationFile="${current.dir}/hibernate.cfg.xml" propertyFile="${current.dir}/hibernate.properties"/>
<classpath>
<path location="${build.dir}"/>
</classpath>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test2.xml
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test2.xml 2010-08-12 15:24:02 UTC (rev 24106)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test2.xml 2010-08-12 15:46:46 UTC (rev 24107)
@@ -1,10 +1,12 @@
<project name="CodeGen" default="hibernateAntCodeGeneration">
- <property name="build.dir" location="reslocation/test"/>
+ <property name="current.dir" location="project/src"/>
+ <property name="workspace.dir" location="project/src"/>
+ <property name="build.dir" location="12345678901234567890"/>
<path id="toolslib"/>
<target name="hibernateAntCodeGeneration">
<taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/>
<hibernatetool destdir="${build.dir}">
- <configuration configurationFile="project\src\hibernate.cfg.xml" propertyFile="project\src\hibernate.properties"/>
+ <configuration configurationFile="${current.dir}/hibernate.cfg.xml" propertyFile="${current.dir}/hibernate.properties"/>
<classpath>
<path location="${build.dir}"/>
</classpath>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java 2010-08-12 15:24:02 UTC (rev 24106)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java 2010-08-12 15:46:46 UTC (rev 24107)
@@ -51,13 +51,13 @@
public static final String LN_1 = "\n"; //$NON-NLS-1$
public static final String LN_2 = "\r\n"; //$NON-NLS-1$
- public static final String SAMPLE_PATH = "res/sample/".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$
- public static final String PROJECT_LIB_PATH = "res/project/lib/".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final String SAMPLE_PATH = "res/sample/".replace('/', IPath.SEPARATOR); //$NON-NLS-1$
+ public static final String PROJECT_LIB_PATH = "res/project/lib/".replace('/', IPath.SEPARATOR); //$NON-NLS-1$
public static final String HBMTEMPLATE0 = "hbm2java"; //$NON-NLS-1$
public static final String HBMTEMPLATE0_PROPERTIES = HibernateLaunchConstants.ATTR_EXPORTERS
+ '.' + HBMTEMPLATE0 + ".properties"; //$NON-NLS-1$
- public static final String OUTDIR_PATH = "outputdir/test"; //$NON-NLS-1$
+ public static final String OUTDIR_PATH = "outputdir/test".replace('/', IPath.SEPARATOR); //$NON-NLS-1$
public class TestConsoleConfigPref extends TestConsoleConfigurationPreferences {
public File getConfigXMLFile() {
@@ -131,6 +131,7 @@
public enum ETestCase {
simple,
+ relative,
jpa,
properties,
nullable,
@@ -149,6 +150,8 @@
ConsoleConfigurationPreferences pref = null;
if (testCase == ETestCase.simple) {
pref = new TestConsoleConfigPref();
+ } else if (testCase == ETestCase.relative) {
+ pref = new TestConsoleConfigPref();
} else if (testCase == ETestCase.jpa) {
pref = new TestConsoleConfigPref2();
} else if (testCase == ETestCase.properties) {
@@ -162,7 +165,10 @@
}
public String getResLocation(String path) {
- return "reslocation/test"; //$NON-NLS-1$
+ if (testCase == ETestCase.relative) {
+ return super.getResLocation(path);
+ }
+ return new Path("reslocation/test").toString(); //$NON-NLS-1$
}
public IConnectionProfile getConnectionProfile(String connProfileName) {
@@ -189,17 +195,7 @@
return driverClass;
}
}
-
- public class CodeGenXMLFactory4Test2 extends CodeGenXMLFactory4Test {
- public CodeGenXMLFactory4Test2(ILaunchConfiguration lc, ETestCase testCase) {
- super(lc, testCase);
- }
- public ConsoleConfigurationPreferences getConsoleConfigPreferences(String consoleConfigName) {
- return new TestConsoleConfigPref2();
- }
- }
-
public void testCodeGenXMLFactoryRevengAll() {
CodeGenXMLFactory codeGenFactory = codeGenXMLFactory(true, true, ETestCase.simple);
String codeGen = codeGenFactory.createCodeGenXML();
@@ -219,7 +215,12 @@
}
public void testCodeGenXMLFactoryAll() {
- CodeGenXMLFactory codeGenFactory = codeGenXMLFactory(false, true, ETestCase.simple);
+ CodeGenXMLFactory codeGenFactory = codeGenXMLFactory(false, true, ETestCase.relative);
+ //
+ String strPlace = "project/src".replace('/', IPath.SEPARATOR); //$NON-NLS-1$
+ codeGenFactory.setPlace2Generate(strPlace);
+ codeGenFactory.setWorkspacePath(strPlace);
+ //
String codeGen = codeGenFactory.createCodeGenXML();
String codeGenProperties = codeGenFactory.getPropFileContentPreSave();
String sample = getSample("AntCodeGen_test1.xml"); //$NON-NLS-1$
@@ -228,7 +229,12 @@
}
public void testCodeGenXMLFactoryOne() {
- CodeGenXMLFactory codeGenFactory = codeGenXMLFactory(false, false, ETestCase.simple);
+ CodeGenXMLFactory codeGenFactory = codeGenXMLFactory(false, false, ETestCase.relative);
+ //
+ String strPlace = "project/src".replace('/', IPath.SEPARATOR); //$NON-NLS-1$
+ codeGenFactory.setPlace2Generate(strPlace);
+ codeGenFactory.setWorkspacePath(strPlace);
+ //
String codeGen = codeGenFactory.createCodeGenXML();
String codeGenProperties = codeGenFactory.getPropFileContentPreSave();
String sample = getSample("AntCodeGen_test2.xml"); //$NON-NLS-1$
@@ -327,10 +333,11 @@
try {
URI uri = new File("").toURL().toURI(); //$NON-NLS-1$
repl = (new File(uri)).getPath();
+ repl = (new Path(repl)).toString();
} catch (MalformedURLException e) {
} catch (URISyntaxException e) {
}
- return codeGen.replace(repl + File.separator, ""); //$NON-NLS-1$
+ return codeGen.replace(repl + IPath.SEPARATOR, ""); //$NON-NLS-1$
}
public CodeGenXMLFactory codeGenXMLFactory(boolean reveng, boolean exportersAll, ETestCase testCase) {
15 years, 8 months
JBoss Tools SVN: r24106 - in trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui: views and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: bfitzpat
Date: 2010-08-12 11:24:02 -0400 (Thu, 12 Aug 2010)
New Revision: 24106
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java
Log:
OPEN - issue JBIDE-6797: Web Service Tester: Add menu item "OPTIONS" for JAX-RS
https://jira.jboss.org/browse/JBIDE-6797
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-08-12 15:16:49 UTC (rev 24105)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-08-12 15:24:02 UTC (rev 24106)
@@ -112,6 +112,7 @@
JAXRSWSTestView2_GetFromWSDL_Tooltip=Get from WSDL
JAXRSWSTestView2_Go_Tooltip=Invoke
JAXRSWSTestView2_Headers_Section=Headers
+JAXRSWSTestView2_Msg_No_Results_Check_Headers=No textual results to display. Check Response Headers list.
JAXRSWSTestView2_OpenInEditor_Action=Open in Editor
JAXRSWSTestView2_Parameters_Section=Parameters
JAXRSWSTestView2_RequestDetails_Section=Request Details
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-08-12 15:16:49 UTC (rev 24105)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-08-12 15:24:02 UTC (rev 24106)
@@ -143,6 +143,7 @@
public static String JAXRSWSTestView2_GetFromWSDL_Tooltip;
public static String JAXRSWSTestView2_Go_Tooltip;
public static String JAXRSWSTestView2_Headers_Section;
+ public static String JAXRSWSTestView2_Msg_No_Results_Check_Headers;
public static String JAXRSWSTestView2_OpenInEditor_Action;
public static String JAXRSWSTestView2_Parameters_Section;
public static String JAXRSWSTestView2_RequestDetails_Section;
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java 2010-08-12 15:16:49 UTC (rev 24105)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java 2010-08-12 15:24:02 UTC (rev 24106)
@@ -130,6 +130,7 @@
private static final String PUT = "PUT";//$NON-NLS-1$
private static final String POST = "POST";//$NON-NLS-1$
private static final String GET = "GET";//$NON-NLS-1$
+ private static final String OPTIONS = "OPTIONS";//$NON-NLS-1$
private static final String JAX_WS = "JAX-WS"; //$NON-NLS-1$
private static final String JAX_RS = "JAX-RS"; //$NON-NLS-1$
private static final String EMPTY_STRING = ""; //$NON-NLS-1$
@@ -577,7 +578,7 @@
CoolItem wsMethodCoolItem = new CoolItem(coolBar, SWT.PUSH | SWT.FLAT);
methodCombo = new Combo(coolBar, SWT.BORDER | SWT.READ_ONLY);
methodCombo.setBackground(form.getBody().getBackground());
- String[] methods = {JAX_WS, GET, POST, PUT, DELETE};
+ String[] methods = {JAX_WS, GET, POST, PUT, DELETE, OPTIONS};
methodCombo.setItems(methods);
methodCombo.pack();
Point size = methodCombo.computeSize (SWT.DEFAULT, SWT.DEFAULT);
@@ -641,6 +642,12 @@
sectionClient.setLayout(new GridLayout());
sectionClient.setLayoutData(new GridData());
+ useBasicAuthCB = toolkit.createButton(sectionClient,
+ JBossWSUIMessages.JAXRSWSTestView2_Checkbox_Basic_Authentication, SWT.CHECK);
+ GridData gd10 = new GridData(SWT.FILL, SWT.NONE, true, false);
+ gd10.horizontalIndent = 3;
+ useBasicAuthCB.setLayoutData(gd10);
+
ExpandableComposite ec = toolkit.createExpandableComposite(sectionClient,
ExpandableComposite.TREE_NODE| ExpandableComposite.TITLE_BAR |
ExpandableComposite.CLIENT_INDENT);
@@ -705,11 +712,6 @@
ec5.setLayoutData(gd9);
ec5.addExpansionListener(new FormExpansionAdapter());
- useBasicAuthCB = toolkit.createButton(sectionClient,
- JBossWSUIMessages.JAXRSWSTestView2_Checkbox_Basic_Authentication, SWT.CHECK);
- GridData gd10 = new GridData(SWT.FILL, SWT.NONE, true, false);
- useBasicAuthCB.setLayoutData(gd10);
-
section.addExpansionListener(new FormExpansionAdapter());
section.setClient(sectionClient);
}
@@ -1064,7 +1066,8 @@
*/
private void setControlsForMethodType ( String methodType ) {
if (getCurrentTestType().equalsIgnoreCase(JAX_RS) &&
- methodType.equalsIgnoreCase(GET)) {
+ (methodType.equalsIgnoreCase(GET) ||
+ methodType.equalsIgnoreCase(OPTIONS))) {
bodyText.setEnabled(false);
} else {
bodyText.setEnabled(true);
@@ -1231,6 +1234,13 @@
}
}
getCurrentHistoryEntry().setResultHeadersList(headers);
+ if (JAXRSWSTestView2.this.resultsText.getText().trim().length() == 0) {
+ if (headers != null && headers.length > 0) {
+ JAXRSWSTestView2.this.resultsText.setText(
+ JBossWSUIMessages.JAXRSWSTestView2_Msg_No_Results_Check_Headers);
+ JAXRSWSTestView2.this.form.reflow(true);
+ }
+ }
history.getEntries().add(getCurrentHistoryEntry());
}
});
15 years, 8 months