Skip to content

Commit 20a519d

Browse files
author
Marc Dutoo
committed
Merge remote branch 'upstream/master'
2 parents 1d8a9e2 + 2ecd573 commit 20a519d

File tree

15 files changed

+156
-13
lines changed

15 files changed

+156
-13
lines changed

‎pureAirFlowers-BinaryBuildComponents/.project

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>pureAirFlowers-BinaryBuildComponents</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
</buildSpec>
9+
<natures>
10+
</natures>
11+
</projectDescription>

‎pureAirFlowers-BinaryBuildComponents/Frascati_binary_runtime/frascati-runtime-1.4-SNAPSHOT.zip

44.3 MB
Binary file not shown.

‎pureAirFlowers-BinaryBuildComponents/distrib/cxf-server/readme

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
No content

‎pureAirFlowers-BinaryBuildComponents/distrib/frascati-proxy/readme

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
No content

‎pureAirFlowers-BinaryBuildComponents/distrib/readme.txt

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
This bundle contains the CXF server and the frascati proxy for the Pure Air Flowers demo.
3+
4+
The CXF server must be launched before the Frascati proxy.
5+
6+
To launch the cxf server, simply execute the cxf server script with this command : "./start_cxf_server.sh". The server expose a soap web service available at "http://localhost:9010/PureAirFlowers?wsdl".
7+
8+
To launch the Frascati server, simply execute the frascati proxy script : "./start_frascati_proxy.sh". The proxy talks with the cxf server and expose a rest service at "http://localhost:7001/".

‎pureAirFlowers-BinaryBuildComponents/distrib/start_cxf_server.bat

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
rem
2+
rem This script launch the CXF server for the Pure Air Flowers demo.
3+
rem
4+
5+
java -jar cxf-server\pureAirFlowerServer-1.0-SNAPSHOT-with-dep.jar
6+

‎pureAirFlowers-BinaryBuildComponents/distrib/start_cxf_server.sh

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
#
3+
# This script launch the CXF server for the Pure Air Flowers demo.
4+
#
5+
6+
java -jar cxf-server/pureAirFlowerServer-1.0-SNAPSHOT-with-dep.jar
7+

‎pureAirFlowers-BinaryBuildComponents/distrib/start_frascati_proxy.bat

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
rem
2+
rem This script launch the Frascati proxy for the Pure Air Flowers demo.
3+
rem
4+
5+
frascati-proxy\bin\frascati run RestSoapProxy_withIntents -libpath frascati-proxy\sca-apps\proxy-1.0-SNAPSHOT.jar
6+

‎pureAirFlowers-BinaryBuildComponents/distrib/start_frascati_proxy.sh

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
#
3+
# This script launch the Frascati proxy for the Pure Air Flowers demo.
4+
#
5+
6+
frascati-proxy/bin/frascati run RestSoapProxy_withIntents -libpath frascati-proxy/sca-apps/proxy-1.0-SNAPSHOT.jar
7+

‎pureAirFlowers-BinaryBuildComponents/readme.txt

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
This project contains some additional components to build a binary distribution of the Pure Air Flowers demo.
2+
3+
Instructions :
4+
5+
- Copy the files and folder structure contained in the folder distrib in your final distrib structure.
6+
- Unzip the archive "frascati-runtime-1.4-SNAPSHOT-bin.zip" in the "frascati-proxy" folder
7+
- Copy the three jar files "autoRearmFuseIntent-1.0-SNAPSHOT.jar", "logIntent-1.0-SNAPSHOT.jar" and "proxy-1.0-SNAPSHOT.jar" in the "frascati-proxy/sca-apps" folder.
8+
- Copy the two jar files "autoRearmFuseIntent-1.0-SNAPSHOT.jar" and "logIntent-1.0-SNAPSHOT.jar" in the "frascati-proxy/lib" folder.
9+
- copy the "pureAirFlowerServer-1.0-SNAPSHOT-with-dep.jar" in the "cxf-server" folder
10+
11+
You can remove the 2 empty Readme files in "cxf-server" and "frascati-proxy" folders.
12+
13+
To launch the servers :
14+
15+
Execute in this order :
16+
17+
- "./start_cxf_server.sh"
18+
- "./start_frascati_proxy.sh"
19+
20+
21+
Note : if the cxf-server is not started first, the frascati-proxy will not start !
22+
23+

‎pureAirFlowers-Release/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@
182182

183183
<!-- Modules -->
184184
<modules>
185+
<module>../pureAirFlowers-easysoa-demo-cxf-server</module>
185186
<module>../pureAirFlowers-autoRearmFuseIntent</module>
186187
<module>../pureAirFlowers-logIntent</module>
187188
<module>../pureAirFlowers-ServiceUiScaffolderProxy</module>
@@ -219,8 +220,6 @@
219220
</pluginManagement>
220221
</build>-->
221222

222-
223-
224223
<!-- -->
225224
<build>
226225
<plugins>

‎pureAirFlowers-ServiceUiScaffolderProxy/pom.xml

+71-9
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
<url>http://maven.apache.org</url>
1111

