Skip to content

Commit 33e65e3

Browse files
author
Jean Deruelle
committedMar 12, 2015
Update Issue #2
adding tomcat-8 profiles to all maven modules so all the jars are copied to the lib directory of tomcat 8 correctly (cherry picked from commit 892ab114161fd6d5c36eb40f7b32abcd8e5f0b6f) Conflicts: sip-servlets-impl/pom.xml
·
4.0.1283.1.1-15
1 parent d2bf13b commit 33e65e3

File tree

7 files changed

+81
-610
lines changed

7 files changed

+81
-610
lines changed
 

‎sip-servlets-annotations/pom.xml

+15-60
Original file line numberDiff line numberDiff line change
@@ -60,57 +60,6 @@
6060
</plugins>
6161
</build>
6262
</profile>
63-
<profile>
64-
<id>jboss</id>
65-
<build>
66-
<plugins>
67-
<plugin>
68-
<groupId>org.apache.maven.plugins</groupId>
69-
<artifactId>maven-antrun-plugin</artifactId>
70-
<version>1.1</version>
71-
<executions>
72-
<execution>
73-
<phase>package</phase>
74-
<configuration>
75-
<tasks>
76-
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${env.JBOSS_HOME}/server/${node}/deploy/jboss-web.deployer/" />
77-
</tasks>
78-
</configuration>
79-
<goals>
80-
<goal>run</goal>
81-
</goals>
82-
</execution>
83-
</executions>
84-
</plugin>
85-
</plugins>
86-
</build>
87-
</profile>
88-
<profile>
89-
<id>jboss-5</id>
90-
<build>
91-
<plugins>
92-
<plugin>
93-
<groupId>org.apache.maven.plugins</groupId>
94-
<artifactId>maven-antrun-plugin</artifactId>
95-
<version>1.1</version>
96-
<executions>
97-
<execution>
98-
<phase>package</phase>
99-
<configuration>
100-
<tasks>
101-
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${env.JBOSS_HOME}/server/${node}/deployers/jbossweb.deployer/" />
102-
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${env.JBOSS_HOME}/server/${node}/deploy/jbossweb.sar/" />
103-
</tasks>
104-
</configuration>
105-
<goals>
106-
<goal>run</goal>
107-
</goals>
108-
</execution>
109-
</executions>
110-
</plugin>
111-
</plugins>
112-
</build>
113-
</profile>
11463
<profile>
11564
<id>tomcat-distro</id>
11665
<activation>
@@ -139,8 +88,11 @@
13988
</plugins>
14089
</build>
14190
</profile>
142-
<profile>
143-
<id>jboss-distro</id>
91+
<profile>
92+
<id>tomcat-8</id>
93+
<activation>
94+
<activeByDefault>true</activeByDefault>
95+
</activation>
14496
<build>
14597
<plugins>
14698
<plugin>
@@ -152,7 +104,8 @@
152104
<phase>package</phase>
153105
<configuration>
154106
<tasks>
155-
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${JBOSS_HOME}/server/${node}/deploy/jboss-web.deployer/" />
107+
<echo message="${env.CATALINA_HOME}" />
108+
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${env.CATALINA_HOME}/lib" />
156109
</tasks>
157110
</configuration>
158111
<goals>
@@ -163,9 +116,12 @@
163116
</plugin>
164117
</plugins>
165118
</build>
166-
</profile>
167-
<profile>
168-
<id>jboss-5-distro</id>
119+
</profile>
120+
<profile>
121+
<id>tomcat-8-distro</id>
122+
<activation>
123+
<activeByDefault>true</activeByDefault>
124+
</activation>
169125
<build>
170126
<plugins>
171127
<plugin>
@@ -177,8 +133,7 @@
177133
<phase>package</phase>
178134
<configuration>
179135
<tasks>
180-
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${JBOSS_HOME}/server/${node}/deployers/jbossweb.deployer/" />
181-
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${JBOSS_HOME}/server/${node}/deploy/jbossweb.sar/" />
136+
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${CATALINA_HOME}/lib" />
182137
</tasks>
183138
</configuration>
184139
<goals>
@@ -191,4 +146,4 @@
191146
</build>
192147
</profile>
193148
</profiles>
194-
</project>
149+
</project>

‎sip-servlets-application-router/pom.xml

