1.1 --- a/data/dictionary.xml	Tue Aug 13 15:22:32 2013 +0200
     1.2 +++ b/data/dictionary.xml	Tue Aug 13 15:48:02 2013 +0200
     1.3 @@ -1654,32 +1654,58 @@
     1.4  	<concept>
     1.5  		<term abbreviation="JMX" completeForm="Java management extensions" language="en"/>
     1.6  		<term abbreviation="MBean" completeForm="managed bean" language="en"/>
     1.7 -		<explanation language="en"><text>
     1.8 +		<explanation language="en">
     1.9 +			<text>
    1.10  				a Java technology for monitoring and managing applications or devices;
    1.11  				similar to SNMP;
    1.12  				managed objects (MBeans) can emit events, can be asked for values (e.g. counters) or an action (method) can be called on them;
    1.13  				this native Java technology can be also adapted/translated to other protocols like SNMP or WS/SOAP and integrated with the non-Java world;
    1.14  				thanks to this abstraction, the managed object can implement only simple Java interface and don't have to deal with other protocols (which is job of generic adaptors)
    1.15 -			</text></explanation>
    1.16 +			</text>
    1.17 +		</explanation>
    1.18  		<tag>computer</tag>
    1.19  		<tag>java</tag>
    1.20  	</concept>
    1.21  	<concept>
    1.22  		<term abbreviation="JMS" completeForm="Java message service" language="en"/>
    1.23  		<explanation language="en">
    1.24 -			<text></text>
    1.25 +			<text>
    1.26 +				a Java Message Oriented Middleware (MOM) API;
    1.27 +				allows JEE components to create, send, receive and read messages;
    1.28 +				supports both point-to-point and publish-subscribe messaging models;
    1.29 +				is defined in  JSR 914;
    1.30 +				examples of JMS implementations: Apache ActiveMQ, OpenJMS, HornetQ
    1.31 +			</text>
    1.32  		</explanation>
    1.33  		<tag>computer</tag>
    1.34  		<tag>java</tag>
    1.35  		<tag>messaging</tag>
    1.36  	</concept>
    1.37  	<concept>
    1.38 +		<term abbreviation="MOM" completeForm="message-oriented middleware" language="en"/>
    1.39 +		<explanation language="en">
    1.40 +			<text>
    1.41 +				a software (or even hardware) infrastructure for sending and receiving messages;
    1.42 +				can also offer routing and transformation features;
    1.43 +				for Java the MOM API is standardized as JMS
    1.44 +			</text>
    1.45 +		</explanation>
    1.46 +		<tag>computer</tag>
    1.47 +		<tag>messaging</tag>
    1.48 +	</concept>
    1.49 +	<concept>
    1.50  		<term abbreviation="JCA" completeForm="Java connector architecture" language="en"/>
    1.51  		<explanation language="en"><text></text></explanation>
    1.52  		<tag>computer</tag>
    1.53  		<tag>java</tag>
    1.54  	</concept>
    1.55  	<concept>
    1.56 +		<term abbreviation="OSGi" completeForm="Open Services Gateway initiative" language="en"/>
    1.57 +		<explanation language="en"><text></text></explanation>
    1.58 +		<tag>computer</tag>
    1.59 +		<tag>java</tag>
    1.60 +	</concept>
    1.61 +	<concept>
    1.62  		<term abbreviation="VPN" completeForm="virtual private network" language="en"/>
    1.63  		<explanation language="en"><text></text></explanation>
    1.64  		<tag>computer</tag>