View | Details | Raw Unified | Return to bug 412211 | Differences between
and this patch

Collapse All | Expand All

(-)a/.gitignore (+2 lines)
Added Link Here
1
# maven
2
target/
(-)a/.gitmodules (+81 lines)
Added Link Here
1
[submodule "webtools.common"]
2
	path = webtools.common
3
	url = ssh://git.eclipse.org/gitroot/webtools-common/webtools.common.git
4
[submodule "webtools.common.snippets"]
5
	path = webtools.common.snippets
6
	url = ssh://git.eclipse.org/gitroot/webtools-common/webtools.common.snippets.git
7
[submodule "webtools.common.fproj"]
8
	path = webtools.common.fproj
9
	url = ssh://git.eclipse.org/gitroot/webtools-common/webtools.common.fproj.git
10
[submodule "webtools.common.tests"]
11
	path = webtools.common.tests
12
	url = ssh://git.eclipse.org/gitroot/webtools-common/webtools.common.tests.git
13
[submodule "webtools.sourceediting"]
14
	path = webtools.sourceediting
15
	url = ssh://git.eclipse.org/gitroot/sourceediting/webtools.sourceediting.git
16
[submodule "webtools.jsdt.core"]
17
	path = webtools.jsdt.core
18
	url = ssh://git.eclipse.org/gitroot/jsdt/webtools.jsdt.core.git
19
[submodule "webtools.jsdt.debug"]
20
	path = webtools.jsdt.debug
21
	url = ssh://git.eclipse.org/gitroot/jsdt/webtools.jsdt.debug.git
22
[submodule "webtools.jsdt.tests"]
23
	path = webtools.jsdt.tests
24
	url = ssh://git.eclipse.org/gitroot/jsdt/webtools.jsdt.tests.git
25
[submodule "webtools.releng"]
26
	path = webtools.releng
27
	url = ssh://git.eclipse.org/gitroot/webtools/webtools.releng.git
28
[submodule "webtools.servertools"]
29
	path = webtools.servertools
30
	url = ssh://git.eclipse.org/gitroot/servertools/webtools.servertools.git
31
[submodule "webtools.servertools.tests"]
32
	path = webtools.servertools.tests
33
	url = ssh://git.eclipse.org/gitroot/servertools/webtools.servertools.tests.git
34
[submodule "webtools.javaee"]
35
	path = webtools.javaee
36
	url = ssh://git.eclipse.org/gitroot/jeetools/webtools.javaee.git
37
[submodule "webtools.servertools.docs"]
38
	path = webtools.servertools.docs
39
	url = ssh://git.eclipse.org/gitroot/servertools/webtools.servertools.docs.git
40
[submodule "webtools.ejb"]
41
	path = webtools.ejb
42
	url = ssh://git.eclipse.org/gitroot/ejb/webtools.ejb.git
43
[submodule "webtools.webservices"]
44
	path = webtools.webservices
45
	url = ssh://git.eclipse.org/gitroot/webservices/webtools.webservices.git
46
[submodule "webtools.jsf.docs"]
47
	path = webtools.jsf.docs
48
	url = ssh://git.eclipse.org/gitroot/jsf/webtools.jsf.docs.git
49
[submodule "webtools.jsf"]
50
	path = webtools.jsf
51
	url = ssh://git.eclipse.org/gitroot/jsf/webtools.jsf.git
52
[submodule "webtools.javaee.tests"]
53
	path = webtools.javaee.tests
54
	url = ssh://git.eclipse.org/gitroot/jeetools/webtools.javaee.tests.git
55
[submodule "webtools.jsf.tests"]
56
	path = webtools.jsf.tests
57
	url = ssh://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git
58
[submodule "webtools.webservices.axis2"]
59
	path = webtools.webservices.axis2
60
	url = ssh://git.eclipse.org/gitroot/webservices/webtools.webservices.axis2.git
61
[submodule "webtools.webservices.jaxws"]
62
	path = webtools.webservices.jaxws
63
	url = ssh://git.eclipse.org/gitroot/webservices/webtools.webservices.jaxws.git
64
[submodule "webtools.sourceediting.tests"]
65
	path = webtools.sourceediting.tests
66
	url = ssh://git.eclipse.org/gitroot/sourceediting/webtools.sourceediting.tests.git
67
[submodule "webtools.sourceediting.xpath"]
68
	path = webtools.sourceediting.xpath