+12-55
Original file line numberDiff line numberDiff line change
@@ -89,56 +89,6 @@
8989
</plugins>
9090
</build>
9191
</profile>
92-
<profile>
93-
<id>jboss</id>
94-
<build>
95-
<plugins>
96-
<plugin>
97-
<groupId>org.apache.maven.plugins</groupId>
98-
<artifactId>maven-antrun-plugin</artifactId>
99-
<version>1.1</version>
100-
<executions>
101-
<execution>
102-
<phase>package</phase>
103-
<configuration>
104-
<tasks>
105-
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${env.JBOSS_HOME}/server/${node}/deploy/jboss-web.deployer/" />
106-
</tasks>
107-
</configuration>
108-
<goals>
109-
<goal>run</goal>
110-
</goals>
111-
</execution>
112-
</executions>
113-
</plugin>
114-
</plugins>
115-
</build>
116-
</profile>
117-
<profile>
118-
<id>jboss-5</id>
119-
<build>
120-
<plugins>
121-
<plugin>
122-
<groupId>org.apache.maven.plugins</groupId>
123-
<artifactId>maven-antrun-plugin</artifactId>
124-
<version>1.1</version>
125-
<executions>
126-
<execution>
127-
<phase>package</phase>
128-
<configuration>
129-
<tasks>
130-
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${env.JBOSS_HOME}/server/${node}/deploy/jbossweb.sar/" />
131-
</tasks>
132-
</configuration>
133-
<goals>
134-
<goal>run</goal>
135-
</goals>
136-
</execution>
137-
</executions>
138-
</plugin>
139-
</plugins>
140-
</build>
141-
</profile>
14292
<profile>
14393
<id>tomcat-distro</id>
14494
<activation>
@@ -168,7 +118,10 @@
168118
</build>
169119
</profile>
170120
<profile>
171-
<id>jboss-distro</id>
121+
<id>tomcat-8</id>
122+
<activation>
123+
<activeByDefault>true</activeByDefault>
124+
</activation>
172125
<build>
173126
<plugins>
174127
<plugin>
@@ -180,7 +133,8 @@
180133
<phase>package</phase>
181134
<configuration>
182135
<tasks>
183-
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${JBOSS_HOME}/server/${node}/deploy/jboss-web.deployer/" />
136+
<echo message="${env.CATALINA_HOME}" />
137+
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${env.CATALINA_HOME}/lib" />
184138
</tasks>
185139
</configuration>
186140
<goals>
@@ -193,7 +147,10 @@
193147
</build>
194148
</profile>
195149
<profile>
196-
<id>jboss-5-distro</id>
150+
<id>tomcat-8-distro</id>
151+
<activation>
152+
<activeByDefault>true</activeByDefault>
153+
</activation>
197154
<build>
198155
<plugins>
199156
<plugin>
@@ -205,7 +162,7 @@
205162
<phase>package</phase>
206163
<configuration>
207164
<tasks>
208-
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${JBOSS_HOME}/server/${node}/deploy/jbossweb.sar/" />
165+
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${CATALINA_HOME}/lib" />
209166
</tasks>
210167
</configuration>
211168
<goals>
@@ -218,4 +175,4 @@
218175
</build>
219176
</profile>
220177
</profiles>
221-
</project>
178+
</project>

‎sip-servlets-client/pom.xml

+15-58
Original file line numberDiff line numberDiff line change
@@ -100,56 +100,6 @@
100100
</plugins>
101101
</build>
102102
</profile>
103-
<profile>
104-
<id>jboss</id>
105-
<build>
106-
<plugins>
107-
<plugin>
108-
<groupId>org.apache.maven.plugins</groupId>
109-
<artifactId>maven-antrun-plugin</artifactId>
110-
<version>1.1</version>
111-
<executions>
112-
<execution>
113-
<phase>package</phase>
114-
<configuration>
115-
<tasks>
116-
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${env.JBOSS_HOME}/server/${node}/deploy/jboss-web.deployer/" />
117-
</tasks>
118-
</configuration>
119-
<goals>
120-
<goal>run</goal>
121-
</goals>
122-
</execution>
123-
</executions>
124-
</plugin>
125-
</plugins>
126-
</build>
127-
</profile>
128-
<profile>
129-
<id>jboss-5</id>
130-
<build>
131-
<plugins>
132-
<plugin>
133-
<groupId>org.apache.maven.plugins</groupId>
134-
<artifactId>maven-antrun-plugin</artifactId>
135-
<version>1.1</version>
136-
<executions>
137-
<execution>
138-
<phase>package</phase>
139-
<configuration>
140-
<tasks>
141-
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${env.JBOSS_HOME}/server/${node}/deploy/jbossweb.sar/" />
142-
</tasks>
143-
</configuration>
144-
<goals>
145-
<goal>run</goal>
146-
</goals>
147-
</execution>
148-
</executions>
149-
</plugin>
150-
</plugins>
151-
</build>
152-
</profile>
153103
<profile>
154104
<id>tomcat-distro</id>
155105
<activation>
@@ -178,8 +128,11 @@
178128
</plugins>
179129
</build>
180130
</profile>
181-
<profile>
182-
<id>jboss-distro</id>
131+
<profile>
132+
<id>tomcat-8</id>
133+
<activation>
134+
<activeByDefault>true</activeByDefault>
135+
</activation>
183136
<build>
184137
<plugins>
185138
<plugin>
@@ -191,7 +144,8 @@
191144
<phase>package</phase>
192145
<configuration>
193146
<tasks>
194-
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${JBOSS_HOME}/server/${node}/deploy/jboss-web.deployer/" />
147+
<echo message="${env.CATALINA_HOME}" />
148+
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${env.CATALINA_HOME}/lib" />
195149
</tasks>
196150
</configuration>
197151
<goals>
@@ -202,9 +156,12 @@
202156
</plugin>
203157
</plugins>
204158
</build>
205-
</profile>
206-
<profile>
207-
<id>jboss-5-distro</id>
159+
</profile>
160+
<profile>
161+
<id>tomcat-8-distro</id>
162+
<activation>
163+
<activeByDefault>true</activeByDefault>
164+
</activation>
208165
<build>
209166
<plugins>
210167
<plugin>
@@ -216,7 +173,7 @@
216173
<phase>package</phase>
217174
<configuration>
218175
<tasks>
219-
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${JBOSS_HOME}/server/${node}/deploy/jbossweb.sar/" />
176+
<copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${CATALINA_HOME}/lib" />
220177
</tasks>
221178
</configuration>
222179
<goals>
@@ -227,6 +184,6 @@
227184
</plugin>
228185
</plugins>
229186
</build>
230-
</profile>
187+
</profile>
231188
</profiles>
232189
</project>

0 commit comments

Comments
 (0)
Please sign in to comment.