1212
<!-- RELEASE Build -->
13-
<!--<parent>
13+
<parent>
1414
<groupId>com.openwide</groupId>
1515
<artifactId>pureAirFlowers-Release</artifactId>
1616
<version>1.0-SNAPSHOT</version>
17-
</parent>-->
18-
17+
</parent>
18+
1919
<!-- MVN -Prun Build -->
20-
<parent>
20+
<!--<parent>
2121
<groupId>org.ow2.frascati.examples</groupId>
2222
<artifactId>parent</artifactId>
2323
<version>1.4-SNAPSHOT</version>
24-
</parent>
25-
24+
</parent>-->
25+
2626
<!-- MVN -Prun Build -->
2727
<properties>
2828
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -31,8 +31,66 @@
3131
<!-- Not used -->
3232
<!--<service.name>ProxyService</service.name>-->
3333
<!--<method.name>redirectRequests</method.name>-->
34+
<config.directory>..</config.directory>
35+
<java.util.logging.config.file>${config.directory}/logging.properties</java.util.logging.config.file>
36+
<cxf.config.file>${config.directory}/frascati-cxf.xml</cxf.config.file>
37+
<org.ow2.frascati.class>org.ow2.frascati.FraSCAti</org.ow2.frascati.class>
38+
<org.ow2.frascati.bootstrap>org.ow2.frascati.bootstrap.FraSCAti</org.ow2.frascati.bootstrap>
39+
<org.ow2.frascati.composite>org.ow2.frascati.FraSCAti</org.ow2.frascati.composite>
3440
</properties>
3541

42+
<build>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.apache.maven.plugins</groupId>
46+
<artifactId>maven-compiler-plugin</artifactId>
47+
<configuration>
48+
<source>1.6</source>
49+
<target>1.6</target>
50+
</configuration>
51+
</plugin>
52+
</plugins>
53+
</build>
54+
55+
<profiles>
56+
<!-- To execute an SCA composite type 'mvn -Prun'. -->
57+
<profile>
58+
<id>run</id>
59+
<build>
60+
<defaultGoal>org.ow2.frascati.mojo:frascati-launcher-plugin:1.4-SNAPSHOT:exec</defaultGoal>
61+
<plugins>
62+
<plugin>
63+
<groupId>org.ow2.frascati.mojo</groupId>
64+
<artifactId>frascati-launcher-plugin</artifactId>
65+
<version>${project.version}</version>
66+
<executions>
67+
<execution>
68+
<phase>package</phase>
69+
<goals>
70+
<goal>exec</goal>
71+
</goals>
72+
</execution>
73+
</executions>
74+
<configuration>
75+
<loggingConfFile>${java.util.logging.conf.file}</loggingConfFile>
76+
<composite>${composite.file}</composite>
77+
<service>${service.name}</service>
78+
<method>${method.name}</method>
79+
<methodParams>${method.params}</methodParams>
80+
<systemProperties>
81+
<org.ow2.frascati.class>${org.ow2.frascati.class}</org.ow2.frascati.class>
82+
<org.ow2.frascati.bootstrap>${org.ow2.frascati.bootstrap}</org.ow2.frascati.bootstrap>
83+
<org.ow2.frascati.composite>${org.ow2.frascati.composite}</org.ow2.frascati.composite>
84+
<!-- Set the Apache CXF configuration file to load. -->
85+
<cxf.config.file.url>file:${cxf.config.file}</cxf.config.file.url>
86+
</systemProperties>
87+
</configuration>
88+
</plugin>
89+
</plugins>
90+
</build>
91+
</profile>
92+
</profiles>
93+
3694
<!-- RELEASE Build -->
3795
<!--<build>
3896
<plugins>
@@ -67,6 +125,7 @@
67125
<dependency>
68126
<groupId>junit</groupId>
69127
<artifactId>junit</artifactId>
128+
<version>4.6</version>
70129
<scope>test</scope>
71130
</dependency>
72131
<dependency>
@@ -81,12 +140,12 @@
81140
<version>1.0</version>
82141
<!--<version>${aopalliance.version}</version>-->
83142
</dependency>
84-
<dependency>
143+
<!--<dependency>
85144
<groupId>org.eclipse.stp.sca.osoa.java</groupId>
86145
<artifactId>osoa-java-api</artifactId>
87146
<version>1.0</version>
88-
<!--<version>${osoa.version}</version>-->
89-
</dependency>
147+
<version>${osoa.version}</version>
148+
</dependency>-->
90149
<!-- OW2 FraSCAti WS Binding. -->
91150
<dependency>
92151
<groupId>org.ow2.frascati</groupId>
@@ -130,4 +189,7 @@
130189
<version>3.4.0</version>
131190
</dependency>-->
132191
</dependencies>
192+
193+
194+
133195
</project>

‎pureAirFlowers-ServiceUiScaffolderProxy/readme.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,7 @@ To build this project, the requirements are :
3131
- Maven 2 must be installed on your computer.
3232

3333
Before you can launch the proxy demo, you need to build Frascati in order to fill the maven repository with Frascati libs.
34-
Unpack the Frascati archive in a folder and then launch the "build-all.sh" script.
34+
Unpack the Frascati archive in a folder and then launch the "build-all.sh" script.
35+
36+
To reduce to build time, you can modify the "build-all.sh" script by adding "-Dmaven.test.skip=true" parameter to the mvn commands.
37+
eg : "mvn -Dmaven.test.skip=true -f org.eclipse.stp.sca.model/pom.xml clean install"

‎pureAirFlowers-buildAll/pom.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@
2828
<artifactId>proxy</artifactId>
2929
<version>1.0-SNAPSHOT</version>
3030
</dependency>
31+
<dependency>
32+
<groupId>pureairflowers.clients</groupId>
33+
<artifactId>pureAirFlowerServer</artifactId>
34+
<version>1.0-SNAPSHOT</version>
35+
</dependency>
3136
</dependencies>
32-
3337
<build>
3438
<plugins>
3539
<plugin>

‎pureAirFlowers-easysoa-demo-cxf-server/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,10 @@
8282
<artifactId>cxf-rt-transports-local</artifactId>
8383
<version>2.3.3</version>
8484
</dependency>
85+
<dependency>
86+
<groupId>org.springframework</groupId>
87+
<artifactId>spring</artifactId>
88+
<version>2.5.6</version>
89+
</dependency>
8590
</dependencies>
8691
</project>

0 commit comments

Comments
 (0)