69
	url = ssh://git.eclipse.org/gitroot/sourceediting/webtools.sourceediting.xpath.git
70
[submodule "webtools.sourceediting.xpath.tests"]
71
	path = webtools.sourceediting.xpath.tests
72
	url = ssh://git.eclipse.org/gitroot/sourceediting/webtools.sourceediting.xpath.tests.git
73
[submodule "webtools.sourceediting.xsl"]
74
	path = webtools.sourceediting.xsl
75
	url = ssh://git.eclipse.org/gitroot/sourceediting/webtools.sourceediting.xsl.git
76
[submodule "webtools.sourceediting.xsl.tests"]
77
	path = webtools.sourceediting.xsl.tests
78
	url = ssh://git.eclipse.org/gitroot/sourceediting/webtools.sourceediting.xsl.tests.git
79
[submodule "webtools.dali"]
80
	path = webtools.dali
81
	url = ssh://git.eclipse.org/gitroot/dali/webtools.dali.git
(-)a/pom.xml (+54 lines)
Added Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
2
<!--
3
  Copyright (c) 2012, 2013 Eclipse Foundation and others.
4
  All rights reserved. This program and the accompanying materials
5
  are made available under the terms of the Eclipse Distribution License v1.0
6
  which accompanies this distribution, and is available at
7
  http://www.eclipse.org/org/documents/edl-v10.php
8
 
9
  Contributors:
10
    Thanh Ha (Eclipse Foundation) - initial implementation
11
-->
12
13
<project
14
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
15
  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
16
  <modelVersion>4.0.0</modelVersion>
17
18
  <groupId>org.eclipse.wtp</groupId>
19
  <artifactId>wtp-aggregator</artifactId>
20
  <version>3.5.0-SNAPSHOT</version>
21
  <packaging>pom</packaging>
22
23
  <modules>
24
    <module>wtp-parent</module>
25
    <module>webtools.releng</module>
26
  
27
    <module>webtools.common</module>
28
    <module>webtools.common.fproj</module>
29
    <module>webtools.common.snippets</module>
30
    <module>webtools.common.tests</module>
31
    <module>webtools.dali</module>
32
    <module>webtools.ejb</module>
33
    <module>webtools.javaee</module>
34
    <module>webtools.javaee.tests</module>
35
    <module>webtools.jsdt.core</module>
36
    <module>webtools.jsdt.debug</module>
37
    <module>webtools.jsdt.tests</module>
38
    <module>webtools.jsf</module>
39
    <module>webtools.jsf.docs</module>
40
    <module>webtools.jsf.tests</module>
41
    <module>webtools.servertools</module>
42
    <module>webtools.servertools.docs</module>
43
    <module>webtools.servertools.tests</module>
44
    <module>webtools.sourceediting</module>
45
    <module>webtools.sourceediting.tests</module>
46
    <module>webtools.sourceediting.xpath</module>
47
    <module>webtools.sourceediting.xpath.tests</module>
48
    <module>webtools.sourceediting.xsl</module>
49
    <module>webtools.sourceediting.xsl.tests</module>
50
    <module>webtools.webservices</module>
51
    <module>webtools.webservices.axis2</module>
52
    <module>webtools.webservices.jaxws</module>
53
  </modules>
