Commit 6f96e5e9 authored by Philippe Merle's avatar Philippe Merle

Improved configuration of FraSCAti examples:

* added the Maven property 'cxf.config.file' for configuring Apache CXF
  - the default empty file is 'frascati-cxf.xml'
* added the Maven property 'config.directory' to define in which directory default configuration files are.
* renamed the Maven property 'logging.conf.file' to 'java.util.logging.config.file'
parent cb7a0608
OW2 FraSCAti 1.4
----------------
* Added support for configuring Apache CXF with FraSCAti examples.
- use the Maven property 'cxf.config.file' to indicate the Apache CXF configuration file to use.
- see the default Apache CXF configuration file in /examples/frascati-cxf.xml
* Added support for promoting a component property with a different composite property name, e.g.,
<sca:property name="ComponentPropertyName" source="$CompositePropertyName"/> means that the component
property named 'ComponentPropertyName' is promoted as a composite property named 'CompositePropertyName'.
......
......@@ -35,7 +35,7 @@
<name>OW2 FraSCAti Examples: Benchmark Parent</name>
<properties>
<logging.conf.file>../../logging.properties</logging.conf.file>
<config.directory>../..</config.directory>
</properties>
<!-- ====== -->
......
......@@ -42,7 +42,7 @@
</parent>
<properties>
<logging.conf.file>../../logging.properties</logging.conf.file>
<config.directory>../..</config.directory>
</properties>
<modules>
......
......@@ -51,7 +51,7 @@
</dependencies>
<properties>
<logging.conf.file>../../logging.properties</logging.conf.file>
<config.directory>../..</config.directory>
</properties>
<modules>
......
......@@ -41,7 +41,7 @@
</parent>
<properties>
<logging.conf.file>../../logging.properties</logging.conf.file>
<config.directory>../..</config.directory>
</properties>
<build>
......
......@@ -45,7 +45,7 @@
<name>OW2 FraSCAti: SCA Examples Native</name>
<properties>
<logging.conf.file>../../logging.properties</logging.conf.file>
<config.directory>../..</config.directory>
</properties>
<!-- ======= -->
......
......@@ -45,7 +45,7 @@
<name>OW2 FraSCAti: SCA Examples Scala</name>
<properties>
<logging.conf.file>../../logging.properties</logging.conf.file>
<config.directory>../..</config.directory>
</properties>
<!-- ======= -->
......
<?xml version="1.0"?>
<!--
* OW2 FraSCAti Examples: Apache CXF Configuration
*
* Copyright (c) 2010 INRIA, University of Lille 1
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Contact: frascati@ow2.org
*
* Author: Philippe Merle
*
* Contributor:
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<!-- This is an empty Apache CXF configuration. -->
<!-- See at http://cxf.apache.org/docs/configuration.html for details on how to configure Apache CXF. -->
</beans>
......@@ -42,7 +42,7 @@
</parent>
<properties>
<logging.conf.file>../../logging.properties</logging.conf.file>
<config.directory>../..</config.directory>
</properties>
<dependencies>
......
......@@ -42,7 +42,7 @@
<name>OW2 FraSCAti Examples: HelloWorld OSGi</name>
<properties>
<logging.conf.file>../../logging.properties</logging.conf.file>
<config.directory>../..</config.directory>
</properties>
<modules>
......
......@@ -50,7 +50,7 @@
</dependencies>
<properties>
<logging.conf.file>../../logging.properties</logging.conf.file>
<config.directory>../..</config.directory>
</properties>
<modules>
......
......@@ -42,7 +42,7 @@
</parent>
<properties>
<logging.conf.file>../../logging.properties</logging.conf.file>
<config.directory>../..</config.directory>
</properties>
<modules>
......
......@@ -40,7 +40,7 @@
<name>OW2 FraSCAti Examples: Ohloh Proxy</name>
<properties>
<logging.conf.file>../../logging.properties</logging.conf.file>
<config.directory>../..</config.directory>
</properties>
<modules>
......
......@@ -42,7 +42,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<logging.conf.file>../logging.properties</logging.conf.file>
<config.directory>..</config.directory>
<java.util.logging.config.file>${config.directory}/logging.properties</java.util.logging.config.file>
<cxf.config.file>${config.directory}/frascati-cxf.xml</cxf.config.file>
<org.ow2.frascati.class>org.ow2.frascati.FraSCAti</org.ow2.frascati.class>
<org.ow2.frascati.bootstrap>org.ow2.frascati.bootstrap.FraSCAti</org.ow2.frascati.bootstrap>
<org.ow2.frascati.composite>org.ow2.frascati.FraSCAti</org.ow2.frascati.composite>
......@@ -71,7 +73,7 @@
<org.ow2.frascati.class>${org.ow2.frascati.class}</org.ow2.frascati.class>
<org.ow2.frascati.bootstrap>${org.ow2.frascati.bootstrap}</org.ow2.frascati.bootstrap>
<org.ow2.frascati.composite>${org.ow2.frascati.composite}</org.ow2.frascati.composite>
<java.util.logging.config.file>${logging.conf.file}</java.util.logging.config.file>
<java.util.logging.config.file>${java.util.logging.config.file}</java.util.logging.config.file>
</systemPropertyVariables>
</configuration>
</plugin>
......@@ -94,7 +96,7 @@
</execution>
</executions>
<configuration>
<loggingConfFile>${logging.conf.file}</loggingConfFile>
<loggingConfFile>${java.util.logging.config.file}</loggingConfFile>
<composite>${composite.file}</composite>
</configuration>
<!-- Required for FraSCAti EasyBPEL integration. -->
......@@ -135,7 +137,12 @@
</systemProperty>
<systemProperty>
<key>java.util.logging.config.file</key>
<value>${logging.conf.file}</value>
<value>${java.util.logging.config.file}</value>
</systemProperty>
<!-- Set the Apache CXF configuration file to load. -->
<systemProperty>
<key>cxf.config.file.url</key>
<value>file:${cxf.config.file}</value>
</systemProperty>
</systemProperties>
</configuration>
......@@ -196,7 +203,7 @@
</execution>
</executions>
<configuration>
<loggingConfFile>${logging.conf.file}</loggingConfFile>
<loggingConfFile>${java.util.logging.conf.file}</loggingConfFile>
<composite>${composite.file}</composite>
<service>${service.name}</service>
<method>${method.name}</method>
......@@ -205,6 +212,10 @@
<org.ow2.frascati.class>${org.ow2.frascati.class}</org.ow2.frascati.class>
<org.ow2.frascati.bootstrap>${org.ow2.frascati.bootstrap}</org.ow2.frascati.bootstrap>
<org.ow2.frascati.composite>${org.ow2.frascati.composite}</org.ow2.frascati.composite>
<!-- Set the Apache CXF configuration file to load. -->
<cxf.config.file.url>file:${cxf.config.file}</cxf.config.file.url>
<!-- Set the Java logging configuration file to load. -->
<java.util.logging.config.file>${java.util.logging.conf.file}</java.util.logging.config.file>
</systemProperties>
</configuration>
</plugin>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment