Skip to content

Commit a5150b4

Browse files
skodapetrskodapetr
committed
Move run scripts from deploy
1 parent 3ed6238 commit a5150b4

File tree

13 files changed

+31
-33
lines changed

13 files changed

+31
-33
lines changed

‎deploy/executor-monitor.bat renamed to ‎executor-monitor/deploy/executor-monitor.bat

File renamed without changes.

‎deploy/executor-monitor.sh renamed to ‎executor-monitor/deploy/executor-monitor.sh

File renamed without changes.

‎executor-monitor/pom.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
<packaging>jar</packaging>
1313
<name>LinkedPipes Executor Monitor</name>
1414

15-
<properties>
16-
<deploy.directory>../deploy/executor-monitor/</deploy.directory>
17-
</properties>
18-
1915
<dependencies>
2016
<!-- Java EE API used by RDF4J to hash blank nodes. -->
2117
<dependency>
@@ -244,16 +240,19 @@
244240
</goals>
245241
<configuration>
246242
<target>
247-
<mkdir dir="${deploy.directory}"/>
248-
<copy todir="${deploy.directory}">
243+
<mkdir dir="${deploy.directory}/executor-monitor"/>
244+
<copy todir="${deploy.directory}/executor-monitor">
249245
<fileset dir="${project.build.directory}">
250246
<include name="executor-monitor.jar"/>
251247
</fileset>
252248
</copy>
253-
<mkdir dir="${deploy.directory}/lib"/>
254-
<copy todir="${deploy.directory}/lib">
249+
<mkdir dir="${deploy.directory}/executor-monitor/lib"/>
250+
<copy todir="${deploy.directory}/executor-monitor/lib">
255251
<fileset dir="${project.build.directory}/lib" />
256252
</copy>
253+
<copy todir="${deploy.directory}">
254+
<fileset dir="${project.basedir}/deploy"/>
255+
</copy>
257256
</target>
258257
</configuration>
259258
</execution>

‎deploy/executor.bat renamed to ‎executor/deploy/executor.bat

File renamed without changes.

‎deploy/executor.sh renamed to ‎executor/deploy/executor.sh

File renamed without changes.

‎executor/pom.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
<name>LinkedPipes Executor</name>
1313
<packaging>jar</packaging>
1414

15-
<properties>
16-
<deploy.directory>../deploy/executor/</deploy.directory>
17-
</properties>
18-
1915
<dependencies>
2016
<!-- Java EE API used by RDF4J to hash blank nodes. -->
2117
<dependency>
@@ -219,16 +215,19 @@
219215
</goals>
220216
<configuration>
221217
<target>
222-
<mkdir dir="${deploy.directory}"/>
223-
<copy todir="${deploy.directory}">
218+
<mkdir dir="${deploy.directory}/executor"/>
219+
<copy todir="${deploy.directory}/executor">
224220
<fileset dir="${project.build.directory}">
225221
<include name="executor.jar"/>
226222
</fileset>
227223
</copy>
228-
<mkdir dir="${deploy.directory}/lib"/>
229-
<copy todir="${deploy.directory}/lib">
224+
<mkdir dir="${deploy.directory}/executor/lib"/>
225+
<copy todir="${deploy.directory}/executor/lib">
230226
<fileset dir="${project.build.directory}/lib"/>
231227
</copy>
228+
<copy todir="${deploy.directory}">
229+
<fileset dir="${project.basedir}/deploy"/>
230+
</copy>
232231
</target>
233232
</configuration>
234233
</execution>

‎deploy/frontend.bat renamed to ‎frontend/deploy/frontend.bat

File renamed without changes.

‎deploy/frontend.sh renamed to ‎frontend/deploy/frontend.sh

File renamed without changes.

‎frontend/pom.xml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
<packaging>pom</packaging>
1010
<name>LinkedPipes Frontend</name>
1111

12-
<properties>
13-
<deploy.directory>../deploy/frontend/</deploy.directory>
14-
</properties>
15-
1612
<profiles>
1713
<profile>
1814
<id>deploy</id>
@@ -61,17 +57,20 @@
6157
</goals>
6258
<configuration>
6359
<target>
64-
<mkdir dir="${deploy.directory}"/>
65-
<copy todir="${deploy.directory}/server">
66-
<fileset dir="${project.basedir}/server"/>
60+
<mkdir dir="${deploy.directory}/frontend"/>
61+
<copy todir="${deploy.directory}/frontend/server">
62+
<fileset dir="${project.basedir}/frontend/server"/>
6763
</copy>
68-
<copy todir="${deploy.directory}/dist">
64+
<copy todir="${deploy.directory}/frontend/dist">
6965
<fileset dir="${project.basedir}/dist"/>
7066
</copy>
71-
<copy todir="${deploy.directory}/">
67+
<copy todir="${deploy.directory}/frontend/">
7268
<fileset file="${project.basedir}/package.json"/>
7369
<fileset file="${project.basedir}/package-lock.json"/>
7470
</copy>
71+
<copy todir="${deploy.directory}">
72+
<fileset dir="${project.basedir}/deploy"/>
73+
</copy>
7574
</target>
7675
</configuration>
7776
</execution>

‎pom-backend/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
<commons-io.version>2.8.0</commons-io.version>
3131
<springframework.version>5.3.18</springframework.version>
3232
<jetty.version>9.4.41.v20210516</jetty.version>
33+
<!-- Project properties. -->
34+
<deploy.directory>../deploy/</deploy.directory>
3335
</properties>
3436

3537
<dependencies>

‎deploy/storage.bat renamed to ‎storage/deploy/storage.bat

File renamed without changes.

‎deploy/storage.sh renamed to ‎storage/deploy/storage.sh

File renamed without changes.

‎storage/pom.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
<packaging>jar</packaging>
1313
<name>LinkedPipes Storage</name>
1414

15-
<properties>
16-
<deploy.directory>../deploy/storage/</deploy.directory>
17-
</properties>
18-
1915
<dependencies>
2016
<!-- Java EE API used by RDF4J to hash blank nodes. -->
2117
<dependency>
@@ -234,16 +230,19 @@
234230
</goals>
235231
<configuration>
236232
<target>
237-
<mkdir dir="${deploy.directory}"/>
238-
<copy todir="${deploy.directory}">
233+
<mkdir dir="${deploy.directory}/storage"/>
234+
<copy todir="${deploy.directory}/storage">
239235
<fileset dir="${project.build.directory}">
240236
<include name="storage.jar"/>
241237
</fileset>
242238
</copy>
243-
<mkdir dir="${deploy.directory}/lib"/>
244-
<copy todir="${deploy.directory}/lib">
239+
<mkdir dir="${deploy.directory}/storage/lib"/>
240+
<copy todir="${deploy.directory}/storage/lib">
245241
<fileset dir="${project.build.directory}/lib" />
246242
</copy>
243+
<copy todir="${deploy.directory}">
244+
<fileset dir="${project.basedir}/deploy"/>
245+
</copy>
247246
</target>
248247
</configuration>
249248
</execution>

0 commit comments

Comments
 (0)