54
</project>
(-)a/webtools.common (+1 lines)
Added Link Here
1
Subproject commit a8aca75b2b0d381284a1ef0084bc1320d1bad351
(-)a/webtools.common.fproj (+1 lines)
Added Link Here
1
Subproject commit 52de5e631698b93f652853ef8ffc0f2510879b76
(-)a/webtools.common.snippets (+1 lines)
Added Link Here
1
Subproject commit 3f12c79773ab8cfd1836e0e7b6964130e960ac12
(-)a/webtools.common.tests (+1 lines)
Added Link Here
1
Subproject commit dbfab1d7bb3293e870758fca39350c64e5f170a5
(-)a/webtools.dali (+1 lines)
Added Link Here
1
Subproject commit 6e0a4ae848220d9ac85a729af059be302b71d75b
(-)a/webtools.ejb (+1 lines)
Added Link Here
1
Subproject commit 65b74f7acb51bfae8d7a57ec5672e91c36cfc002
(-)a/webtools.javaee (+1 lines)
Added Link Here
1
Subproject commit 5a8a4382229713e8b383d4747d9f9dc6b92118ad
(-)a/webtools.javaee.tests (+1 lines)
Added Link Here
1
Subproject commit 9ce24fba76a7c32ca07d68c2d1e4225e499100e3
(-)a/webtools.jsdt.core (+1 lines)
Added Link Here
1
Subproject commit 0bdcc715902ac8b88d5e865e21ca1c66905b1805
(-)a/webtools.jsdt.debug (+1 lines)
Added Link Here
1
Subproject commit 3c08fb1305f02cf18311db83bb41f03ba71def83
(-)a/webtools.jsdt.tests (+1 lines)
Added Link Here
1
Subproject commit 90780f8029e024a12af80e51d7c0c4d782c1a453
(-)a/webtools.jsf (+1 lines)
Added Link Here
1
Subproject commit 50e8ac08664b0759881dbe89886f03c6cc6828d2
(-)a/webtools.jsf.docs (+1 lines)
Added Link Here
1
Subproject commit a0dde664925d918785b8fedd284241f806422056
(-)a/webtools.jsf.tests (+1 lines)
Added Link Here
1
Subproject commit 0f75b8c9e38770121474d381efbd7c7335e5094b
(-)a/webtools.releng (+1 lines)
Added Link Here
1
Subproject commit 29c6bc10f86379f40335f5c599a1a7a9bbdcedab
(-)a/webtools.servertools (+1 lines)
Added Link Here
1
Subproject commit 8860d4ba0e8be687e801ca6ffac5cf18df5e9eb3
(-)a/webtools.servertools.docs (+1 lines)
Added Link Here
1
Subproject commit 83148f36610b44e5654f5788de65c1fe0453d892
(-)a/webtools.servertools.tests (+1 lines)
Added Link Here
1
Subproject commit bcd0ad7be0aa293f18bc973340df71a028d81716
(-)a/webtools.sourceediting (+1 lines)
Added Link Here
1
Subproject commit af96863aa82e348b7ce55be0143e44c6cb2b3f47
(-)a/webtools.sourceediting.tests (+1 lines)
Added Link Here
1
Subproject commit 8ddcd2054f096c35ee193e53b95281e361ee865b
(-)a/webtools.sourceediting.xpath (+1 lines)
Added Link Here
1
Subproject commit ef754f1b042787c76d3ef7b6827e1006cdb73384
(-)a/webtools.sourceediting.xpath.tests (+1 lines)
Added Link Here
1
Subproject commit eb06834eb26b6b2a62c08b70ad7c16bb47b8d6bb
(-)a/webtools.sourceediting.xsl (+1 lines)
Added Link Here
1
Subproject commit f0dc94ceda3a567d7365415e34712001e4ee0a1e
(-)a/webtools.sourceediting.xsl.tests (+1 lines)
Added Link Here
1
Subproject commit cd29d6dd31d1255a379eb7e446294e4a7144f1e6
(-)a/webtools.webservices (+1 lines)
Added Link Here
1
Subproject commit fb7efadf2fcf58523ce66e1527b21d37024166f8
(-)a/webtools.webservices.axis2 (+1 lines)
Added Link Here
1
Subproject commit ee265cfccdb201365d84b74cba03978e65fbb6ea
(-)a/webtools.webservices.jaxws (+1 lines)
Added Link Here
1
Subproject commit 321468deb65ea86aa6c0043d616c71ce011d2b4f
(-)a/wtp-parent/pom.xml (-1 / +248 lines)
Added Link Here
0
- 
1
<?xml version="1.0" encoding="UTF-8"?>
2
<!--
3
  Copyright (c) 2012, 2013 Eclipse Foundation and others.
4
  All rights reserved. This program and the accompanying materials
5
  are made available under the terms of the Eclipse Distribution License v1.0
6
  which accompanies this distribution, and is available at
7
  http://www.eclipse.org/org/documents/edl-v10.php
8
 
9
  Contributors:
10
    Thanh Ha (Eclipse Foundation) - initial implementation
11
-->
12
13
<project
14
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
15
  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
16
  <modelVersion>4.0.0</modelVersion>
17
18
  <groupId>org.eclipse</groupId>
19
  <artifactId>wtp-parent</artifactId>
20
  <version>3.5.0-SNAPSHOT</version>
21
  <packaging>pom</packaging>
22
23
  <properties>
