Commit 98c5917e authored by Philippe Merle's avatar Philippe Merle

Corrected http://bamboo.ow2.org/browse/SCA-DEF-JOB1-943/test/case/67182217

Sometimes OW2 Bamboo builds OW2 JORAM and OW2 FraSCAti simultaneously.
This could cause an error because both starts a JNDI and JORAM servers on the same IP ports.
* Updated the JNDI server port used by FraSCAti, i.e., 16400 replaced by 16500.
* Added a3servers.xml jndi.properties a3debug.properties as resources of frascati-binding-jms.jar
* Removed redundant a3servers.xml jndi.properties a3debug.properties
parent 55246659
<?xml version="1.0"?>
<config>
<property name="Transaction" value="fr.dyade.aaa.util.NullTransaction"/>
<server id="0" name="S0" hostname="localhost">
<service class="org.objectweb.joram.mom.proxies.ConnectionManager"
args="root root"/>
<service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService"
args="16010"/>
<service class="fr.dyade.aaa.jndi2.server.JndiServer" args="16400"/>
</server>
</config>
......@@ -11,7 +11,7 @@ using the following configuration :
<server id="0" name="S0" hostname="localhost">
<service class="org.objectweb.joram.mom.proxies.ConnectionManager" args="root root"/>
<service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService" args="16010"/>
<service class="fr.dyade.aaa.jndi2.server.JndiServer" args="16400"/>
<service class="fr.dyade.aaa.jndi2.server.JndiServer" args="16500"/>
</server>
</config>
......
/**
* OW2 FraSCAti SCA Binding JMS
* Copyright (C) 2010 ScalAgent Distributed Technologies, INRIA, University of Lille 1
* Copyright (C) 2010-2012 ScalAgent Distributed Technologies, 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
......@@ -20,7 +20,7 @@
*
* Author: Guillaume Surrel
*
* Contributor(s):
* Contributor(s): Philippe Merle
*
*/
package org.objectweb.fractal.bf.connectors.jms;
......@@ -43,6 +43,7 @@ import fr.dyade.aaa.agent.AgentServer;
*/
public class JoramServer
{
public static int TCP_CONNECTION_FACTORY_PORT = 16010;
private static boolean started = false;
......@@ -82,7 +83,7 @@ public class JoramServer
topic.setFreeWriting();
ConnectionFactory cf = TcpConnectionFactory.create("localhost",
16010);
TCP_CONNECTION_FACTORY_PORT);
Context jndiCtx = new InitialContext();
jndiCtx.bind("cf", cf);
......@@ -134,11 +135,11 @@ public class JoramServer
try
{
URI uri=URI.create(CorrelationScheme);
cf = TcpConnectionFactory.create(uri.getHost(), 16010);
cf = TcpConnectionFactory.create(uri.getHost(), TCP_CONNECTION_FACTORY_PORT);
}
catch(IllegalArgumentException e)
{
cf = TcpConnectionFactory.create("localhost", 16010);
cf = TcpConnectionFactory.create("localhost", TCP_CONNECTION_FACTORY_PORT);
}
Context jndiCtx = new InitialContext();
......
......@@ -7,6 +7,6 @@
args="root root"/>
<service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService"
args="16010"/>
<service class="fr.dyade.aaa.jndi2.server.JndiServer" args="16400"/>
<service class="fr.dyade.aaa.jndi2.server.JndiServer" args="16500"/>
</server>
</config>
java.naming.factory.initial fr.dyade.aaa.jndi2.client.NamingContextFactory
java.naming.factory.host localhost
java.naming.factory.port 16400
java.naming.factory.port 16500
<?xml version="1.0" encoding="UTF-8"?>
<!-- OW2 FraSCAti: SCA Binding JMS -->
<!-- Copyright (C) 2010 ScalAgent Distributed Technologies, INRIA, USTL -->
<!-- Copyright (C) 2010-2012 ScalAgent Distributed Technologies, Inria, USTL -->
<!-- -->
<!-- This library is free software; you can redistribute it and/or -->
<!-- modify it under the terms of the GNU Lesser General Public -->
......
java.naming.factory.initial fr.dyade.aaa.jndi2.client.NamingContextFactory
java.naming.factory.host localhost
java.naming.factory.port 16400
############################################################
# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
# For example java -Djava.util.logging.config.file=myfile
############################################################
############################################################
# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
# classes. These handlers will be installed during VM startup.
# Note that these classes must be on the system classpath.
# By default we only configure a ConsoleHandler, which will only
# show messages at the INFO and above levels.
handlers= java.util.logging.ConsoleHandler
# To also add the FileHandler, use the following line instead.
#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
# Default global logging level.
# This specifies which kinds of events are logged across
# all loggers. For any given facility this global level
# can be overridden by a facility specific level
# Note that the ConsoleHandler also has a separate level
# setting to limit messages printed to the console.
.level=INFO
############################################################
# Handler specific properties.
# Describes specific configuration info for Handlers.
############################################################
# default file output is in user's home directory.
java.util.logging.FileHandler.pattern = %h/java%u.log
java.util.logging.FileHandler.limit = 50000
java.util.logging.FileHandler.count = 1
java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
# Limit the message that are printed on the console to INFO and above.
java.util.logging.ConsoleHandler.level = FINE
java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
############################################################
# Facility specific properties.
# Provides extra control for each logger.
############################################################
org.ow2.frascati.level = INFO
org.ow2.frascati.assembly.factory.level = INFO
# org.ow2.frascati.assembly.factory.manager.level = OFF
# org.ow2.frascati.assembly.factory.manager.AssemblyFactoryManager.level = OFF
org.ow2.frascati.assembly.factory.processor.level = INFO
# org.ow2.frascati.assembly.factory.processor.ScaBindingProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaBindingScaProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaComponentProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaComponentPropertyProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaComponentReferenceProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaComponentServiceProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaCompositeProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaCompositePropertyProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaCompositeReferenceProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaCompositeServiceProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaImplementationCompositeProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaImplementationJavaProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaImplementationProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaInterfaceJavaProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaInterfaceProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaPropertyTypeJavaProcessor.level = OFF
org.ow2.frascati.component.factory.level = INFO
org.ow2.frascati.component.factory.juliac.level = INFO
org.ow2.frascati.property.jaxb.level = INFO
org.ow2.frascati.binding.level = INFO
org.ow2.frascati.binding.factory.level = INFO
org.ow2.frascati.binding.jms.level = INFO
org.objectweb.fractal.bf.connectors.jms.level = INFO
org.ow2.frascati.implementation.level = INFO
org.ow2.frascati.implementation.bpel.level = INFO
org.ow2.frascati.implementation.bpel.easybpel.level = INFO
org.ow2.frascati.parser.level = INFO
org.ow2.frascati.tinfi.level = INFO
org.ow2.frascati.wsdl.level = INFO
com.ebmwebsourcing.level = INFO
com.sun.level = INFO
<?xml version="1.0" encoding="UTF-8"?>
<!-- OW2 FraSCAti: SCA Binding JMS -->
<!-- Copyright (C) 2010 ScalAgent Distributed Technologies, INRIA, USTL -->
<!-- Copyright (C) 2010-2012 ScalAgent Distributed Technologies, Inria, USTL -->
<!-- -->
<!-- This library is free software; you can redistribute it and/or -->
<!-- modify it under the terms of the GNU Lesser General Public -->
......@@ -37,7 +37,7 @@
</service>
<reference name="out">
<interface.wsdl interface="sender.wsdl#wsdl.interface(Sender)"/>
<binding.jms uri="jms:jndi:queue" jndiURL="scn://localhost:16400" initialContextFactory="fr.dyade.aaa.jndi2.client.NamingContextFactory"/>
<binding.jms uri="jms:jndi:queue" jndiURL="scn://localhost:16500" initialContextFactory="fr.dyade.aaa.jndi2.client.NamingContextFactory"/>
</reference>
</component>
......@@ -46,12 +46,12 @@
<service name="in">
<interface.wsdl interface="sender.wsdl#wsdl.interface(Sender)"/>
<!-- Give JNDI URL and initial context factory through JMS URI. -->
<binding.jms uri="jms:jndi:queue?jndiURL=scn%3A%2F%2Flocalhost%3A16400&amp;jndiInitialContextFactory=fr.dyade.aaa.jndi2.client.NamingContextFactory"/>
<binding.jms uri="jms:jndi:queue?jndiURL=scn%3A%2F%2Flocalhost%3A16500&amp;jndiInitialContextFactory=fr.dyade.aaa.jndi2.client.NamingContextFactory"/>
</service>
<reference name="out">
<interface.wsdl interface="sender.wsdl#wsdl.interface(Sender)"/>
<!-- Use destination element instead of JMS URI. -->
<binding.jms jndiURL="scn://localhost:16400" initialContextFactory="fr.dyade.aaa.jndi2.client.NamingContextFactory">
<binding.jms jndiURL="scn://localhost:16500" initialContextFactory="fr.dyade.aaa.jndi2.client.NamingContextFactory">
<destination type="topic" name="topic3"/>
</binding.jms>
</reference>
......@@ -61,7 +61,7 @@
<implementation.java class="org.ow2.frascati.examples.jms.sender.Node"/>
<service name="in">
<interface.wsdl interface="sender.wsdl#wsdl.interface(Sender)"/>
<binding.jms jndiURL="scn://localhost:16400" initialContextFactory="fr.dyade.aaa.jndi2.client.NamingContextFactory">
<binding.jms jndiURL="scn://localhost:16500" initialContextFactory="fr.dyade.aaa.jndi2.client.NamingContextFactory">
<destination type="topic" name="topic3"/>
</binding.jms>
</service>
......
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