diff --git a/frascati/RELEASE_NOTES.txt b/frascati/RELEASE_NOTES.txt
index c894684dc3baf0cf6cdb6f399289697a327f229a..67cccb35fe085ab133256910463e6c92b94a0fcb 100644
--- a/frascati/RELEASE_NOTES.txt
+++ b/frascati/RELEASE_NOTES.txt
@@ -12,8 +12,8 @@ OW2 FraSCAti 1.5
* Added support for Apache CXF configuration when running OW2 FraSCAti Explorer.
* Moved to:
- - Apache CXF 2.4.1
- - Eclipse Jetty 7.4.2.v20110526
+ - Apache CXF 2.5.4
+ - Eclipse Jetty 7.5.4.v20111024
- OW2 Fractal Binding Factory 0.10-SNAPSHOT
- Spring Framework 3.0.5.RELEASE
diff --git a/frascati/frascati-studio/pom.xml b/frascati/frascati-studio/pom.xml
index c75703a835e6d98d35b3ca3a324f3ecea918cc92..a544a89f673cdf64c4359c3db0b5cbe00a379c5d 100644
--- a/frascati/frascati-studio/pom.xml
+++ b/frascati/frascati-studio/pom.xml
@@ -290,7 +290,7 @@
org.slf4j
slf4j-simple
- 1.5.5
+ ${slf4j.version}
diff --git a/frascati/intents/apache-cxf/pom.xml b/frascati/intents/apache-cxf/pom.xml
index 95683960b870d5a0367e78be0fdddb4fce6940a3..970c3a01f32ff14f2f1583c138999ed709bade36 100644
--- a/frascati/intents/apache-cxf/pom.xml
+++ b/frascati/intents/apache-cxf/pom.xml
@@ -54,7 +54,7 @@
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-common
${fractal-bf.version}
provided
diff --git a/frascati/modules/frascati-binding-factory/pom.xml b/frascati/modules/frascati-binding-factory/pom.xml
index f2264b4970aeebc42791d526a141b05a9485bc07..8acd6cc2b0a78df35d021ed42592bae2785125cd 100644
--- a/frascati/modules/frascati-binding-factory/pom.xml
+++ b/frascati/modules/frascati-binding-factory/pom.xml
@@ -104,7 +104,7 @@
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-common
${fractal-bf.version}
diff --git a/frascati/modules/frascati-binding-jms/pom.xml b/frascati/modules/frascati-binding-jms/pom.xml
index a3981e4551599037be577028ab672a2b18806bd4..8dc9f1f00546c888a2c9788b77c7006bc2fb3699 100755
--- a/frascati/modules/frascati-binding-jms/pom.xml
+++ b/frascati/modules/frascati-binding-jms/pom.xml
@@ -131,13 +131,13 @@
Currently, the code of the Fractal JMS Connector is contained in this module.
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-jms
${fractal-bf.version}
-->
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-common
${fractal-bf.version}
diff --git a/frascati/modules/frascati-binding-jsonrpc/pom.xml b/frascati/modules/frascati-binding-jsonrpc/pom.xml
index d06500dbd180cb4d77658961ddc3341078f43161..380cc85f32feb40d4819a133b1578fbd1f826822 100644
--- a/frascati/modules/frascati-binding-jsonrpc/pom.xml
+++ b/frascati/modules/frascati-binding-jsonrpc/pom.xml
@@ -2,7 +2,7 @@
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-json-rpc
${fractal-bf.version}
diff --git a/frascati/modules/frascati-binding-rest/pom.xml b/frascati/modules/frascati-binding-rest/pom.xml
index 75e707b730071b0db67ee4cbef07eee204f68430..5c2f50563da0fe35c3f3b9b3b1e4498de41492dd 100644
--- a/frascati/modules/frascati-binding-rest/pom.xml
+++ b/frascati/modules/frascati-binding-rest/pom.xml
@@ -2,7 +2,7 @@
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-rest-cxf
${fractal-bf.version}
diff --git a/frascati/modules/frascati-binding-rmi/pom.xml b/frascati/modules/frascati-binding-rmi/pom.xml
index bc4dbcc8588a7ec337d0b79b2f8e58e3402777f2..3c9ca4adc8b10f4874d6cd176fd09b091919890c 100644
--- a/frascati/modules/frascati-binding-rmi/pom.xml
+++ b/frascati/modules/frascati-binding-rmi/pom.xml
@@ -2,7 +2,7 @@
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-rmi
${fractal-bf.version}
diff --git a/frascati/modules/frascati-binding-ws/pom.xml b/frascati/modules/frascati-binding-ws/pom.xml
index f4a7705e2e6f25f26c82508ef72a335a93a28e1d..b7323b43089095773870809fe3dbab75318c8a6d 100755
--- a/frascati/modules/frascati-binding-ws/pom.xml
+++ b/frascati/modules/frascati-binding-ws/pom.xml
@@ -2,7 +2,7 @@
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-soap-cxf
${fractal-bf.version}
diff --git a/frascati/modules/frascati-explorer/core/pom.xml b/frascati/modules/frascati-explorer/core/pom.xml
index a960a5b01e439c030ddaf443a24fd05e1c2c673a..11f553aadafee253e2b628cefe00f79fa9d725df 100644
--- a/frascati/modules/frascati-explorer/core/pom.xml
+++ b/frascati/modules/frascati-explorer/core/pom.xml
@@ -1,7 +1,7 @@
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-soap-cxf
${fractal-bf.version}
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-rmi
${fractal-bf.version}
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-rest-cxf
${fractal-bf.version}
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-json-rpc
${fractal-bf.version}
diff --git a/frascati/modules/frascati-fscript/core/pom.xml b/frascati/modules/frascati-fscript/core/pom.xml
index 352cbc34ed183bf628730b64c45f026de577a66f..8bc4d023c75df19f8487e5aaed852b03e9972ac2 100644
--- a/frascati/modules/frascati-fscript/core/pom.xml
+++ b/frascati/modules/frascati-fscript/core/pom.xml
@@ -1,7 +1,7 @@
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-upnp
${fractal-bf.version}
diff --git a/frascati/nuxeo/frascati-event-parser/pom.xml b/frascati/nuxeo/frascati-event-parser/pom.xml
index cfd611aede603de249f9eafbcbea0f168939db86..0585d616d1b552ba53a176927ede68ec3e7443bf 100644
--- a/frascati/nuxeo/frascati-event-parser/pom.xml
+++ b/frascati/nuxeo/frascati-event-parser/pom.xml
@@ -41,7 +41,7 @@
frascati-runtime-factory
${project.version}
test
-
+
org.ow2.frascati.examples
helloworld-pojo
diff --git a/frascati/nuxeo/frascati-isolated/pom.xml b/frascati/nuxeo/frascati-isolated/pom.xml
index d3ba65a9f5e1cfcc9de57928d5761412a33ed851..7bc9a3c3c17a9b6812d451f7e98524a44fb8ec3d 100644
--- a/frascati/nuxeo/frascati-isolated/pom.xml
+++ b/frascati/nuxeo/frascati-isolated/pom.xml
@@ -111,7 +111,7 @@
org.eclipse.emf.ecorexmi2.4.0
org.eclipse.emfcommon2.4.0
org.ow2.frascatifrascati-binding-factory${project.version}
- org.objectweb.fractal.bffractal-bf-core0.10-SNAPSHOT
+ org.ow2.fractal.bffractal-bf-core0.10-SNAPSHOT
org.objectweb.fractal.juliajulia-asm2.5.2
asmasm3.1
asmasm-util3.1
@@ -124,7 +124,7 @@
org.objectweb.fractal.fractaladltask-framework2.3.1
org.objectweb.fractal.fractaladltask-deployment2.3.1
org.objectweb.fractalfractal-util1.1.2
- org.objectweb.fractal.bf.connectorsfractal-bf-connectors-common0.10-SNAPSHOT
+ org.ow2.fractal.bf.connectorsfractal-bf-connectors-common0.10-SNAPSHOT
org.ow2.frascati.modelfrascati-model2.0.1.3
diff --git a/frascati/nuxeo/frascati-nuxeo/pom.xml b/frascati/nuxeo/frascati-nuxeo/pom.xml
index f53e5567720c6c3866776ab89bda1f476567dcc1..3eef89a3c4b0e548001a491118f643681235f847 100644
--- a/frascati/nuxeo/frascati-nuxeo/pom.xml
+++ b/frascati/nuxeo/frascati-nuxeo/pom.xml
@@ -334,8 +334,8 @@
org.objectweb.fractal.juliacjuliac-jdt2.4
org.objectweb.fractal.juliajulia-mixins2.5.2
org.objectweb.fractal.juliajulia-asm2.5.2
- org.objectweb.fractal.bffractal-bf-core0.10-SNAPSHOT
- org.objectweb.fractal.bf.connectorsfractal-bf-connectors-common0.10-SNAPSHOT
+ org.ow2.fractal.bffractal-bf-core0.10-SNAPSHOT
+ org.ow2.fractal.bf.connectorsfractal-bf-connectors-common0.10-SNAPSHOT
org.objectweb.fractal.fraclet.javafraclet-annotations3.3
org.objectweb.fractal.fractaladlfractal-adl2.3.1
org.objectweb.fractal.fractaladlast-core2.3.1
@@ -370,7 +370,7 @@
org.ow2.frascatifrascati-binding-http${project.version}
org.ow2.frascatifrascati-binding-ws${project.version}
org.ow2.frascatifrascati-servlet-cxf${project.version}
- org.objectweb.fractal.bf.connectorsfractal-bf-connectors-soap-cxf0.10-SNAPSHOT
+ org.ow2.fractal.bf.connectorsfractal-bf-connectors-soap-cxf0.10-SNAPSHOT
diff --git a/frascati/osgi/fractal/fractal-bf-connectors-osgi/pom.xml b/frascati/osgi/fractal/fractal-bf-connectors-osgi/pom.xml
index 557bcad96931159a06b0194bea1400f8a9137776..c8c3f33afceeea381206ba3eb5b5903140f99862 100644
--- a/frascati/osgi/fractal/fractal-bf-connectors-osgi/pom.xml
+++ b/frascati/osgi/fractal/fractal-bf-connectors-osgi/pom.xml
@@ -45,7 +45,7 @@
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-common
${fractal-bf.version}
@@ -56,7 +56,7 @@
test
- org.objectweb.fractal.bf.testing
+ org.ow2.fractal.bf.testing
fractal-bf-testing-fixtures
${fractal-bf.version}
test
diff --git a/frascati/osgi/frascati-in-osgi/bundles/frascati-core/pom.xml b/frascati/osgi/frascati-in-osgi/bundles/frascati-core/pom.xml
index 48de10f46d4ec18f1bf356e18a9fd545951287dc..d67306bba85844d4b94ac32f5b40abee6630c2c4 100644
--- a/frascati/osgi/frascati-in-osgi/bundles/frascati-core/pom.xml
+++ b/frascati/osgi/frascati-in-osgi/bundles/frascati-core/pom.xml
@@ -49,8 +49,8 @@
org.objectweb.fractal.fractalrmifractal-rmi${fractal-rmi.version}runtime
- org.objectweb.fractal.bffractal-bf-core${fractal-bf.version}runtime
- org.objectweb.fractal.bf.connectorsfractal-bf-connectors-common${fractal-bf.version}runtime
+ org.ow2.fractal.bffractal-bf-core${fractal-bf.version}runtime
+ org.ow2.fractal.bf.connectorsfractal-bf-connectors-common${fractal-bf.version}runtime
org.objectweb.fractal.fractaladlfractal-adl${fractal-adl.version}runtime
org.objectweb.monologmonolog-api${monolog.version}runtime
diff --git a/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-jsonrpc/pom.xml b/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-jsonrpc/pom.xml
index e44c3bbe2c882fdfa0c4149b64a1580bfd610f32..032b303c27eb145f410e75b0ae500cc9914dc086 100644
--- a/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-jsonrpc/pom.xml
+++ b/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-jsonrpc/pom.xml
@@ -41,7 +41,7 @@
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-json-rpc
${fractal-bf.version}
diff --git a/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-rest/pom.xml b/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-rest/pom.xml
index 476abf872e581869209a2f5bb2a9410ebbb3bfb2..243a69d458139ad2466e5f8932fcd5b3ee470470 100644
--- a/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-rest/pom.xml
+++ b/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-rest/pom.xml
@@ -42,7 +42,7 @@
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-rest-cxf
${fractal-bf.version}
diff --git a/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-rmi/pom.xml b/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-rmi/pom.xml
index f7afba16283289b12e9829847a79ce93ad152a88..6cd879044be9d207bf2e25c0b9218ec0965cb566 100644
--- a/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-rmi/pom.xml
+++ b/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-rmi/pom.xml
@@ -41,7 +41,7 @@
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-rmi
${fractal-bf.version}
diff --git a/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-upnp/pom.xml b/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-upnp/pom.xml
index fd977db6d809abeadae0a647b5a55a4b0492a60d..2629c08c6eea9a4b4ce8382cca659796481b5faa 100644
--- a/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-upnp/pom.xml
+++ b/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-upnp/pom.xml
@@ -49,7 +49,7 @@
org.ow2.fractal.bf.binjiu.descriptionjava2upnp0.2-SNAPSHOT
org.ow2.frascati.upnpfrascati-metamodel-upnp${project.version}
org.ow2.frascati.upnpfrascati-binding-upnp${project.version}
- org.objectweb.fractal.bf.connectorsfractal-bf-connectors-upnp${fractal-bf.version}
+ org.ow2.fractal.bf.connectorsfractal-bf-connectors-upnp${fractal-bf.version}
xercesxercesImpl2.9.1
diff --git a/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-ws/pom.xml b/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-ws/pom.xml
index 58d09358a16b9837e1f21df00b9fabe955a770e4..2564f8a92204203c4af84a819aa4859c58803233 100644
--- a/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-ws/pom.xml
+++ b/frascati/osgi/frascati-in-osgi/bundles/frascati-modules/binding-ws/pom.xml
@@ -41,7 +41,7 @@
- org.objectweb.fractal.bf.connectors
+ org.ow2.fractal.bf.connectors
fractal-bf-connectors-soap-cxf
${fractal-bf.version}
diff --git a/frascati/osgi/osgi-in-frascati/pom.xml b/frascati/osgi/osgi-in-frascati/pom.xml
index a5c18c689ac9ae4212d91fcfda8693beb8098c76..e6b442d08f4bb66783967af79b8349e5ebaedac3 100644
--- a/frascati/osgi/osgi-in-frascati/pom.xml
+++ b/frascati/osgi/osgi-in-frascati/pom.xml
@@ -58,7 +58,7 @@
http://localhost:8765
2.3.1
- 2.4.2
+ 2.5.4
2.9.1
2.0.1.3
diff --git a/frascati/osgi/pom.xml b/frascati/osgi/pom.xml
index 93a0248bdc510eb6321ca1ee5f0ae2cf486e65dc..29f9640dbb2cae16fd4216ec97818e0fd8074890 100644
--- a/frascati/osgi/pom.xml
+++ b/frascati/osgi/pom.xml
@@ -68,7 +68,6 @@
3.1
1.8
6.1.21
- 1.5.0
1.0
1.0
diff --git a/pom.xml b/pom.xml
index f500c09b1d52047bfdf901976e528d9c4f14f1cb..25fd0313902379fd63986389955daead208a2c8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,14 +243,15 @@
0.10-SNAPSHOT
2.0.2
2.1.3
- 2.4.2
- 7.4.5.v20110725
+ 2.5.4
+ 7.5.4.v20111024
3.0.5.RELEASE
2.9.1
2.1.13
1.7
2.12.1.Final
0.6.0
+ 1.6.2