24
    <tycho.version>0.19.0-SNAPSHOT</tycho.version>
25
    <tycho-extras.version>0.19.0-SNAPSHOT</tycho-extras.version>
26
    <tycho-repo.url>https://oss.sonatype.org/content/groups/public/</tycho-repo.url>
27
28
    <platform-repo.url>http://download.eclipse.org/eclipse/updates/4.3</platform-repo.url>
29
    <emf-repo.url>http://download.eclipse.org/modeling/emf/emf/updates/2.9/</emf-repo.url>
30
    <emf-transaction-repo.url>http://download.eclipse.org/modeling/emf/transaction/updates/releases/</emf-transaction-repo.url>
31
    <emf-validation-repo.url>http://download.eclipse.org/modeling/emf/validation/updates/releases/</emf-validation-repo.url>
32
    <emf-repo.url>http://download.eclipse.org/modeling/emf/emf/updates/2.9/</emf-repo.url>
33
    <gef-repo.url>http://download.eclipse.org/tools/gef/updates/milestones/</gef-repo.url>
34
    <dtp-repo.url>http://download.eclipse.org/datatools/updates</dtp-repo.url>
35
    <graphiti-repo.url>http://download.eclipse.org/graphiti/updates/milestones</graphiti-repo.url>
36
    <orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/</orbit-repo.url>
37
    <eclipselink-repo.url>http://download.eclipse.org/rt/eclipselink/updates/</eclipselink-repo.url>
38
    <jetty-repo.url>http://www.eclipse.org/external/jetty/updates/jetty-bundles-8.x/8.1.3.v20120522/</jetty-repo.url>
39
  </properties>
40
41
  <repositories>
42
    <repository>
43
      <id>platform</id>
44
      <url>${platform-repo.url}</url>
45
      <layout>p2</layout>
46
    </repository>
47
    <repository>
48
      <id>emf</id>
49
      <url>${emf-repo.url}</url>
50
      <layout>p2</layout>
51
    </repository>
52
    <repository>
53
      <id>emf-transaction</id>
54
      <url>${emf-transaction-repo.url}</url>
55
      <layout>p2</layout>
56
    </repository>
57
    <repository>
58
      <id>emf-validation</id>
59
      <url>${emf-validation-repo.url}</url>
60
      <layout>p2</layout>
61
    </repository>
62
    <repository>
63
      <id>gef</id>
64
      <url>${gef-repo.url}</url>
65
      <layout>p2</layout>
66
    </repository>
67
    <repository>
68
      <id>dtp</id>
69
      <url>${dtp-repo.url}</url>
70
      <layout>p2</layout>
71
    </repository>
72
    <repository>
73
      <id>graphiti</id>
74
      <url>${graphiti-repo.url}</url>
75
      <layout>p2</layout>
76
    </repository>
77
    <repository>
78
      <id>orbit</id>
79
      <url>${orbit-repo.url}</url>
80
      <layout>p2</layout>
81
    </repository>
82
    <repository>
83
      <id>eclipselink</id>
84
      <url>${eclipselink-repo.url}</url>
85
      <layout>p2</layout>
86
    </repository>
87
    <repository>
88
      <id>jetty</id>
89
      <url>${jetty-repo.url}</url>
90
      <layout>p2</layout>
91
    </repository>
92
  </repositories>
93
94
  <pluginRepositories>
95
    <pluginRepository>
96
      <id>tycho</id>
97
      <url>${tycho-repo.url}</url>
98
      <releases>
99
        <enabled>false</enabled>
100
      </releases>
101
      <snapshots>
102
        <enabled>true</enabled>
103
      </snapshots>
104
    </pluginRepository>
105
  </pluginRepositories>
106
107
  <build>
108
    <plugins>
109
      <plugin>
110
        <groupId>org.eclipse.tycho</groupId>
111
        <artifactId>tycho-maven-plugin</artifactId>
112
        <version>${tycho.version}</version>
113
        <extensions>true</extensions>
114
      </plugin>
115
116
      <plugin>
117
        <groupId>org.eclipse.tycho</groupId>
118
        <artifactId>target-platform-configuration</artifactId>
119
        <configuration>
120
          <environments>
121
            <environment>
122
              <os>linux</os>
123
              <ws>gtk</ws>
124
              <arch>x86</arch>
125
            </environment>
126
            <environment>
127
              <os>linux</os>
128
              <ws>gtk</ws>
