May 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r31332 - in trunk/freemarker: features and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-05-16 09:14:24 -0400 (Mon, 16 May 2011) New Revision: 31332 Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/pom.xml trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/pom.xml trunk/freemarker/features/pom.xml trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/pom.xml trunk/freemarker/plugins/pom.xml trunk/freemarker/pom.xml trunk/freemarker/site/pom.xml trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml trunk/freemarker/tests/pom.xml Log: https://issues.jboss.org/browse/JBIDE-8518 fix pom.xml files in JBT and JBDS repo such that only component root poms reference parent pom (all others just look up to .. for parent) moved parent/pom.xml reference to component's root pom.xml fixed maven repo structure Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/pom.xml =================================================================== --- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -2,12 +2,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.freemarker</groupId> + <artifactId>features</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.freemarker</groupId> + <groupId>org.jboss.tools.freemarker.features</groupId> <artifactId>org.jboss.ide.eclipse.freemarker.feature</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> -</project> \ No newline at end of file +</project> Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/pom.xml =================================================================== --- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -2,12 +2,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.freemarker</groupId> + <artifactId>features</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.freemarker</groupId> + <groupId>org.jboss.tools.freemarker.features</groupId> <artifactId>org.jboss.ide.eclipse.freemarker.test.feature</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> -</project> \ No newline at end of file +</project> Modified: trunk/freemarker/features/pom.xml =================================================================== --- trunk/freemarker/features/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/features/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -1,9 +1,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>freemarker</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.freemarker</groupId> - <artifactId>org.jboss.tools.freemarker.features</artifactId> + <artifactId>features</artifactId> <version>0.0.1-SNAPSHOT</version> + <name>freemarker.features</name> <packaging>pom</packaging> <modules> <module>org.jboss.ide.eclipse.freemarker.feature</module> Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/pom.xml =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -2,12 +2,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.freemarker</groupId> + <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.freemarker</groupId> + <groupId>org.jboss.tools.freemarker.plugins</groupId> <artifactId>org.jboss.ide.eclipse.freemarker</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> -</project> \ No newline at end of file +</project> Modified: trunk/freemarker/plugins/pom.xml =================================================================== --- trunk/freemarker/plugins/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/plugins/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -1,9 +1,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>freemarker</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.freemarker</groupId> - <artifactId>org.jboss.tools.freemarker.plugins</artifactId> + <artifactId>plugins</artifactId> <version>0.0.1-SNAPSHOT</version> + <name>freemarker.plugins</name> <packaging>pom</packaging> <modules> <module>org.jboss.ide.eclipse.freemarker</module> Modified: trunk/freemarker/pom.xml =================================================================== --- trunk/freemarker/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -2,9 +2,16 @@ 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.2-SNAPSHOT</version> + <relativePath>../build/parent/pom.xml</relativePath> + </parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.freemarker.all</artifactId> + <artifactId>freemarker</artifactId> <version>0.0.1-SNAPSHOT</version> + <name>freemarker.all</name> <packaging>pom</packaging> <modules> <module>plugins</module> Modified: trunk/freemarker/site/pom.xml =================================================================== --- trunk/freemarker/site/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/site/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -3,11 +3,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <artifactId>freemarker</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.freemarker</groupId> - <artifactId>org.jboss.tools.freemarker.freemarker.site</artifactId> + <artifactId>freemarker.site</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> -</project> \ No newline at end of file +</project> Modified: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml =================================================================== --- trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -2,11 +2,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.freemarker</groupId> + <artifactId>tests</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.freemarker</groupId> + <groupId>org.jboss.tools.freemarker.tests</groupId> <artifactId>org.jboss.ide.eclipse.freemarker.test</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -14,4 +14,4 @@ <emma.filter>org.jboss.ide.eclipse.freemarker*</emma.filter> <emma.instrument.bundles>org.jboss.ide.eclipse.freemarker</emma.instrument.bundles> </properties> -</project> \ No newline at end of file +</project> Modified: trunk/freemarker/tests/pom.xml =================================================================== --- trunk/freemarker/tests/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/tests/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -1,9 +1,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>freemarker</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.freemarker</groupId> - <artifactId>org.jboss.tools.freemarker.tests</artifactId> + <artifactId>tests</artifactId> <version>0.0.1-SNAPSHOT</version> + <name>freemarker.tests</name> <packaging>pom</packaging> <modules> <module>org.jboss.ide.eclipse.freemarker.test</module>

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r31331 - trunk/download.jboss.org/jbosstools/updates/indigo/M7.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-05-16 08:16:45 -0400 (Mon, 16 May 2011) New Revision: 31331 Modified: trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml Log: bump M7 composite to use newer Orbit; add svnkit to svn provider sites Modified: trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml 2011-05-16 12:16:24 UTC (rev 31330) +++ trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml 2011-05-16 12:16:45 UTC (rev 31331) @@ -12,7 +12,7 @@ endfun nnoremap <Leader>ts :call ReplaceTimestamp()<CR> --> -<property name='p2.timestamp' value='1305086482000'/> +<property name='p2.timestamp' value='1305546447000'/> </properties> <children size='20'> <child location='../../requirements/indigo/201105060900-M7/'/> @@ -22,6 +22,7 @@ <child location='../../requirements/webtools/3.3M7/'/> <child location='../../requirements/m2eclipse/0.13.0.201105091504/'/> <child location='../../requirements/mylyn/3.6-I20110504-0744/'/> +<child location='../../requirements/orbit/S20110515001817/'/> <child location='../../requirements/ecf/3.5/'/> <child location='../../requirements/egit/0.11/'/> @@ -29,12 +30,11 @@ <child location='../../requirements/gwt/201102111811/'/> <child location='../../requirements/jslint/1.5/'/> -<child location='../../requirements/orbit/S20110124210048/'/> <child location='../../requirements/pmd/3.2.6/'/> <child location='../../requirements/springide/2.6.0.201103160035/'/> -<child location='../../requirements/subclipse/1.6/'/> -<child location='../../requirements/subversive/0.7.9_2.2.2/'/> +<child location='../../requirements/subclipse/1.6_1.3/'/> +<child location='../../requirements/subversive/0.7.9_2.2.2_1.3/'/> <child location='../../requirements/swtbot/2.0.4/'/> <child location='../../requirements/testng/6.0.1.20110418_1444/'/> <child location='../../requirements/xulrunner-1.9.2/'/> Modified: trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml 2011-05-16 12:16:24 UTC (rev 31330) +++ trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml 2011-05-16 12:16:45 UTC (rev 31331) @@ -12,7 +12,7 @@ endfun nnoremap <Leader>ts :call ReplaceTimestamp()<CR> --> -<property name='p2.timestamp' value='1305086482000'/> +<property name='p2.timestamp' value='1305546447000'/> </properties> <children size='20'> <child location='../../requirements/indigo/201105060900-M7/'/> @@ -22,6 +22,7 @@ <child location='../../requirements/webtools/3.3M7/'/> <child location='../../requirements/m2eclipse/0.13.0.201105091504/'/> <child location='../../requirements/mylyn/3.6-I20110504-0744/'/> +<child location='../../requirements/orbit/S20110515001817/'/> <child location='../../requirements/ecf/3.5/'/> <child location='../../requirements/egit/0.11/'/> @@ -29,12 +30,11 @@ <child location='../../requirements/gwt/201102111811/'/> <child location='../../requirements/jslint/1.5/'/> -<child location='../../requirements/orbit/S20110124210048/'/> <child location='../../requirements/pmd/3.2.6/'/> <child location='../../requirements/springide/2.6.0.201103160035/'/> -<child location='../../requirements/subclipse/1.6/'/> -<child location='../../requirements/subversive/0.7.9_2.2.2/'/> +<child location='../../requirements/subclipse/1.6_1.3/'/> +<child location='../../requirements/subversive/0.7.9_2.2.2_1.3/'/> <child location='../../requirements/swtbot/2.0.4/'/> <child location='../../requirements/testng/6.0.1.20110418_1444/'/> <child location='../../requirements/xulrunner-1.9.2/'/>

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r31330 - trunk/download.jboss.org/jbosstools/updates/indigo.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-05-16 08:16:24 -0400 (Mon, 16 May 2011) New Revision: 31330 Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml Log: remove M6 from composite indigo site (now use M7 only) Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-05-16 12:16:01 UTC (rev 31329) +++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-05-16 12:16:24 UTC (rev 31330) @@ -12,10 +12,10 @@ endfun nnoremap <Leader>ts :call ReplaceTimestamp()<CR> --> -<property name='p2.timestamp' value='1304967283000'/> +<property name='p2.timestamp' value='1305546768000'/> </properties> -<children size='2'> -<child location='M6/'/> +<children size='1'> + <child location='M7/'/> </children> </repository> Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-05-16 12:16:01 UTC (rev 31329) +++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-05-16 12:16:24 UTC (rev 31330) @@ -12,10 +12,10 @@ endfun nnoremap <Leader>ts :call ReplaceTimestamp()<CR> --> -<property name='p2.timestamp' value='1304967283000'/> +<property name='p2.timestamp' value='1305546771000'/> </properties> -<children size='2'> -<child location='M6/'/> +<children size='1'> + <child location='M7/'/> </children> </repository>

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r31329 - trunk/download.jboss.org/jbosstools/updates/requirements/orbit.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-05-16 08:16:01 -0400 (Mon, 16 May 2011) New Revision: 31329 Added: trunk/download.jboss.org/jbosstools/updates/requirements/orbit/build.xml Modified: trunk/download.jboss.org/jbosstools/updates/requirements/orbit/index.html Log: fetch newer orbit mirror Added: trunk/download.jboss.org/jbosstools/updates/requirements/orbit/build.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/orbit/build.xml (rev 0) +++ trunk/download.jboss.org/jbosstools/updates/requirements/orbit/build.xml 2011-05-16 12:16:01 UTC (rev 31329) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project default="mirror"> +  + <target name="mirror"> + <property name="URL1" value="http://download.eclipse.org/tools/orbit/downloads/drops/S20110515001817/r..." /> + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/orbit/S20110515001817/" /> + <property name="compress" value="true" /> + + <p2.mirror> + <repository location="file:${destination}/S20110515001817" name="orbit plugins for Eclipse 3.6 - 3.7" /> + <source> + <repository location="${URL1}" /> + </source> + + <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" /> + </p2.mirror> + + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/S20110515001817/" artifactRepository="file:${destination}/S20110515001817/" publishartifacts="true" source="${destination}/S20110515001817/" compress="${compress}" /> + </target> +</project> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/orbit/index.html =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/orbit/index.html 2011-05-16 12:15:32 UTC (rev 31328) +++ trunk/download.jboss.org/jbosstools/updates/requirements/orbit/index.html 2011-05-16 12:16:01 UTC (rev 31329) @@ -46,8 +46,9 @@ --> <ul> +<li><a class=link href=S20110515001817>S20110515001817</a> </li> +<li><a class=link href=S20110124210048>S20110124210048</a> </li> <li><a class=link href=R20100519200754>R20100519200754</a> </li> -<li><a class=link href=S20110124210048>S20110124210048</a> </li> </ul> </td>

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r31328 - in trunk/download.jboss.org/jbosstools/updates/requirements: subversive and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-05-16 08:15:32 -0400 (Mon, 16 May 2011) New Revision: 31328 Modified: trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build.xml trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/index.... trunk/download.jboss.org/jbosstools/updates/requirements/subversive/build... trunk/download.jboss.org/jbosstools/updates/requirements/subversive/index... Log: add svnkit to subclipse and subversive sites Modified: trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build.xml 2011-05-16 10:10:08 UTC (rev 31327) +++ trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build.xml 2011-05-16 12:15:32 UTC (rev 31328) @@ -16,20 +16,22 @@ -f ~/RHDS/updates/requirements/subclipse/build.xml -Ddestination=/tmp/subclipse-repo --> <target name="mirror"> - <property name="URL" value="http://subclipse.tigris.org/update_1.6.x" /> - + <property name="URL1" value="http://subclipse.tigris.org/update_1.6.x" /> + <property name="URL2" value="http://eclipse.svnkit.com/1.3.x/" /> + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/subclipse/" /> <property name="compress" value="true" /> <p2.mirror> - <repository location="file:${destination}/1.6/" name="Subclipse + SVNKit plugins for Eclipse 3.6 - 3.7" /> + <repository location="file:${destination}/1.6_1.3/" name="Subclipse 1.6 + SVNKit 1.3 plugins for Eclipse 3.6 - 3.7" /> <source> - <repository location="${URL}" /> + <repository location="${URL1}" /> + <repository location="${URL2}" /> </source> <slicingOptions includeFeatures="true" followStrict="true" /> </p2.mirror> - <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.6/" artifactRepository="file:${destination}/1.6/" publishartifacts="true" source="${destination}/1.6/" compress="${compress}" /> + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.6_1.3/" artifactRepository="file:${destination}/1.6_1.3/" publishartifacts="true" source="${destination}/1.6_1.3/" compress="${compress}" /> </target> </project> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/index.... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/index.... 2011-05-16 10:10:08 UTC (rev 31327) +++ trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/index.... 2011-05-16 12:15:32 UTC (rev 31328) @@ -46,7 +46,7 @@ --> <ul> -<li><a class=link href=1.6>1.6</a> </li> +<li><a class=link href=1.6_1.3>1.6_1.3</a> </li> </ul> </td> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/subversive/build... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/subversive/build... 2011-05-16 10:10:08 UTC (rev 31327) +++ trunk/download.jboss.org/jbosstools/updates/requirements/subversive/build... 2011-05-16 12:15:32 UTC (rev 31328) @@ -17,23 +17,25 @@ --> <target name="mirror"> <property name="URL1" value="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..." /> - <property name="URL2" value="http://download.eclipse.org/technology/subversive/0.7/weekly-site/" /> + <property name="URL2" value="http://download.eclipse.org/technology/subversive/0.7/indigo-site/" /> <property name="URL3" value="http://download.eclipse.org/technology/subversive/0.7/pde-update-site/" /> + <property name="URL4" value="http://eclipse.svnkit.com/1.3.x/" /> <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/subversive/" /> <property name="compress" value="true" /> <p2.mirror> - <repository location="file:${destination}/0.7.9_2.2.2/" name="Subversive Team/PDE Providers 0.7.9 + Subversive Connectors 2.2.2 for Eclipse 3.6" /> + <repository location="file:${destination}/0.7.9_2.2.2_1.3/" name="Subversive Team/PDE Providers 0.7.9 + Subversive Connectors 2.2.2 + SVNKit 1.3 plugins for Eclipse 3.6" /> <source> <repository location="${URL1}" /> <repository location="${URL2}" /> <repository location="${URL3}" /> + <repository location="${URL4}" /> </source> <slicingOptions includeFeatures="true" followStrict="true" /> </p2.mirror> - <p2.publish.featuresAndBundles metadataRepository="file:${destination}/0.7.9_2.2.2/" artifactRepository="file:${destination}/0.7.9_2.2.2/" publishartifacts="true" source="${destination}/0.7.9_2.2.2/" compress="${compress}" /> + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/0.7.9_2.2.2_1.3/" artifactRepository="file:${destination}/0.7.9_2.2.2_1.3/" publishartifacts="true" source="${destination}/0.7.9_2.2.2_1.3/" compress="${compress}" /> </target> </project> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/subversive/index... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/subversive/index... 2011-05-16 10:10:08 UTC (rev 31327) +++ trunk/download.jboss.org/jbosstools/updates/requirements/subversive/index... 2011-05-16 12:15:32 UTC (rev 31328) @@ -46,7 +46,7 @@ --> <ul> -<li><a class=link href=0.7.9_2.2.2>0.7.9_2.2.2</a> </li> +<li><a class=link href=0.7.9_2.2.2_1.3>0.7.9_2.2.2_1.3</a> </li> </ul> </td>

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r31327 - trunk/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-05-16 06:10:08 -0400 (Mon, 16 May 2011) New Revision: 31327 Modified: trunk/build/target-platform/jbds.target Log: switch to Hudson path to see if local access works when http:// won't Modified: trunk/build/target-platform/jbds.target =================================================================== --- trunk/build/target-platform/jbds.target 2011-05-16 09:35:32 UTC (rev 31326) +++ trunk/build/target-platform/jbds.target 2011-05-16 10:10:08 UTC (rev 31327) @@ -11,7 +11,8 @@  - <repository location="http://download.jboss.org/jbosstools/updates/indigo/M7/"/> +  + <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/M7/"/>  <unit id="javax.wsdl" version="1.6.2.v201012040545"/>

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r31326 - trunk/build/parent.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-05-16 05:35:32 -0400 (Mon, 16 May 2011) New Revision: 31326 Modified: trunk/build/parent/pom.xml Log: bump defaults to M7 Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2011-05-16 09:22:34 UTC (rev 31325) +++ trunk/build/parent/pom.xml 2011-05-16 09:35:32 UTC (rev 31326) @@ -32,7 +32,7 @@ <jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l...</jbosstools-target-site>  - <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo/e37M6-wtp33M6.target/</local.site> + <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo/e37M7-wtp33M7.target/</local.site>  <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</jbosstools-nightly-staging-composite> @@ -41,7 +41,7 @@ <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/3.3.indigo/</local.composite>  - <jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/M6/</jboss-requirements-composite-mirror> + <jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/M7/</jboss-requirements-composite-mirror>  <local.requirements>file:///qa/services/http/binaries/RHDS/updates/indigo/</local.requirements>

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r31325 - in trunk/jsf: plugins/org.jboss.tools.jsf.text.ext/META-INF and 9 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-05-16 05:22:34 -0400 (Mon, 16 May 2011) New Revision: 31325 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.verification/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.MF Log: switch jsf cmponent to JavaSE-1.6 only Modified: trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2011-05-16 07:31:25 UTC (rev 31324) +++ trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2011-05-16 09:22:34 UTC (rev 31325) @@ -66,5 +66,5 @@ org.jboss.tools.jst.jsp;bundle-version="3.2.0" Bundle-Version: 3.3.0.qualifier Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.jboss.tools.jst.jsp.bundle Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF 2011-05-16 07:31:25 UTC (rev 31324) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF 2011-05-16 09:22:34 UTC (rev 31325) @@ -19,4 +19,4 @@ Export-Package: org.jboss.tools.jsf.text.ext, org.jboss.tools.jsf.text.ext.hyperlink Bundle-Version: 3.3.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFEST.MF 2011-05-16 07:31:25 UTC (rev 31324) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFEST.MF 2011-05-16 09:22:34 UTC (rev 31325) @@ -15,4 +15,4 @@ Export-Package: org.jboss.tools.jsf.text.ext.facelets, org.jboss.tools.jsf.text.ext.facelets.hyperlink Bundle-Version: 3.3.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/META-INF/MANIFEST.MF 2011-05-16 07:31:25 UTC (rev 31324) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/META-INF/MANIFEST.MF 2011-05-16 09:22:34 UTC (rev 31325) @@ -20,4 +20,4 @@ Export-Package: org.jboss.tools.jsf.text.ext.richfaces, org.jboss.tools.jsf.text.ext.richfaces.hyperlink Bundle-Version: 3.3.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF 2011-05-16 07:31:25 UTC (rev 31324) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF 2011-05-16 09:22:34 UTC (rev 31325) @@ -60,4 +60,4 @@ org.eclipse.wst.xml.ui;bundle-version="1.1.200" Bundle-Version: 3.3.0.qualifier Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.verification/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.verification/META-INF/MANIFEST.MF 2011-05-16 07:31:25 UTC (rev 31324) +++ trunk/jsf/plugins/org.jboss.tools.jsf.verification/META-INF/MANIFEST.MF 2011-05-16 09:22:34 UTC (rev 31325) @@ -9,5 +9,5 @@ Bundle-Version: 3.1.0.qualifier Export-Package: org.jboss.tools.jsf.verification.vrules, org.jboss.tools.jsf.verification.vrules.toview -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-05-16 07:31:25 UTC (rev 31324) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-05-16 09:22:34 UTC (rev 31325) @@ -39,5 +39,5 @@ Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.jboss.tools.jst.jsp.contentassist Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF 2011-05-16 07:31:25 UTC (rev 31324) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF 2011-05-16 09:22:34 UTC (rev 31325) @@ -28,4 +28,4 @@ Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.jsf.text.ext.test Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF 2011-05-16 07:31:25 UTC (rev 31324) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF 2011-05-16 09:22:34 UTC (rev 31325) @@ -14,7 +14,7 @@ org.eclipse.swtbot.junit4_x;bundle-version="2.0.0", org.jboss.tools.ui.bot.ext Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.jboss.tools.ui.bot.test, org.jboss.tools.vpe.ui.bot.test Export-Package: org.jboss.tools.jsf.ui.bot.test, Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2011-05-16 07:31:25 UTC (rev 31324) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2011-05-16 09:22:34 UTC (rev 31325) @@ -33,4 +33,4 @@ org.eclipse.gef, org.eclipse.pde.ui Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.MF 2011-05-16 07:31:25 UTC (rev 31324) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.MF 2011-05-16 09:22:34 UTC (rev 31325) @@ -20,4 +20,4 @@ org.jboss.tools.common.verification.test, org.eclipse.jst.standard.schemas Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r31324 - in trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core: data and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2011-05-16 03:31:25 -0400 (Mon, 16 May 2011) New Revision: 31324 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java Log: JBIDE-7922: WSDL should be read once Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2011-05-15 09:00:37 UTC (rev 31323) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2011-05-16 07:31:25 UTC (rev 31324) @@ -6,9 +6,6 @@ import java.util.Map; import javax.wsdl.Definition; -import javax.wsdl.WSDLException; -import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLReader; import javax.xml.namespace.QName; import org.eclipse.core.commands.ExecutionException; @@ -177,22 +174,16 @@ protected String[] getServiceNameFromWSDL() { String[] names = new String[2]; - try { - WSDLFactory factory = WSDLFactory.newInstance(); - WSDLReader wsdlReader = factory.newWSDLReader(); - Definition def = wsdlReader.readWSDL(model.getWsdlURI()); - Map<?, ?> services = def.getServices(); - if (services != null) { - QName[] a = new QName[services.keySet().size()]; - if (a != null && a.length > 0) { - services.keySet().toArray(a); - names[0] = a[0].getLocalPart(); - } + Definition def = model.getWsdlDefinition(); + Map<?, ?> services = def.getServices(); + if (services != null) { + QName[] a = new QName[services.keySet().size()]; + if (a != null && a.length > 0) { + services.keySet().toArray(a); + names[0] = a[0].getLocalPart(); } - names[1] = def.getTargetNamespace(); - } catch (WSDLException e) { - e.printStackTrace(); } + names[1] = def.getTargetNamespace(); return names; } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java 2011-05-15 09:00:37 UTC (rev 31323) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java 2011-05-16 07:31:25 UTC (rev 31324) @@ -11,6 +11,9 @@ package org.jboss.tools.ws.creation.core.commands; +import javax.wsdl.Definition; +import javax.wsdl.WSDLException; + import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; @@ -69,8 +72,14 @@ model.setTarget(JBossWSCreationCoreMessages.Value_Target_0); if (scenario == WebServiceScenario.CLIENT) { model.setWsdlURI(wsClient.getWebServiceClientInfo().getWsdlURL()); + Definition definition = null; + try { + definition = JBossWSCreationUtils.readWSDL(model.getWsdlURI()); + } catch (WSDLException e) { + return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Read_WSDL); + } + model.setWsdlDefinition(definition); model.setCustomPackage(""); //$NON-NLS-1$ - } return Status.OK_STATUS; Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java 2011-05-15 09:00:37 UTC (rev 31323) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java 2011-05-16 07:31:25 UTC (rev 31324) @@ -1,5 +1,8 @@ package org.jboss.tools.ws.creation.core.commands; +import javax.wsdl.Definition; +import javax.wsdl.WSDLException; + import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; @@ -51,6 +54,13 @@ model.setTarget(JBossWSCreationCoreMessages.Value_Target_0); if (scenario == WebServiceScenario.TOPDOWN) { model.setWsdlURI(ws.getWebServiceInfo().getWsdlURL()); + Definition definition = null; + try { + definition = JBossWSCreationUtils.readWSDL(model.getWsdlURI()); + } catch (WSDLException e) { + return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Read_WSDL); + } + model.setWsdlDefinition(definition); model.setCustomPackage(""); //$NON-NLS-1$ } else { model.addServiceClasses(ws.getWebServiceInfo().getImplURL()); @@ -60,7 +70,6 @@ } public ServiceModel getWebServiceDataModel() { - return model; } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java 2011-05-15 09:00:37 UTC (rev 31323) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java 2011-05-16 07:31:25 UTC (rev 31324) @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import javax.wsdl.Definition; + public class ServiceModel { private String webProjectName; @@ -22,6 +24,7 @@ private String applicationClassName; private String applicationName; private String javaSourceFolder; + private Definition wsdlDefinition; public int getWsScenario() { return wsScenario; @@ -176,4 +179,13 @@ public void setJavaSourceFolder(String javaSourceFolder) { this.javaSourceFolder = javaSourceFolder; } + + + public Definition getWsdlDefinition() { + return wsdlDefinition; + } + + public void setWsdlDefinition(Definition wsdlDefinition) { + this.wsdlDefinition = wsdlDefinition; + } } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2011-05-15 09:00:37 UTC (rev 31323) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2011-05-16 07:31:25 UTC (rev 31324) @@ -40,6 +40,7 @@ Error_No_Package=The service implementation selected does not follow Java naming conventions. This may result in not being able to generate your WebService. Error_JBossWS_GenerateWizard_WSName_Same=The Web Service Name has been used in the web.xml of the web project. Do you want to overwrite it? Error_JBossWS_GenerateWizard_WSImpl_Overwrite=The Web Service implementation classes have been there. Do you want to overwrite them? +Error_Read_WSDL=Can't read the WSDL file from the URI RestEasyLibUtils_Error_UnableToFindRuntimeForProject=Unable to find runtime associated with selected project. RSMergeWebXMLCommand_REST_App_Exists=Rest Application exists with same name RSMergeWebXMLCommand_REST_Servlet_Exists=RestEasy servlet already exists. Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2011-05-15 09:00:37 UTC (rev 31323) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2011-05-16 07:31:25 UTC (rev 31324) @@ -46,6 +46,7 @@ public static String Error_Message_No_Runtime_Specified; public static String Error_JBossWS_GenerateWizard_WSName_Same; public static String Error_JBossWS_GenerateWizard_WSImpl_Overwrite; + public static String Error_Read_WSDL; public static String RestEasyLibUtils_Error_UnableToFindRuntimeForProject; Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2011-05-15 09:00:37 UTC (rev 31323) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2011-05-16 07:31:25 UTC (rev 31324) @@ -29,6 +29,11 @@ import java.util.List; import java.util.Locale; +import javax.wsdl.Definition; +import javax.wsdl.WSDLException; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -597,5 +602,12 @@ } return path; } + + public static Definition readWSDL(String wsdlURL) throws WSDLException{ + WSDLFactory factory = WSDLFactory.newInstance(); + WSDLReader wsdlReader = factory.newWSDLReader(); + Definition def = wsdlReader.readWSDL(wsdlURL); + return def; + } }

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r31323 - in trunk/ws/plugins/org.jboss.tools.ws.creation.core: src/org/jboss/tools/ws/creation/core/commands and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2011-05-15 05:00:37 -0400 (Sun, 15 May 2011) New Revision: 31323 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java Log: JBIDE-7924: Allow user to create a web service in custom source root Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2011-05-15 08:59:40 UTC (rev 31322) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2011-05-15 09:00:37 UTC (rev 31323) @@ -38,7 +38,8 @@ org.eclipse.debug.core, org.eclipse.jst.jee.web, javax.wsdl;visibility:=reexport, - org.eclipse.jst.ws.annotations.core + org.eclipse.jst.ws.annotations.core, + org.eclipse.wst.common.emfworkbench.integration Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.ws.creation.core, org.jboss.tools.ws.creation.core.commands, Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java 2011-05-15 08:59:40 UTC (rev 31322) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java 2011-05-15 09:00:37 UTC (rev 31323) @@ -160,7 +160,7 @@ IJavaProject javaProject = JavaCore.create(project); command.add("-k"); //$NON-NLS-1$ command.add("-s"); //$NON-NLS-1$ - command.add(JBossWSCreationUtils.getJavaProjectSrcLocation(project)); + command.add(JBossWSCreationUtils.getCustomSrcLocation(model.getJavaSourceFolder())); command.add("-o"); //$NON-NLS-1$ StringBuffer opDir = new StringBuffer(); opDir.append(projectRoot).append(Path.SEPARATOR).append(javaProject.getOutputLocation().removeFirstSegments(1).toOSString()); Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2011-05-15 08:59:40 UTC (rev 31322) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2011-05-15 09:00:37 UTC (rev 31323) @@ -178,8 +178,7 @@ IJavaProject javaProject) { try { IPath srcPath = new Path( - JBossWSCreationUtils.getJavaProjectSrcLocation(javaProject - .getProject())); + JBossWSCreationUtils.getCustomSrcLocation(model.getJavaSourceFolder())); srcPath = javaProject.getPath().append( srcPath.makeRelativeTo(javaProject.getProject() .getLocation())); Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2011-05-15 08:59:40 UTC (rev 31322) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2011-05-15 09:00:37 UTC (rev 31323) @@ -544,8 +544,7 @@ private IPath getSourceFolderPath(IProject project) throws JavaModelException { IPath path = new Path( - JBossWSCreationUtils.getJavaProjectSrcLocation(project - .getProject())); + JBossWSCreationUtils.getCustomSrcLocation(model.getJavaSourceFolder())); return path.makeRelativeTo(project.getProject().getLocation()); } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java 2011-05-15 08:59:40 UTC (rev 31322) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java 2011-05-15 09:00:37 UTC (rev 31323) @@ -21,6 +21,7 @@ private String customClassName; private String applicationClassName; private String applicationName; + private String javaSourceFolder; public int getWsScenario() { return wsScenario; @@ -167,4 +168,12 @@ public void setApplicationName(String applicationName) { this.applicationName = applicationName; } + + public String getJavaSourceFolder() { + return javaSourceFolder; + } + + public void setJavaSourceFolder(String javaSourceFolder) { + this.javaSourceFolder = javaSourceFolder; + } } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2011-05-15 08:59:40 UTC (rev 31322) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2011-05-15 09:00:37 UTC (rev 31323) @@ -25,6 +25,8 @@ Label_Button_Text_Remove=Remove Progress_Message_Generating=Generating Web Service resources... Client_Sample_Run_Over= Call Over! +Label_SourceFolder_Name=Source Folder: +Tooltip_SourceFolder=Specify the source folder into which the generated code files are written Error_Message_Invalid_Binding_File={0} is not a valid JAX-WS or JAXB binding file Error_Message_Failed_To_Generate_Code=Failed to Generate Web Service code, please check the log for more details Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2011-05-15 08:59:40 UTC (rev 31322) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2011-05-15 09:00:37 UTC (rev 31323) @@ -31,6 +31,8 @@ public static String Label_Button_Text_Remove; public static String Progress_Message_Generating; public static String Client_Sample_Run_Over; + public static String Label_SourceFolder_Name; + public static String Tooltip_SourceFolder; public static String Error_Message_Invalid_Binding_File; public static String Error_Message_Failed_To_Generate_Code; Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2011-05-15 08:59:40 UTC (rev 31322) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2011-05-15 09:00:37 UTC (rev 31323) @@ -30,6 +30,7 @@ import java.util.Locale; import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; @@ -396,10 +397,22 @@ return null; } - + + // return the src location when user select a src path + public static String getCustomSrcLocation(String srcPath) + throws JavaModelException { + if (srcPath == null || "".equals(srcPath)) { //$NON-NLS-1$ + return ""; //$NON-NLS-1$ + } + IFolder srcFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(srcPath)); + return srcFolder.getLocation().toOSString(); + } + + //return the default src of a java project public static String getJavaProjectSrcLocation(IProject project) throws JavaModelException { - IResource[] rs = getJavaSourceRoots(project); + IJavaProject javaProject = JavaCore.create(project); + IResource[] rs = getJavaSourceRoots(javaProject); String src = ""; //$NON-NLS-1$ if (rs == null || rs.length == 0) return src; @@ -413,9 +426,8 @@ return src; } - public static IResource[] getJavaSourceRoots(IProject project) + public static IResource[] getJavaSourceRoots(IJavaProject javaProject) throws JavaModelException { - IJavaProject javaProject = JavaCore.create(project); if (javaProject == null) return null; List<IResource> resources = new ArrayList<IResource>(); @@ -511,8 +523,7 @@ try { IPath path = addPackagetoPath(project, packageName); if (path == null) { - IResource[] resources = JBossWSCreationUtils - .getJavaSourceRoots(project.getProject()); + IResource[] resources = JBossWSCreationUtils.getJavaSourceRoots(project); if (resources != null && resources.length > 0) { IJavaElement[] elements = project.getPackageFragmentRoot( resources[0]).getChildren();

13 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits May 2011