129
              <arch>x86_64</arch>
130
            </environment>
131
            <environment>
132
              <os>win32</os>
133
              <ws>win32</ws>
134
              <arch>x86</arch>
135
            </environment>
136
            <environment>
137
              <os>win32</os>
138
              <ws>win32</ws>
139
              <arch>x86_64</arch>
140
            </environment>
141
            <environment>
142
              <os>macosx</os>
143
              <ws>cocoa</ws>
144
              <arch>x86_64</arch>
145
            </environment>
146
          </environments>
147
        </configuration>
148
      </plugin>
149
150
      <plugin>
151
        <groupId>org.eclipse.tycho</groupId>
152
        <artifactId>tycho-source-plugin</artifactId>
153
        <executions>
154
          <execution>
155
            <id>plugin-source</id>
156
            <goals>
157
              <goal>plugin-source</goal>
158
            </goals>
159
          </execution>
160
        </executions>
161
      </plugin>
162
    </plugins>
163
164
    <pluginManagement>
165
      <plugins>
166
        <plugin>
167
          <groupId>org.eclipse.tycho</groupId>
168
          <artifactId>target-platform-configuration</artifactId>
169
          <version>${tycho.version}</version>
170
        </plugin>
171
        <plugin>
172
          <groupId>org.eclipse.tycho</groupId>
173
          <artifactId>tycho-compiler-plugin</artifactId>
174
          <version>${tycho.version}</version>
175
          <configuration>
176
            <compilerArgument>-warn:+discouraged,forbidden</compilerArgument>
177
          </configuration>
178
        </plugin>
179
        <plugin>
180
          <groupId>org.eclipse.tycho</groupId>
181
          <artifactId>tycho-packaging-plugin</artifactId>
182
          <version>${tycho.version}</version>
183
          <configuration>
184
            <strictBinIncludes>false</strictBinIncludes>
185
          </configuration>
186
        </plugin>
187
        <plugin>
188
          <groupId>org.eclipse.tycho</groupId>
189
          <artifactId>tycho-surefire-plugin</artifactId>
190
          <version>${tycho.version}</version>
191
        </plugin>
192
        <plugin>
193
          <groupId>org.eclipse.tycho</groupId>
194
          <artifactId>tycho-source-plugin</artifactId>
195
          <version>${tycho.version}</version>
196
          <configuration>
197
            <strictSrcIncludes>false</strictSrcIncludes>
198
          </configuration>
199
        </plugin>
200
        <plugin>
201
          <groupId>org.eclipse.tycho</groupId>
202
          <artifactId>tycho-p2-director-plugin</artifactId>
203
          <version>${tycho.version}</version>
204
        </plugin>
205
        <plugin>
206
          <groupId>org.eclipse.tycho</groupId>
207
          <artifactId>tycho-p2-repository-plugin</artifactId>
208
          <version>${tycho.version}</version>
209
        </plugin>
210
        <plugin>
211
          <groupId>org.eclipse.tycho.extras</groupId>
212
          <artifactId>tycho-source-feature-plugin</artifactId>
213
          <version>${tycho-extras.version}</version>
214
        </plugin>
215
        <plugin>
216
          <groupId>org.eclipse.tycho.extras</groupId>
217
          <artifactId>tycho-custom-bundle-plugin</artifactId>
218
          <version>${tycho-extras.version}</version>
219
        </plugin>
220
      </plugins>
221
    </pluginManagement>
222
  </build>
223
224
  <profiles>
225
    <profile>
226
      <id>bree-libs</id>
227
      <build>
228
        <pluginManagement>
229
          <plugins>
230
            <plugin>
231
              <groupId>org.eclipse.tycho</groupId>
232
              <artifactId>tycho-compiler-plugin</artifactId>
233
              <version>${tycho.version}</version>
234
              <configuration>
235
                <!--
236
                  this tells Tycho to use JRE libraries that match bundle runtime execution environment
237
                  http://wiki.eclipse.org/Tycho/Release_Notes/0.14
238
                  TODO provide CBI-specific wiki that explains how to setup BREE libraries and toolchain.xml
239
                -->
240
                <useJDK>BREE</useJDK>
241
              </configuration>
242
            </plugin>
243
          </plugins>
244
        </pluginManagement>
245
      </build>
246
    </profile>
247
  </profiles>
248
</project>

Return to bug 412211